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/s390 | |
| 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/s390')
| -rw-r--r-- | arch/s390/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 143ed8e154af..f708be367b03 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile | |||
| @@ -15,16 +15,16 @@ | |||
| 15 | 15 | ||
| 16 | ifndef CONFIG_64BIT | 16 | ifndef CONFIG_64BIT |
| 17 | LDFLAGS := -m elf_s390 | 17 | LDFLAGS := -m elf_s390 |
| 18 | CFLAGS += -m31 | 18 | KBUILD_CFLAGS += -m31 |
| 19 | AFLAGS += -m31 | 19 | KBUILD_AFLAGS += -m31 |
| 20 | UTS_MACHINE := s390 | 20 | UTS_MACHINE := s390 |
| 21 | STACK_SIZE := 8192 | 21 | STACK_SIZE := 8192 |
| 22 | CHECKFLAGS += -D__s390__ -msize-long | 22 | CHECKFLAGS += -D__s390__ -msize-long |
| 23 | else | 23 | else |
| 24 | LDFLAGS := -m elf64_s390 | 24 | LDFLAGS := -m elf64_s390 |
| 25 | MODFLAGS += -fpic -D__PIC__ | 25 | MODFLAGS += -fpic -D__PIC__ |
| 26 | CFLAGS += -m64 | 26 | KBUILD_CFLAGS += -m64 |
| 27 | AFLAGS += -m64 | 27 | KBUILD_AFLAGS += -m64 |
| 28 | UTS_MACHINE := s390x | 28 | UTS_MACHINE := s390x |
| 29 | STACK_SIZE := 16384 | 29 | STACK_SIZE := 16384 |
| 30 | CHECKFLAGS += -D__s390__ -D__s390x__ | 30 | CHECKFLAGS += -D__s390__ -D__s390x__ |
| @@ -77,9 +77,9 @@ cflags-$(CONFIG_WARN_STACK) += -mwarn-dynamicstack | |||
| 77 | cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE) | 77 | cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE) |
| 78 | endif | 78 | endif |
| 79 | 79 | ||
| 80 | CFLAGS += -mbackchain -msoft-float $(cflags-y) | 80 | KBUILD_CFLAGS += -mbackchain -msoft-float $(cflags-y) |
| 81 | CFLAGS += -pipe -fno-strength-reduce -Wno-sign-compare | 81 | KBUILD_CFLAGS += -pipe -fno-strength-reduce -Wno-sign-compare |
| 82 | AFLAGS += $(aflags-y) | 82 | KBUILD_AFLAGS += $(aflags-y) |
| 83 | 83 | ||
| 84 | OBJCOPYFLAGS := -O binary | 84 | OBJCOPYFLAGS := -O binary |
| 85 | LDFLAGS_vmlinux := -e start | 85 | LDFLAGS_vmlinux := -e start |