diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-04-23 08:36:16 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2008-04-23 08:36:16 +0000 |
| commit | 25d517877dd7725e67c2d094031a023c41ec6f05 (patch) | |
| tree | d9b3a9666216073dfac7b472ca93e4dc329045fa /demos/ARM7-LPC214x-G++ | |
| parent | f80bb0647f6c51015cf6d3d8d6847c2e13c6ab84 (diff) | |
| download | ChibiOS-25d517877dd7725e67c2d094031a023c41ec6f05.tar.gz ChibiOS-25d517877dd7725e67c2d094031a023c41ec6f05.tar.bz2 ChibiOS-25d517877dd7725e67c2d094031a023c41ec6f05.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@275 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARM7-LPC214x-G++')
| -rw-r--r-- | demos/ARM7-LPC214x-G++/Makefile | 12 | ||||
| -rw-r--r-- | demos/ARM7-LPC214x-G++/Makefile.thumb | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/demos/ARM7-LPC214x-G++/Makefile b/demos/ARM7-LPC214x-G++/Makefile index e05b79362..6c04023a8 100644 --- a/demos/ARM7-LPC214x-G++/Makefile +++ b/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
diff --git a/demos/ARM7-LPC214x-G++/Makefile.thumb b/demos/ARM7-LPC214x-G++/Makefile.thumb index 16ab4d33f..9171d2b72 100644 --- a/demos/ARM7-LPC214x-G++/Makefile.thumb +++ b/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
|