diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-27 23:30:12 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-27 23:30:12 -0400 |
| commit | 86969cf7330a53c93edfd1bf2c28ad053e289162 (patch) | |
| tree | a69d5408f126d21c6cae84a0fb44e9a33da0acd0 /arch/powerpc/Makefile | |
| parent | b9d800959e87e538595a723f07dd3829c2f85d85 (diff) | |
| parent | 011e4b02f1da156ac7fea28a9da878f3c23af739 (diff) | |
Merge branch 'merge' into next
Merge the binutils and kexec fixes.
Diffstat (limited to 'arch/powerpc/Makefile')
| -rw-r--r-- | arch/powerpc/Makefile | 4 |
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 | |||
| 155 | 155 | ||
| 156 | CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell) | 156 | CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell) |
| 157 | 157 | ||
| 158 | KBUILD_CPPFLAGS += -Iarch/$(ARCH) | 158 | asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1) |
| 159 | |||
| 160 | KBUILD_CPPFLAGS += -Iarch/$(ARCH) $(asinstr) | ||
| 159 | KBUILD_AFLAGS += -Iarch/$(ARCH) $(AFLAGS-y) | 161 | KBUILD_AFLAGS += -Iarch/$(ARCH) $(AFLAGS-y) |
| 160 | KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y) | 162 | KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y) |
| 161 | CPP = $(CC) -E $(KBUILD_CFLAGS) | 163 | CPP = $(CC) -E $(KBUILD_CFLAGS) |