diff options
| author | Andres Salomon <dilinger@debian.org> | 2008-04-24 13:55:58 -0400 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-04-24 13:55:58 -0400 |
| commit | a4fcef851a5c6af8210ed4cdbdfe40b0152e617a (patch) | |
| tree | 3e4f59cae47cf42350d7c3b71accd3531769e73a /Makefile | |
| parent | 720922d70cf68dd9522a8a8b6c24a8db5b04c928 (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
| download | lwn-a4fcef851a5c6af8210ed4cdbdfe40b0152e617a.tar.gz lwn-a4fcef851a5c6af8210ed4cdbdfe40b0152e617a.zip | |
Merge tag 'v2.6.25'
they'll never take me alive!
Conflicts:
drivers/net/wireless/libertas/main.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-hub.c
Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 24 +SUBLEVEL = 25 EXTRAVERSION = -NAME = Arr Matey! A Hairy Bilge Rat! +NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION* # To see a list of typical targets execute "make help" @@ -189,7 +189,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Alternatively CROSS_COMPILE can be set in the environment. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile - +export KBUILD_BUILDHOST := $(SUBARCH) ARCH ?= $(SUBARCH) CROSS_COMPILE ?= @@ -507,6 +507,10 @@ else KBUILD_CFLAGS += -O2 endif +# Force gcc to behave correct even for buggy distributions +# Arch Makefiles may override this setting +KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) + include $(srctree)/arch/$(SRCARCH)/Makefile ifdef CONFIG_FRAME_POINTER @@ -525,9 +529,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) endif -# Force gcc to behave correct even for buggy distributions -KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) - # arch Makefile may override CC so keep this after arch Makefile is included NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) CHECKFLAGS += $(NOSTDINC_FLAGS) @@ -810,7 +811,9 @@ endif $(Q)rm -f .old_version # build vmlinux.o first to catch section mismatch errors early -$(kallsyms.o): vmlinux.o +ifdef CONFIG_KALLSYMS +.tmp_vmlinux1: vmlinux.o +endif vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE $(call if_changed_rule,vmlinux-modpost) |