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/alpha | |
| 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/alpha')
| -rw-r--r-- | arch/alpha/Makefile | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/alpha/lib/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile index d1004b4d942f..63104ebd1806 100644 --- a/arch/alpha/Makefile +++ b/arch/alpha/Makefile | |||
| @@ -33,7 +33,7 @@ cflags-y += $(cpuflags-y) | |||
| 33 | # For TSUNAMI, we must have the assembler not emulate our instructions. | 33 | # For TSUNAMI, we must have the assembler not emulate our instructions. |
| 34 | # The same is true for IRONGATE, POLARIS, PYXIS. | 34 | # The same is true for IRONGATE, POLARIS, PYXIS. |
| 35 | # BWX is most important, but we don't really want any emulation ever. | 35 | # BWX is most important, but we don't really want any emulation ever. |
| 36 | CFLAGS += $(cflags-y) -Wa,-mev6 | 36 | KBUILD_CFLAGS += $(cflags-y) -Wa,-mev6 |
| 37 | 37 | ||
| 38 | head-y := arch/alpha/kernel/head.o | 38 | head-y := arch/alpha/kernel/head.o |
| 39 | 39 | ||
diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile index ab6fa54b3860..dccf05245d4d 100644 --- a/arch/alpha/kernel/Makefile +++ b/arch/alpha/kernel/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | extra-y := head.o vmlinux.lds | 5 | extra-y := head.o vmlinux.lds |
| 6 | EXTRA_AFLAGS := $(CFLAGS) | 6 | EXTRA_AFLAGS := $(KBUILD_CFLAGS) |
| 7 | EXTRA_CFLAGS := -Werror -Wno-sign-compare | 7 | EXTRA_CFLAGS := -Werror -Wno-sign-compare |
| 8 | 8 | ||
| 9 | obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \ | 9 | obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \ |
diff --git a/arch/alpha/lib/Makefile b/arch/alpha/lib/Makefile index 266f78e13076..9b72c59c95be 100644 --- a/arch/alpha/lib/Makefile +++ b/arch/alpha/lib/Makefile | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for alpha-specific library files.. | 2 | # Makefile for alpha-specific library files.. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | EXTRA_AFLAGS := $(CFLAGS) | 5 | EXTRA_AFLAGS := $(KBUILD_CFLAGS) |
| 6 | EXTRA_CFLAGS := -Werror | 6 | EXTRA_CFLAGS := -Werror |
| 7 | 7 | ||
| 8 | # Many of these routines have implementations tuned for ev6. | 8 | # Many of these routines have implementations tuned for ev6. |