aboutsummaryrefslogtreecommitdiffstats
path: root/os/common/startup/ARM
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-10-27 14:07:16 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-10-27 14:07:16 +0000
commit6a3e9bfe0be936a57c1c6ba8fde254ef60040ba5 (patch)
tree139c4a254b510af4cd311a03be96e48c2b47492a /os/common/startup/ARM
parent330d539942860842bdb159c3d787f1100df8e47e (diff)
downloadChibiOS-6a3e9bfe0be936a57c1c6ba8fde254ef60040ba5.tar.gz
ChibiOS-6a3e9bfe0be936a57c1c6ba8fde254ef60040ba5.tar.bz2
ChibiOS-6a3e9bfe0be936a57c1c6ba8fde254ef60040ba5.zip
Fixed bug #787.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9883 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/common/startup/ARM')
-rw-r--r--os/common/startup/ARM/compilers/GCC/rules.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/os/common/startup/ARM/compilers/GCC/rules.mk b/os/common/startup/ARM/compilers/GCC/rules.mk
index fa8a4ec4e..7c068d588 100644
--- a/os/common/startup/ARM/compilers/GCC/rules.mk
+++ b/os/common/startup/ARM/compilers/GCC/rules.mk
@@ -131,17 +131,20 @@ ifneq ($(strip $(TSRC)),)
CFLAGS += -DTHUMB_PRESENT
CPPFLAGS += -DTHUMB_PRESENT
ASFLAGS += -DTHUMB_PRESENT
+ ASXFLAGS += -DTHUMB_PRESENT
ifneq ($(strip $(ASRC)),)
# Mixed ARM and THUMB mode.
CFLAGS += -mthumb-interwork
CPPFLAGS += -mthumb-interwork
ASFLAGS += -mthumb-interwork
+ ASXFLAGS += -mthumb-interwork
LDFLAGS += -mthumb-interwork
else
# Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
+ ASXFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
LDFLAGS += -mno-thumb-interwork -mthumb
endif
else
@@ -149,11 +152,13 @@ else
CFLAGS += -mno-thumb-interwork
CPPFLAGS += -mno-thumb-interwork
ASFLAGS += -mno-thumb-interwork
+ ASXFLAGS += -mno-thumb-interwork
LDFLAGS += -mno-thumb-interwork
endif
# Generate dependency information
ASFLAGS += -MD -MP -MF .dep/$(@F).d
+ASXFLAGS += -MD -MP -MF .dep/$(@F).d
CFLAGS += -MD -MP -MF .dep/$(@F).d
CPPFLAGS += -MD -MP -MF .dep/$(@F).d