andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #787. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9882 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2016-10-27 14:02:01 +00:00
parent e5621daba9
commit 330d539942
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/common/startup/ARMCMx/compilers/GCC/rules.mk
View File

@ -127,17 +127,20 @@ ifneq ($(strip $(TSRC)),)
CFLAGS += -DTHUMB_PRESENT CFLAGS += -DTHUMB_PRESENT
CPPFLAGS += -DTHUMB_PRESENT CPPFLAGS += -DTHUMB_PRESENT
ASFLAGS += -DTHUMB_PRESENT ASFLAGS += -DTHUMB_PRESENT
ASXFLAGS += -DTHUMB_PRESENT
ifneq ($(strip $(ASRC)),) ifneq ($(strip $(ASRC)),)
# Mixed ARM and THUMB mode. # Mixed ARM and THUMB mode.
CFLAGS += -mthumb-interwork CFLAGS += -mthumb-interwork
CPPFLAGS += -mthumb-interwork CPPFLAGS += -mthumb-interwork
ASFLAGS += -mthumb-interwork ASFLAGS += -mthumb-interwork
ASXFLAGS += -mthumb-interwork
LDFLAGS += -mthumb-interwork LDFLAGS += -mthumb-interwork
else else
# Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly. # Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
ASXFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
LDFLAGS += -mno-thumb-interwork -mthumb LDFLAGS += -mno-thumb-interwork -mthumb
endif endif
else else
@ -145,11 +148,13 @@ else
CFLAGS += -mno-thumb-interwork CFLAGS += -mno-thumb-interwork
CPPFLAGS += -mno-thumb-interwork CPPFLAGS += -mno-thumb-interwork
ASFLAGS += -mno-thumb-interwork ASFLAGS += -mno-thumb-interwork
ASXFLAGS += -mno-thumb-interwork
LDFLAGS += -mno-thumb-interwork LDFLAGS += -mno-thumb-interwork
endif endif
# Generate dependency information # Generate dependency information
ASFLAGS += -MD -MP -MF .dep/$(@F).d ASFLAGS += -MD -MP -MF .dep/$(@F).d
ASXFLAGS += -MD -MP -MF .dep/$(@F).d
CFLAGS += -MD -MP -MF .dep/$(@F).d CFLAGS += -MD -MP -MF .dep/$(@F).d
CPPFLAGS += -MD -MP -MF .dep/$(@F).d CPPFLAGS += -MD -MP -MF .dep/$(@F).d

2
readme.txt
View File

@ -147,6 +147,8 @@
- RT: Merged RT4. - RT: Merged RT4.
- NIL: Merged NIL2. - NIL: Merged NIL2.
- NIL: Added STM32F7 demo. - 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 - HAL: Fixed OTGv1 driver not functional on STM32L4 (bug #786)(backported
to 16.1.6). to 16.1.6).
- HAL: Fixed wrong bit offset in STM32F37x ADC_CR2_EXTSEL_SRC() macro - HAL: Fixed wrong bit offset in STM32F37x ADC_CR2_EXTSEL_SRC() macro