diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-05-25 16:59:40 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-05-25 16:59:40 -0700 |
| commit | 5b7afd2b8198a5d5eb62ecac856ec98f0ff0da46 (patch) | |
| tree | bc6c2a185421f14417873fb2a6b256e1439b092d /Makefile | |
| parent | 0ca8d33423989ac9d51cc7ab5996833dc905862a (diff) | |
| parent | 39403865d2e4590802553370a56c9ab93131e4ee (diff) | |
| download | linux-2.6-klibc-5b7afd2b8198a5d5eb62ecac856ec98f0ff0da46.tar.gz | |
Merge with v2.6.22-rc1
Conflicts:
fs/nfs/mount_clnt.c
fs/nfs/nfsroot.c
init/do_mounts.c
init/do_mounts_initrd.c
net/ipv4/ipconfig.c
scripts/gen_initramfs_list.sh
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Makefile b/Makefile index dfab3c8a7d7fc3..645e318def249b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 21 -EXTRAVERSION = +SUBLEVEL = 22 +EXTRAVERSION = -rc1 NAME = Nocturnal Monster Puppy # *DOCUMENTATION* @@ -502,7 +502,7 @@ endif include $(srctree)/arch/$(ARCH)/Makefile ifdef CONFIG_FRAME_POINTER -CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,) +CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls else CFLAGS += -fomit-frame-pointer endif @@ -587,7 +587,7 @@ libs-y := $(libs-y1) $(libs-y2) # --------------------------------------------------------------------------- # vmlinux is built from the objects selected by $(vmlinux-init) and # $(vmlinux-main). Most are built-in.o files from top-level directories -# in the kernel tree, others are specified in arch/$(ARCH)Makefile. +# in the kernel tree, others are specified in arch/$(ARCH)/Makefile. # Ordering when linking is important, and $(vmlinux-init) must be first. # # vmlinux @@ -614,6 +614,7 @@ vmlinux-init := $(head-y) $(init-y) vmlinux-main := $(core-y) $(libs-y) $(drivers-y) $(net-y) vmlinux-all := $(vmlinux-init) $(vmlinux-main) vmlinux-lds := arch/$(ARCH)/kernel/vmlinux.lds +export KBUILD_VMLINUX_OBJS := $(vmlinux-all) # Rule to link vmlinux - also used during CONFIG_KALLSYMS # May be overridden by arch/$(ARCH)/Makefile @@ -866,6 +867,7 @@ archprepare: prepare1 scripts_basic prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. + $(Q)$(MAKE) $(build)=. missing-syscalls # All the preparing.. prepare: prepare0 @@ -1288,10 +1290,7 @@ endif ALLSOURCE_ARCHS := $(ARCH) define find-sources - ( find $(__srctree) $(RCS_FIND_IGNORE) \ - \( -name include -o -name arch \) -prune -o \ - -name $1 -print; \ - for ARCH in $(ALLSOURCE_ARCHS) ; do \ + ( for ARCH in $(ALLSOURCE_ARCHS) ; do \ find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \ -name $1 -print; \ done ; \ @@ -1305,7 +1304,11 @@ define find-sources -name $1 -print; \ done ; \ find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ - -name $1 -print ) + -name $1 -print; \ + find $(__srctree) $(RCS_FIND_IGNORE) \ + \( -name include -o -name arch \) -prune -o \ + -name $1 -print; \ + ) endef define all-sources |