git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@275 35acf78f-673a-0410-8e92-d51de3d6d3f4

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

demos/ARM7-AT91SAM7X-GCC/Makefile.thumb

@@ -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 = -Os -ggdb -fomit-frame-pointer
+OPT = -Os -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

demos/ARM7-LPC214x-G++/Makefile

@@ -111,7 +111,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
 
@@ -161,11 +161,15 @@ ifneq ($(TSRC),)
     LDFLAGS += -mthumb-interwork
   else
     # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.
-    CFLAGS += -D THUMB_NO_INTERWORKING
-    CPPFLAGS += -D THUMB_NO_INTERWORKING
-    LDFLAGS += -mthumb
+    CFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING
+    CPPFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING
+    LDFLAGS += -mno-thumb-interwork -mthumb
     ASFLAGS += -D THUMB_NO_INTERWORKING
   endif
+else
+  CPFLAGS += -mno-thumb-interwork
+  CPPFLAGS += -mno-thumb-interwork
+  LDFLAGS += -mno-thumb-interwork
 endif
 
 # Generate dependency information

demos/ARM7-LPC214x-G++/Makefile.thumb

@@ -111,7 +111,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
 
@@ -161,11 +161,15 @@ ifneq ($(TSRC),)
     LDFLAGS += -mthumb-interwork
   else
     # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.
-    CFLAGS += -D THUMB_NO_INTERWORKING
-    CPPFLAGS += -D THUMB_NO_INTERWORKING
-    LDFLAGS += -mthumb
+    CFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING
+    CPPFLAGS += -mno-thumb-interwork -D THUMB_NO_INTERWORKING
+    LDFLAGS += -mno-thumb-interwork -mthumb
     ASFLAGS += -D THUMB_NO_INTERWORKING
   endif
+else
+  CPFLAGS += -mno-thumb-interwork
+  CPPFLAGS += -mno-thumb-interwork
+  LDFLAGS += -mno-thumb-interwork
 endif
 
 # Generate dependency information

demos/ARM7-LPC214x-GCC-minimal/Makefile

@@ -99,7 +99,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
 
@@ -136,10 +136,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

demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb

@@ -99,7 +99,7 @@ TOPT = -mthumb -D THUMB
 #       chconf.h.
 # NOTE: -falign-functions=16 may improve the performance, not always, but
 #       increases the code size.
-OPT = -Os -ggdb -fomit-frame-pointer
+OPT = -Os -ggdb -fomit-frame-pointer -mabi=apcs-gnu
 #OPT += -ffixed-r7
 OPT += -falign-functions=16
 
@@ -136,10 +136,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

demos/ARM7-LPC214x-GCC/Makefile

@@ -102,7 +102,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
 
@@ -139,10 +139,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

demos/ARM7-LPC214x-GCC/Makefile.thumb

@@ -102,7 +102,7 @@ TOPT = -mthumb -D THUMB
 #       chconf.h.
 # NOTE: -falign-functions=16 may improve the performance, not always, but
 #       increases the code size.
-OPT = -Os -ggdb -fomit-frame-pointer -fno-strict-aliasing
+OPT = -Os -ggdb -fomit-frame-pointer -mabi=apcs-gnu
 #OPT += -ffixed-r7
 OPT += -falign-functions=16
 
@@ -139,10 +139,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

docs/Doxyfile

@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = ChibiOS/RT
-PROJECT_NUMBER         = "0.6.3 beta"
+PROJECT_NUMBER         = "0.6.4 beta"
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

docs/index.html

@@ -12,7 +12,7 @@
     </tr>
     <tr>
       <td style="text-align: center; vertical-align: top; width: 150px;">Current
-Version 0.6.3<br>
+Version 0.6.4<br>
 -<br>
       <a href="http://sourceforge.net/projects/chibios/" rel="me" target="_top">Project on SourceForge</a><br>
       <a href="html/index.html" target="_top" rel="me">Documentation</a><br>

readme.txt

@@ -62,6 +62,13 @@ Win32-MinGW            - ChibiOS/RT simulator and demo into a WIN32 process,
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 0.6.4 ***
+- Modified the ARM demos makefiles in order to make them more compatible with
+  GCC 4.3.0, it seems the new GCC assumes -mthumb-interworking and -mabi=apcs
+  by default, now the makefiles explictly assert -mno-thumb-interworking and
+  -mabi=apcs-gnu in order to produce better code. CodeSourcery's compilers
+  also share this behaviour.
+  
 *** 0.6.3 ***
 - NEW: ARM Cortex-M3 port completed. The demo program targets the STM32F103
   chip from ST Microelectronics on an Olimex STM32-P103 board.