1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 5ab6af3361a8..62b10f5f2540 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -23,12 +23,12 @@ CHECKFLAGS	+= -m64 -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__
 OBJCOPYFLAGS    := --strip-all
 LDFLAGS_vmlinux := -static
 KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/ia64/module.lds
-AFLAGS_KERNEL   := -mconstant-gp
+KBUILD_AFLAGS_KERNEL := -mconstant-gp
 EXTRA           :=
 cflags-y        := -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
                   -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
-CFLAGS_KERNEL   := -mconstant-gp
+KBUILD_CFLAGS_KERNEL := -mconstant-gp
 GAS_STATUS      = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
 KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")

diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 5ab6af3361a8..62b10f5f2540 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile
@@ -23,12 +23,12 @@ CHECKFLAGS += -m64 -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__
23	OBJCOPYFLAGS := --strip-all	23	OBJCOPYFLAGS := --strip-all
24	LDFLAGS_vmlinux := -static	24	LDFLAGS_vmlinux := -static
25	KBUILD_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)")