diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
| commit | 821f3eff7cdb9d6c7076effabd46c96c322daed1 (patch) | |
| tree | 60f13155196fd6c84424c8aebc133ca4a5f56749 /arch/um/Makefile-i386 | |
| parent | ebc283118ee448dcb6e6cae74a8a43f17a1ccc3f (diff) | |
| parent | f77bf01425b11947eeb3b5b54685212c302741b8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: introduce ccflags-y, asflags-y and ldflags-y
kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
kbuild: enable use of AFLAGS and CFLAGS on commandline
kbuild: enable 'make AFLAGS=...' to add additional options to AS
kbuild: fix AFLAGS use in h8300 and m68knommu
kbuild: check for wrong use of CFLAGS
kbuild: enable 'make CFLAGS=...' to add additional options to CC
kbuild: fix up CFLAGS usage
kbuild: make modpost detect unterminated device id lists
kbuild: call export_report from the Makefile
kbuild: move Kai Germaschewski to CREDITS
kconfig/menuconfig: distinguish between selected-by-another options and comments
kconfig: tristate choices with mixed tristate and boolean values
include/linux/Kbuild: remove duplicate entries
kbuild: kill backward compatibility checks
kbuild: kill EXTRA_ARFLAGS
kbuild: fix documentation in makefiles.txt
kbuild: call make once for all targets when O=.. is used
kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
kbuild: update _shipped files for kconfig syntax cleanup
...
Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
Diffstat (limited to 'arch/um/Makefile-i386')
| -rw-r--r-- | arch/um/Makefile-i386 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index ae61e3c271e2..0178df306939 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 | |||
| @@ -12,8 +12,8 @@ HEADER_ARCH := x86 | |||
| 12 | 12 | ||
| 13 | ifeq ("$(origin SUBARCH)", "command line") | 13 | ifeq ("$(origin SUBARCH)", "command line") |
| 14 | ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)") | 14 | ifneq ("$(shell uname -m | sed -e s/i.86/i386/)", "$(SUBARCH)") |
| 15 | CFLAGS += $(call cc-option,-m32) | 15 | KBUILD_CFLAGS += $(call cc-option,-m32) |
| 16 | AFLAGS += $(call cc-option,-m32) | 16 | KBUILD_AFLAGS += $(call cc-option,-m32) |
| 17 | LINK-y += $(call cc-option,-m32) | 17 | LINK-y += $(call cc-option,-m32) |
| 18 | UML_OBJCOPYFLAGS += -F $(ELF_FORMAT) | 18 | UML_OBJCOPYFLAGS += -F $(ELF_FORMAT) |
| 19 | 19 | ||
| @@ -38,4 +38,4 @@ cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) | |||
| 38 | # an unresolved reference. | 38 | # an unresolved reference. |
| 39 | cflags-y += -ffreestanding | 39 | cflags-y += -ffreestanding |
| 40 | 40 | ||
| 41 | CFLAGS += $(cflags-y) | 41 | KBUILD_CFLAGS += $(cflags-y) |