aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Makefile
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-05-28 13:30:12 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-05-28 13:30:12 +1000
commit86969cf7330a53c93edfd1bf2c28ad053e289162 (patch)
treea69d5408f126d21c6cae84a0fb44e9a33da0acd0 /arch/powerpc/Makefile
parentMerge remote-tracking branch 'scott/next' into next (diff)
parentpowerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode (diff)
downloadlinux-dev-86969cf7330a53c93edfd1bf2c28ad053e289162.tar.xz
linux-dev-86969cf7330a53c93edfd1bf2c28ad053e289162.zip
Merge branch 'merge' into next
Merge the binutils and kexec fixes.
Diffstat (limited to 'arch/powerpc/Makefile')
-rw-r--r--arch/powerpc/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 68cde2f8a12c..5687e299d0a5 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -155,7 +155,9 @@ endif
CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
-KBUILD_CPPFLAGS += -Iarch/$(ARCH)
+asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
+
+KBUILD_CPPFLAGS += -Iarch/$(ARCH) $(asinstr)
KBUILD_AFLAGS += -Iarch/$(ARCH) $(AFLAGS-y)
KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
CPP = $(CC) -E $(KBUILD_CFLAGS)