[ARM PATCH] 2182/1: apcs-32 and alignment-traps command line options are deprecated in gcc-4.0

Patch from George G. Davis

Recent gcc-4.0 and gcc-csl-arm-branch tool chains no longer include support
for apcs-32 and alignment-traps command line options. This patch tests
for presence of these deprecated c/l options and uses new gcc-4.0 c/l
options instead if they are not supported by the current toolchain.

Signed-off-by: George G. Davis 
Signed-off-by: Russell King

arch/arm/Makefile

@@ -58,8 +58,9 @@ tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110)
 tune-$(CONFIG_CPU_V6)		:=-mtune=strongarm
 
 # Need -Uarm for gcc < 3.x
-CFLAGS		+=-mapcs-32 $(arch-y) $(tune-y) $(call cc-option,-malignment-traps,-mshort-load-bytes) -msoft-float -Uarm
-AFLAGS		+=-mapcs-32 $(arch-y) $(tune-y) -msoft-float
+CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+CFLAGS		+=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
+AFLAGS		+=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float
 
 CHECKFLAGS	+= -D__arm__