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/m32r | |
| 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/m32r')
| -rw-r--r-- | arch/m32r/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile index 60e12f312654..4072a07ebf8e 100644 --- a/arch/m32r/Makefile +++ b/arch/m32r/Makefile | |||
| @@ -9,7 +9,7 @@ LDFLAGS := | |||
| 9 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S | 9 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S |
| 10 | LDFLAGS_vmlinux := | 10 | LDFLAGS_vmlinux := |
| 11 | 11 | ||
| 12 | CFLAGS += -pipe -fno-schedule-insns | 12 | KBUILD_CFLAGS += -pipe -fno-schedule-insns |
| 13 | CFLAGS_KERNEL += -mmodel=medium | 13 | CFLAGS_KERNEL += -mmodel=medium |
| 14 | CFLAGS_MODULE += -mmodel=large | 14 | CFLAGS_MODULE += -mmodel=large |
| 15 | 15 | ||
| @@ -24,14 +24,14 @@ endif | |||
| 24 | cflags-$(CONFIG_ISA_M32R) += -DNO_FPU | 24 | cflags-$(CONFIG_ISA_M32R) += -DNO_FPU |
| 25 | aflags-$(CONFIG_ISA_M32R) += -DNO_FPU -O2 -Wa,-no-bitinst | 25 | aflags-$(CONFIG_ISA_M32R) += -DNO_FPU -O2 -Wa,-no-bitinst |
| 26 | 26 | ||
| 27 | CFLAGS += $(cflags-y) | 27 | KBUILD_CFLAGS += $(cflags-y) |
| 28 | AFLAGS += $(aflags-y) | 28 | KBUILD_AFLAGS += $(aflags-y) |
| 29 | 29 | ||
| 30 | CHECKFLAGS += -D__m32r__ -D__BIG_ENDIAN__=1 | 30 | CHECKFLAGS += -D__m32r__ -D__BIG_ENDIAN__=1 |
| 31 | 31 | ||
| 32 | head-y := arch/m32r/kernel/head.o arch/m32r/kernel/init_task.o | 32 | head-y := arch/m32r/kernel/head.o arch/m32r/kernel/init_task.o |
| 33 | 33 | ||
| 34 | LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) | 34 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |
| 35 | 35 | ||
| 36 | libs-y += arch/m32r/lib/ $(LIBGCC) | 36 | libs-y += arch/m32r/lib/ $(LIBGCC) |
| 37 | core-y += arch/m32r/kernel/ \ | 37 | core-y += arch/m32r/kernel/ \ |