ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12706 from hugueskamba/hk_remove_armc5_support_tests 

Tests: Remove support for ARM Compiler 5
pull/12712/head
Anna Bridge 2020-03-27 14:05:26 +00:00 committed by GitHub
parent abaf612ccd 4318a0747f
commit 2736896fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TESTS/mbed_hal/flash/functional_tests/main.cpp
View File

@ -55,19 +55,7 @@ static void erase_range(flash_t *flash, uint32_t addr, uint32_t size)
size = size > sector_size ? size - sector_size : 0; size = size > sector_size ? size - sector_size : 0;
} }
} }
#ifdef __CC_ARM #if defined (__ICCARM__)
MBED_NOINLINE
__asm static void delay_loop(uint32_t count)
{
// AStyle should not format inline assembly
// *INDENT-OFF*
1
SUBS a1, a1, #1
BCS %BT1
BX lr
// *INDENT-ON*
}
#elif defined (__ICCARM__)
MBED_NOINLINE MBED_NOINLINE
static void delay_loop(uint32_t count) static void delay_loop(uint32_t count)
{ {
@ -80,7 +68,7 @@ static void delay_loop(uint32_t count)
: "cc" : "cc"
); );
} }
#elif defined ( __GNUC__ ) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)) #elif defined ( __GNUC__ ) || defined(__ARMCC_VERSION)
MBED_NOINLINE MBED_NOINLINE
static void delay_loop(uint32_t count) static void delay_loop(uint32_t count)
{ {

4
TESTS/mbed_hal/spm/main.cpp
View File

@ -19,7 +19,7 @@
#error [NOT_SUPPORTED] Test supported only on PSA targets #error [NOT_SUPPORTED] Test supported only on PSA targets
#else #else
#if (defined( __CC_ARM ) || defined(__ARMCC_VERSION) || defined( __ICCARM__ )) #if (defined(__ARMCC_VERSION) || defined( __ICCARM__ ))
#error [NOT_SUPPORTED] this test is supported on GCC only #error [NOT_SUPPORTED] this test is supported on GCC only
#else #else
@ -158,5 +158,5 @@ int main()
} }
#endif // DOMAIN_NS == 1 #endif // DOMAIN_NS == 1
#endif // (defined( __CC_ARM ) || defined(__ARMCC_VERSION) || defined( __ICCARM__ )) #endif // (defined(__ARMCC_VERSION) || defined( __ICCARM__ ))
#endif // !defined(COMPONENT_PSA_SRV_IPC) #endif // !defined(COMPONENT_PSA_SRV_IPC)

2
UNITTESTS/target_h/platform/mbed_assert.h
View File

@ -106,7 +106,7 @@ do { \
#elif defined(__cplusplus) && defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) \ #elif defined(__cplusplus) && defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) \
&& (__GNUC__*100 + __GNUC_MINOR__) > 403L && (__GNUC__*100 + __GNUC_MINOR__) > 403L
#define MBED_STATIC_ASSERT(expr, msg) __extension__ static_assert(expr, msg) #define MBED_STATIC_ASSERT(expr, msg) __extension__ static_assert(expr, msg)
#elif !defined(__cplusplus) && defined(__GNUC__) && !defined(__CC_ARM) \ #elif !defined(__cplusplus) && defined(__GNUC__) \
&& (__GNUC__*100 + __GNUC_MINOR__) > 406L && (__GNUC__*100 + __GNUC_MINOR__) > 406L
#define MBED_STATIC_ASSERT(expr, msg) __extension__ _Static_assert(expr, msg) #define MBED_STATIC_ASSERT(expr, msg) __extension__ _Static_assert(expr, msg)
#elif defined(__ICCARM__) #elif defined(__ICCARM__)

4
features/frameworks/unity/unity/unity_internals.h
View File

@ -227,9 +227,7 @@ typedef _US64 _U_SINT;
#endif #endif
typedef UNITY_FLOAT_TYPE _UF; typedef UNITY_FLOAT_TYPE _UF;
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) #if !defined(__ARMCC_VERSION)
#else
#ifndef isinf #ifndef isinf
#define isinf(n) (((1.0f / f_zero) == n) ? 1 : 0) || (((-1.0f / f_zero) == n) ? 1 : 0) #define isinf(n) (((1.0f / f_zero) == n) ? 1 : 0) || (((-1.0f / f_zero) == n) ? 1 : 0)
#define UNITY_FLOAT_NEEDS_ZERO #define UNITY_FLOAT_NEEDS_ZERO

4
features/frameworks/utest/utest/utest_shim.h
View File

@ -28,9 +28,7 @@
#include "utest/utest_scheduler.h" #include "utest/utest_scheduler.h"
#ifndef __deprecated_message #ifndef __deprecated_message
# if defined(__CC_ARM) # if defined (__ICCARM__)
# define __deprecated_message(msg) __attribute__((deprecated))
# elif defined (__ICCARM__)
# define __deprecated_message(msg) # define __deprecated_message(msg)
# else # else
# define __deprecated_message(msg) __attribute__((deprecated(msg))) # define __deprecated_message(msg) __attribute__((deprecated(msg)))