Skip to content

Commit 2736896

Browse files
authored
Merge pull request #12706 from hugueskamba/hk_remove_armc5_support_tests
Tests: Remove support for ARM Compiler 5
2 parents abaf612 + 4318a07 commit 2736896

File tree

5 files changed

+7
-23
lines changed

5 files changed

+7
-23
lines changed

TESTS/mbed_hal/flash/functional_tests/main.cpp

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,7 @@ static void erase_range(flash_t *flash, uint32_t addr, uint32_t size)
5555
size = size > sector_size ? size - sector_size : 0;
5656
}
5757
}
58-
#ifdef __CC_ARM
59-
MBED_NOINLINE
60-
__asm static void delay_loop(uint32_t count)
61-
{
62-
// AStyle should not format inline assembly
63-
// *INDENT-OFF*
64-
1
65-
SUBS a1, a1, #1
66-
BCS %BT1
67-
BX lr
68-
// *INDENT-ON*
69-
}
70-
#elif defined (__ICCARM__)
58+
#if defined (__ICCARM__)
7159
MBED_NOINLINE
7260
static void delay_loop(uint32_t count)
7361
{
@@ -80,7 +68,7 @@ static void delay_loop(uint32_t count)
8068
: "cc"
8169
);
8270
}
83-
#elif defined ( __GNUC__ ) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
71+
#elif defined ( __GNUC__ ) || defined(__ARMCC_VERSION)
8472
MBED_NOINLINE
8573
static void delay_loop(uint32_t count)
8674
{

TESTS/mbed_hal/spm/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#error [NOT_SUPPORTED] Test supported only on PSA targets
2020
#else
2121

22-
#if (defined( __CC_ARM ) || defined(__ARMCC_VERSION) || defined( __ICCARM__ ))
22+
#if (defined(__ARMCC_VERSION) || defined( __ICCARM__ ))
2323
#error [NOT_SUPPORTED] this test is supported on GCC only
2424
#else
2525

@@ -158,5 +158,5 @@ int main()
158158
}
159159

160160
#endif // DOMAIN_NS == 1
161-
#endif // (defined( __CC_ARM ) || defined(__ARMCC_VERSION) || defined( __ICCARM__ ))
161+
#endif // (defined(__ARMCC_VERSION) || defined( __ICCARM__ ))
162162
#endif // !defined(COMPONENT_PSA_SRV_IPC)

UNITTESTS/target_h/platform/mbed_assert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ do { \
106106
#elif defined(__cplusplus) && defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) \
107107
&& (__GNUC__*100 + __GNUC_MINOR__) > 403L
108108
#define MBED_STATIC_ASSERT(expr, msg) __extension__ static_assert(expr, msg)
109-
#elif !defined(__cplusplus) && defined(__GNUC__) && !defined(__CC_ARM) \
109+
#elif !defined(__cplusplus) && defined(__GNUC__) \
110110
&& (__GNUC__*100 + __GNUC_MINOR__) > 406L
111111
#define MBED_STATIC_ASSERT(expr, msg) __extension__ _Static_assert(expr, msg)
112112
#elif defined(__ICCARM__)

features/frameworks/unity/unity/unity_internals.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,7 @@ typedef _US64 _U_SINT;
227227
#endif
228228
typedef UNITY_FLOAT_TYPE _UF;
229229

230-
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
231-
#else
232-
230+
#if !defined(__ARMCC_VERSION)
233231
#ifndef isinf
234232
#define isinf(n) (((1.0f / f_zero) == n) ? 1 : 0) || (((-1.0f / f_zero) == n) ? 1 : 0)
235233
#define UNITY_FLOAT_NEEDS_ZERO

features/frameworks/utest/utest/utest_shim.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
#include "utest/utest_scheduler.h"
2929

3030
#ifndef __deprecated_message
31-
# if defined(__CC_ARM)
32-
# define __deprecated_message(msg) __attribute__((deprecated))
33-
# elif defined (__ICCARM__)
31+
# if defined (__ICCARM__)
3432
# define __deprecated_message(msg)
3533
# else
3634
# define __deprecated_message(msg) __attribute__((deprecated(msg)))

0 commit comments

Comments
 (0)