Skip to content

Commit 7bdc280

Browse files
author
Cruz Monrreal
authored
Merge pull request #9437 from deepikabhavnani/preprocess_asm
FPU_USED to be set based on HW FPU support + Squash commits
2 parents f790fdd + 3bd6bf1 commit 7bdc280

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
DOMAIN_NS EQU 0
2929
#endif
3030

31-
#ifndef __FPU_USED
31+
#ifdef __ARM_FP
32+
__FPU_USED EQU 1
33+
#else
3234
__FPU_USED EQU 0
3335
#endif
3436

37+
3538
I_T_RUN_OFS EQU 20 ; osRtxInfo.thread.run offset
3639
TCB_SM_OFS EQU 48 ; TCB.stack_mem offset
3740
TCB_SP_OFS EQU 56 ; TCB.SP offset

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
.equ DOMAIN_NS, 0
3232
#endif
3333

34-
#ifndef __FPU_USED
34+
#if defined (__VFP_FP__) && !defined(__SOFTFP__)
35+
.equ __FPU_USED, 1
36+
#else
3537
.equ __FPU_USED, 0
3638
#endif
3739

tools/importer/cmsis_importer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,13 @@
145145
],
146146
"commit_sha" : [
147147
"4360b7bbf815c4d812005938c9c27af199803a97",
148-
"cc2e0517e1c6440abf88f2815b8e1501a55cdd4d",
149148
"b88254809eb626689c8aeb41304a308bf4e34a04",
150-
"287121ffdc4c9c19f9ce8872e4edd941862daca1",
151-
"b228cd9db0b7ed79d99f1d9be15d512791f367cc",
152149
"1752803626865147dca92f30a39cef8d04581736",
153150
"6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
154151
"fb354752eb69403ad503c8e53da67da6483776d6",
155152
"d3f7abdb7c109517e6a71daed8bae63ad6436afc",
156-
"ba92372b8d754cf65917a560cd27e4088548de0e"
153+
"ba92372b8d754cf65917a560cd27e4088548de0e",
154+
"094662790a0e100cb11ea2e0c1b94c4d796afb3f"
157155
]
158156
}
159157

0 commit comments

Comments
 (0)