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/ia64/Makefile | |
| 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/ia64/Makefile')
| -rw-r--r-- | arch/ia64/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 21033ed83307..34951aa2370b 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
| @@ -29,7 +29,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \ | |||
| 29 | CFLAGS_KERNEL := -mconstant-gp | 29 | CFLAGS_KERNEL := -mconstant-gp |
| 30 | 30 | ||
| 31 | GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") | 31 | GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") |
| 32 | CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") | 32 | KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") |
| 33 | 33 | ||
| 34 | ifeq ($(GAS_STATUS),buggy) | 34 | ifeq ($(GAS_STATUS),buggy) |
| 35 | $(error Sorry, you need a newer version of the assember, one that is built from \ | 35 | $(error Sorry, you need a newer version of the assember, one that is built from \ |
| @@ -44,7 +44,7 @@ ifeq ($(call cc-version),0304) | |||
| 44 | cflags-$(CONFIG_MCKINLEY) += -mtune=mckinley | 44 | cflags-$(CONFIG_MCKINLEY) += -mtune=mckinley |
| 45 | endif | 45 | endif |
| 46 | 46 | ||
| 47 | CFLAGS += $(cflags-y) | 47 | KBUILD_CFLAGS += $(cflags-y) |
| 48 | head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o | 48 | head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o |
| 49 | 49 | ||
| 50 | libs-y += arch/ia64/lib/ | 50 | libs-y += arch/ia64/lib/ |