X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cpu%2Fpxa%2Fconfig.mk;fp=cpu%2Fpxa%2Fconfig.mk;h=0e386984288551bebf7b308acc331e75d2ee5e7c;hb=1820d4c73b78ebe5d08921b0b6249c6f72e45215;hp=6030c49c2e4ec9e953fa6548cd0966c536af661f;hpb=9a8d82fd3c7822effe3226f97f9ef1f643498c89;p=people%2Fms%2Fu-boot.git

diff --git a/cpu/pxa/config.mk b/cpu/pxa/config.mk
index 6030c49c2e..0e38698428 100644
--- 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,))
+