From 25d517877dd7725e67c2d094031a023c41ec6f05 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 23 Apr 2008 08:36:16 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@275
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARM7-AT91SAM7X-GCC/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'demos/ARM7-AT91SAM7X-GCC/Makefile')

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index ea39d57e2..6c6d8f783 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -101,7 +101,7 @@ TOPT = -mthumb -D THUMB
 #       chconf.h.
 # NOTE: -falign-functions=16 may improve the performance, not always, but
 #       increases the code size.
-OPT = -O2 -ggdb -fomit-frame-pointer
+OPT = -O2 -ggdb -fomit-frame-pointer -mabi=apcs-gnu
 #OPT += -ffixed-r7
 #OPT += -falign-functions=16
 
@@ -138,10 +138,13 @@ ifneq ($(TSRC),)
     LDFLAGS += -mthumb-interwork
   else
     # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.
-    CPFLAGS += -D THUMB_NO_INTERWORKING
-    LDFLAGS += -mthumb
+    CPFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING
+    LDFLAGS += -mno-thumb-interwork -mthumb
     ASFLAGS += -D THUMB_NO_INTERWORKING
   endif
+else
+  CPFLAGS += -mno-thumb-interwork
+  LDFLAGS += -mno-thumb-interwork
 endif
 
 # Generate dependency information
-- 
cgit v1.2.3