[PATCH] ppc32: fix compilation with binutils-2.15

Currently, ppc32 will not always compile with binutils-2.15.  The issue
is that binutils has become even more strict about which opcodes can be
used with which CPU flags.  The problem is that we have a number of
cases where we compile with altivec instructions (with runtime checks to
make sure we can actually run them) in code that's not altivec specific.

The fix for this is to always pass in -maltivec on CONFIG_6xx.  To do
this cleanly, we split our AFLAGS definition up into
aflags-$(CONFIG_FOO).

Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index f182c0e0a73bf55ef146429918a9f8234becfdc5..bf3d1a2bd558616c874af98b821be4515b14148f 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -22,7 +22,7 @@ endif
 
 LDFLAGS_vmlinux        := -Ttext $(KERNELLOAD) -Bstatic
 CPPFLAGS       += -Iarch/$(ARCH)
-AFLAGS         += -Iarch/$(ARCH)
+aflags-y       += -Iarch/$(ARCH)
 cflags-y       += -Iarch/$(ARCH) -msoft-float -pipe \
                -ffixed-r2 -Wno-uninitialized -mmultiple
 CPP            = $(CC) -E $(CFLAGS)
@@ -33,10 +33,16 @@ ifndef CONFIG_E500
 cflags-y       += -mstring
 endif
 
+aflags-$(CONFIG_4xx)           += -m405
 cflags-$(CONFIG_4xx)           += -Wa,-m405
+aflags-$(CONFIG_6xx)           += -maltivec
+cflags-$(CONFIG_6xx)           += -Wa,-maltivec
+aflags-$(CONFIG_E500)          += -me500
 cflags-$(CONFIG_E500)          += -Wa,-me500
+aflags-$(CONFIG_PPC64BRIDGE)   += -mppc64bridge
 cflags-$(CONFIG_PPC64BRIDGE)   += -Wa,-mppc64bridge
 
+AFLAGS += $(aflags-y)
 CFLAGS += $(cflags-y)
 
 head-y                         := arch/ppc/kernel/head.o