Skip to content

Commit 91f0be6

Browse files
kjbraceykjbracey
committed
Check correct ARMC6 predefine for FP codegen
For ARMC6, CMSIS headers were checking the `__ARM_PCS_VFP`, which indicates hardfp ABI in use, when they need to check whether FP code generation is enabled. Change this to `__ARM_FP`, so it works for platforms using softfp ABI. Change already present in CMSIS_5 repo, via commit 969822ae162539d50617d1e5a3634ee2fd3b60f6, but redone with local search-and-replace.
1 parent 8db2c0d commit 91f0be6

File tree

13 files changed

+13
-13
lines changed

13 files changed

+13
-13
lines changed

‎cmsis/TARGET_CORTEX_A/core_ca.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#endif
6060

6161
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
62-
#if defined __ARM_PCS_VFP
62+
#if defined __ARM_FP
6363
#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
6464
#define __FPU_USED 1U
6565
#else

‎cmsis/TARGET_CORTEX_M/core_armv8mbl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_armv8mml.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
#endif
9898

9999
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
100-
#if defined __ARM_PCS_VFP
100+
#if defined __ARM_FP
101101
#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
102102
#define __FPU_USED 1U
103103
#else

‎cmsis/TARGET_CORTEX_M/core_cm0.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_cm0plus.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_cm1.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_cm23.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_cm3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_cm33.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
#endif
9898

9999
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
100-
#if defined (__ARM_PCS_VFP)
100+
#if defined (__ARM_FP)
101101
#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
102102
#define __FPU_USED 1U
103103
#else

‎cmsis/TARGET_CORTEX_M/core_cm4.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
#endif
8787

8888
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
89-
#if defined __ARM_PCS_VFP
89+
#if defined __ARM_FP
9090
#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
9191
#define __FPU_USED 1U
9292
#else

‎cmsis/TARGET_CORTEX_M/core_cm7.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
#endif
8787

8888
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
89-
#if defined __ARM_PCS_VFP
89+
#if defined __ARM_FP
9090
#if defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U)
9191
#define __FPU_USED 1U
9292
#else

‎cmsis/TARGET_CORTEX_M/core_sc000.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

‎cmsis/TARGET_CORTEX_M/core_sc300.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#endif
8282

8383
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
84-
#if defined __ARM_PCS_VFP
84+
#if defined __ARM_FP
8585
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
8686
#endif
8787

0 commit comments

Comments
 (0)