Skip to content

Commit a47f4c6

Browse files
GuentherMartinJonatanAntoni
GuentherMartin
authored and
JonatanAntoni
committed
Core: resolve __ARM_FP undef warning (#120)
1 parent 65fe25f commit a47f4c6

6 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎CMSIS/Core/Include/a-profile/cmsis_armclang_a.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 Arm Limited. All rights reserved.
2+
* Copyright (c) 2009-2024 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -560,11 +560,11 @@ __STATIC_FORCEINLINE void __disable_fault_irq(void)
560560
*/
561561
__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
562562
{
563-
#if (__ARM_FP >= 1)
564-
return __builtin_arm_get_fpscr();
565-
#else
566-
return(0U);
567-
#endif
563+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
564+
return __builtin_arm_get_fpscr();
565+
#else
566+
return(0U);
567+
#endif
568568
}
569569

570570

@@ -575,11 +575,11 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
575575
*/
576576
__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
577577
{
578-
#if (__ARM_FP >= 1)
579-
__builtin_arm_set_fpscr(fpscr);
580-
#else
581-
(void)fpscr;
582-
#endif
578+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
579+
__builtin_arm_set_fpscr(fpscr);
580+
#else
581+
(void)fpscr;
582+
#endif
583583
}
584584

585585

‎CMSIS/Core/Include/a-profile/cmsis_clang_a.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023 Arm Limited. All rights reserved.
2+
* Copyright (c) 2023-2024 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -572,11 +572,11 @@ __STATIC_FORCEINLINE void __disable_fault_irq(void)
572572
*/
573573
__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
574574
{
575-
#if (__ARM_FP >= 1)
576-
return __builtin_arm_get_fpscr();
577-
#else
578-
return(0U);
579-
#endif
575+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
576+
return __builtin_arm_get_fpscr();
577+
#else
578+
return(0U);
579+
#endif
580580
}
581581

582582

@@ -587,11 +587,11 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
587587
*/
588588
__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
589589
{
590-
#if (__ARM_FP >= 1)
591-
__builtin_arm_set_fpscr(fpscr);
592-
#else
593-
(void)fpscr;
594-
#endif
590+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
591+
__builtin_arm_set_fpscr(fpscr);
592+
#else
593+
(void)fpscr;
594+
#endif
595595
}
596596

597597

‎CMSIS/Core/Include/a-profile/cmsis_gcc_a.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 Arm Limited. All rights reserved.
2+
* Copyright (c) 2009-2024 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -595,11 +595,11 @@ __STATIC_FORCEINLINE void __disable_fault_irq(void)
595595
*/
596596
__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
597597
{
598-
#if (__ARM_FP >= 1)
599-
return __builtin_arm_get_fpscr();
600-
#else
601-
return(0U);
602-
#endif
598+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
599+
return __builtin_arm_get_fpscr();
600+
#else
601+
return(0U);
602+
#endif
603603
}
604604

605605

@@ -610,11 +610,11 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
610610
*/
611611
__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
612612
{
613-
#if (__ARM_FP >= 1)
614-
__builtin_arm_set_fpscr(fpscr);
615-
#else
616-
(void)fpscr;
617-
#endif
613+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
614+
__builtin_arm_set_fpscr(fpscr);
615+
#else
616+
(void)fpscr;
617+
#endif
618618
}
619619

620620

‎CMSIS/Core/Include/m-profile/cmsis_armclang_m.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 Arm Limited. All rights reserved.
2+
* Copyright (c) 2009-2024 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -1333,7 +1333,7 @@ __STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
13331333
*/
13341334
__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
13351335
{
1336-
#if (__ARM_FP >= 1)
1336+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
13371337
return (__builtin_arm_get_fpscr());
13381338
#else
13391339
return (0U);
@@ -1348,7 +1348,7 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
13481348
*/
13491349
__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
13501350
{
1351-
#if (__ARM_FP >= 1)
1351+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
13521352
__builtin_arm_set_fpscr(fpscr);
13531353
#else
13541354
(void)fpscr;

‎CMSIS/Core/Include/m-profile/cmsis_clang_m.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2023 Arm Limited. All rights reserved.
2+
* Copyright (c) 2009-2024 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -1334,7 +1334,7 @@ __STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
13341334
*/
13351335
__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
13361336
{
1337-
#if (__ARM_FP >= 1)
1337+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
13381338
return (__builtin_arm_get_fpscr());
13391339
#else
13401340
return (0U);
@@ -1349,7 +1349,7 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
13491349
*/
13501350
__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
13511351
{
1352-
#if (__ARM_FP >= 1)
1352+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
13531353
__builtin_arm_set_fpscr(fpscr);
13541354
#else
13551355
(void)fpscr;

‎CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023 Arm Limited. All rights reserved.
2+
* Copyright (c) 2023-2024 Arm Limited. All rights reserved.
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*
@@ -1333,7 +1333,7 @@ __STATIC_FORCEINLINE void __TZ_set_MSPLIM_NS(uint32_t MainStackPtrLimit)
13331333
*/
13341334
__STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
13351335
{
1336-
#if (__ARM_FP >= 1)
1336+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
13371337
return (__builtin_arm_get_fpscr());
13381338
#else
13391339
return (0U);
@@ -1348,7 +1348,7 @@ __STATIC_FORCEINLINE uint32_t __get_FPSCR(void)
13481348
*/
13491349
__STATIC_FORCEINLINE void __set_FPSCR(uint32_t fpscr)
13501350
{
1351-
#if (__ARM_FP >= 1)
1351+
#if (defined(__ARM_FP) && (__ARM_FP >= 1))
13521352
__builtin_arm_set_fpscr(fpscr);
13531353
#else
13541354
(void)fpscr;

0 commit comments

Comments
 (0)