aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile9
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/Makefile.thumb9
-rw-r--r--demos/ARM7-LPC214x-G++/Makefile12
-rw-r--r--demos/ARM7-LPC214x-G++/Makefile.thumb12
-rw-r--r--demos/ARM7-LPC214x-GCC-minimal/Makefile9
-rw-r--r--demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb9
-rw-r--r--demos/ARM7-LPC214x-GCC/Makefile9
-rw-r--r--demos/ARM7-LPC214x-GCC/Makefile.thumb9
8 files changed, 52 insertions, 26 deletions
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
diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb b/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
index 50883c63f..212886957 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile.thumb
+++ b/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
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
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile
index 7d7e8874c..fc941b4ce 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile
+++ b/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
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
index 0df66f2d3..95cb19000 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
+++ b/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
diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 32f08943e..88d64b911 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/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
diff --git a/demos/ARM7-LPC214x-GCC/Makefile.thumb b/demos/ARM7-LPC214x-GCC/Makefile.thumb
index a8840a293..3c8ba1947 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile.thumb
+++ b/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