Make sure only supported compiler options are used

[people/ms/u-boot.git] / cpu / pxa / config.mk

diff --git a/cpu/pxa/config.mk b/cpu/pxa/config.mk
index 6030c49c2e4ec9e953fa6548cd0966c536af661f..0e386984288551bebf7b308acc331e75d2ee5e7c 100644 (file)
--- a/cpu/pxa/config.mk
+++ b/cpu/pxa/config.mk
@@ -23,7 +23,15 @@
 #
 
 PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
-       -mshort-load-bytes -msoft-float
+       -msoft-float
 
 #PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100
-PLATFORM_CPPFLAGS += -mapcs-32 -march=armv5 -mtune=xscale
+PLATFORM_CPPFLAGS += -march=armv5 -mtune=xscale
+# =========================================================================
+#
+# Supply options according to compiler version
+#
+# ========================================================================
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
+