diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:10:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:10:07 -0400 |
| commit | da9e82b3b8989fc09e2a4c45b9da604ba2b4c46d (patch) | |
| tree | 7355d2afe95be27fddb8fa4baa46476c76aeb8ee /arch/ia64 | |
| parent | 90d3417a3a4e810d67081dd106f0e603a856978f (diff) | |
| parent | 772320e84588dcbe1600ffb83e5f328f2209ac2a (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
modpost: support objects with more than 64k sections
trivial: fix a typo in a filename
frv: clean up arch/frv/Makefile
kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line
kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line
Kbuild: Add option to set -femit-struct-debug-baseonly
Makefile: "make kernelrelease" should show the correct full kernel version
Makefile.build: make KBUILD_SYMTYPES work again
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 8ae0d2604ce1..be7bfa12b705 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
| @@ -22,13 +22,13 @@ CHECKFLAGS += -m64 -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__ | |||
| 22 | 22 | ||
| 23 | OBJCOPYFLAGS := --strip-all | 23 | OBJCOPYFLAGS := --strip-all |
| 24 | LDFLAGS_vmlinux := -static | 24 | LDFLAGS_vmlinux := -static |
| 25 | LDFLAGS_MODULE += -T $(srctree)/arch/ia64/module.lds | 25 | KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/ia64/module.lds |
| 26 | AFLAGS_KERNEL := -mconstant-gp | 26 | KBUILD_AFLAGS_KERNEL := -mconstant-gp |
| 27 | EXTRA := | 27 | EXTRA := |
| 28 | 28 | ||
| 29 | cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \ | 29 | cflags-y := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \ |
| 30 | -falign-functions=32 -frename-registers -fno-optimize-sibling-calls | 30 | -falign-functions=32 -frename-registers -fno-optimize-sibling-calls |
| 31 | CFLAGS_KERNEL := -mconstant-gp | 31 | KBUILD_CFLAGS_KERNEL := -mconstant-gp |
| 32 | 32 | ||
| 33 | GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") | 33 | GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") |
| 34 | KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") | 34 | KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") |