Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx

[oweals/u-boot.git] / cpu / arm926ejs / config.mk

diff --git a/cpu/arm926ejs/config.mk b/cpu/arm926ejs/config.mk
index cef7d26f1cb48b8c84642a58a80d050d3e3a756b..8db4adbe1799038e830921b4fd4613940d9e3497 100644 (file)
--- a/cpu/arm926ejs/config.mk
+++ b/cpu/arm926ejs/config.mk
@@ -22,6 +22,13 @@
 #
 
 PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
-       -mshort-load-bytes -msoft-float
+       -msoft-float
 
-PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4
+PLATFORM_CPPFLAGS += -march=armv4
+# =========================================================================
+#
+# 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,))