aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-04-22 20:02:04 -0400
committerAnton Blanchard <anton@samba.org>2014-04-22 20:02:04 -0400
commit58aedccb1907f05f702f0f6d8f8a57e8efe485b7 (patch)
tree9e62bab4ab9c7cafbefd5db847770ff895144fa8
parenta798c10faf62a505d24e5f6213fbaf904a39623f (diff)
powerpc: Don't build assembly files with ABIv2
We avoid ABIv2 when building c files since commit b2ca8c89 (powerpc: Don't use ELFv2 ABI to build the kernel). Do the same for assembly files. Signed-off-by: Anton Blanchard <anton@samba.org>
-rw-r--r--arch/powerpc/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 4c0cedf4e2c7..e8dd01af504d 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -115,6 +115,7 @@ endif
115 115
116CFLAGS-$(CONFIG_PPC64) := -mtraceback=no -mcall-aixdesc 116CFLAGS-$(CONFIG_PPC64) := -mtraceback=no -mcall-aixdesc
117CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) 117CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1)
118AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1)
118CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcmodel=medium,-mminimal-toc) 119CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcmodel=medium,-mminimal-toc)
119CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mno-pointers-to-nested-functions) 120CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mno-pointers-to-nested-functions)
120CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 $(MULTIPLEWORD) 121CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 $(MULTIPLEWORD)
@@ -151,7 +152,7 @@ endif
151CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell) 152CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
152 153
153KBUILD_CPPFLAGS += -Iarch/$(ARCH) 154KBUILD_CPPFLAGS += -Iarch/$(ARCH)
154KBUILD_AFLAGS += -Iarch/$(ARCH) 155KBUILD_AFLAGS += -Iarch/$(ARCH) $(AFLAGS-y)
155KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y) 156KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
156CPP = $(CC) -E $(KBUILD_CFLAGS) 157CPP = $(CC) -E $(KBUILD_CFLAGS)
157 158