diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-10-27 14:02:01 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-10-27 14:02:01 +0000 |
| commit | 330d539942860842bdb159c3d787f1100df8e47e (patch) | |
| tree | dd48d67146913b4f6e1649c3bcc00fdf92721217 | |
| parent | e5621daba906312f8b651629cc2a4da5db339c9b (diff) | |
| download | ChibiOS-330d539942860842bdb159c3d787f1100df8e47e.tar.gz ChibiOS-330d539942860842bdb159c3d787f1100df8e47e.tar.bz2 ChibiOS-330d539942860842bdb159c3d787f1100df8e47e.zip | |
Fixed bug #787.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9882 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/rules.mk | 5 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/rules.mk index 5026b7c9f..05d782732 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/rules.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/rules.mk @@ -127,17 +127,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
@@ -145,11 +148,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
diff --git a/readme.txt b/readme.txt index cd2a3e3b9..ed2570413 100644 --- a/readme.txt +++ b/readme.txt @@ -147,6 +147,8 @@ - RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Fixed Makefile dependencies not generated for .S files (bug #787)
+ (backported to 16.1.6, 3.0.6).
- HAL: Fixed OTGv1 driver not functional on STM32L4 (bug #786)(backported
to 16.1.6).
- HAL: Fixed wrong bit offset in STM32F37x ADC_CR2_EXTSEL_SRC() macro
|