diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-11-27 15:28:17 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-11-27 15:28:17 +0000 |
| commit | 84b9bdd74cca5ce698095188668b1046cccdb094 (patch) | |
| tree | bd593ffaaeeb362bb02a215abaf6ddf569467d4c | |
| parent | b1a12e7130aaf7090f13237b918d432df4c6bea1 (diff) | |
| download | ChibiOS-84b9bdd74cca5ce698095188668b1046cccdb094.tar.gz ChibiOS-84b9bdd74cca5ce698095188668b1046cccdb094.tar.bz2 ChibiOS-84b9bdd74cca5ce698095188668b1046cccdb094.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12445 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S | 16 | ||||
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S b/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S index 36b96dfe7..9d850e079 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S +++ b/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S @@ -137,7 +137,7 @@ .cpu cortex-m0
.fpu softvfp
-
+ .syntax unified
.thumb
.text
@@ -191,7 +191,7 @@ msloop: cmp r1, r2
bge endmsloop
str r0, [r1]
- add r1, r1, #4
+ adds r1, #4
b msloop
endmsloop:
/* Process Stack initialization. Note, it assumes that the
@@ -203,7 +203,7 @@ psloop: cmp r1, r2
bge endpsloop
str r0, [r1]
- add r1, r1, #4
+ adds r1, #4
b psloop
endpsloop:
#endif
@@ -219,8 +219,8 @@ dloop: bge enddloop
ldr r0, [r1]
str r0, [r2]
- add r1, r1, #4
- add r2, r2, #4
+ adds r1, #4
+ adds r2, #4
b dloop
enddloop:
#endif
@@ -235,7 +235,7 @@ bloop: cmp r1, r2
bge endbloop
str r0, [r1]
- add r1, r1, #4
+ adds r1, #4
b bloop
endbloop:
#endif
@@ -257,7 +257,7 @@ initloop: bge endinitloop
ldr r1, [r4]
blx r1
- add r4, r4, #4
+ adds r4, #4
b initloop
endinitloop:
#endif
@@ -274,7 +274,7 @@ finiloop: bge endfiniloop
ldr r1, [r4]
blx r1
- add r4, r4, #4
+ adds r4, #4
b finiloop
endfiniloop:
#endif
diff --git a/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk b/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk index 6c593f0a8..9c88dbe78 100644 --- a/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk +++ b/os/common/startup/ARMCMx/compilers/LLVM/mk/rules.mk @@ -41,6 +41,7 @@ ifneq ($(USE_FPU),no) DDEFS += -DCORTEX_USE_FPU=TRUE
DADEFS += -DCORTEX_USE_FPU=TRUE
else
+ OPT += -mfloat-abi=soft
DDEFS += -DCORTEX_USE_FPU=FALSE
DADEFS += -DCORTEX_USE_FPU=FALSE
endif
|