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/sh64 | |
| 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/sh64')
| -rw-r--r-- | arch/sh64/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/Makefile b/arch/sh64/Makefile index 8290c6380d7d..8dac7e1a2be6 100644 --- a/arch/sh64/Makefile +++ b/arch/sh64/Makefile | |||
| @@ -26,7 +26,7 @@ LDFLAGS += -EB -mshelf32_linux | |||
| 26 | endif | 26 | endif |
| 27 | 27 | ||
| 28 | # No requirements for endianess support from AFLAGS, 'as' always run through gcc | 28 | # No requirements for endianess support from AFLAGS, 'as' always run through gcc |
| 29 | CFLAGS += $(cpu-y) | 29 | KBUILD_CFLAGS += $(cpu-y) |
| 30 | 30 | ||
| 31 | LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_CACHED_MEMORY_OFFSET) \ | 31 | LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_CACHED_MEMORY_OFFSET) \ |
| 32 | --defsym phys_stext_shmedia=phys_stext+1 \ | 32 | --defsym phys_stext_shmedia=phys_stext+1 \ |
| @@ -58,7 +58,7 @@ ifneq ($(machine-y),) | |||
| 58 | core-y += arch/sh64/mach-$(machine-y)/ | 58 | core-y += arch/sh64/mach-$(machine-y)/ |
| 59 | endif | 59 | endif |
| 60 | 60 | ||
| 61 | LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) | 61 | LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) |
| 62 | libs-y += arch/$(ARCH)/lib/ $(LIBGCC) | 62 | libs-y += arch/$(ARCH)/lib/ $(LIBGCC) |
| 63 | 63 | ||
| 64 | drivers-$(CONFIG_OPROFILE) += arch/sh64/oprofile/ | 64 | drivers-$(CONFIG_OPROFILE) += arch/sh64/oprofile/ |