diff --git a/platform/source/mbed_crash_data_offsets.h b/platform/source/mbed_crash_data_offsets.h index a289ab008d..da3003aa16 100644 --- a/platform/source/mbed_crash_data_offsets.h +++ b/platform/source/mbed_crash_data_offsets.h @@ -25,7 +25,7 @@ extern "C" { /** \ingroup mbed-os-internal */ /** \addtogroup platform-internal-api */ /** @{*/ -#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) +#if defined(__ARMCC_VERSION) extern uint32_t Image$$RW_m_crash_data$$ZI$$Base[]; extern uint32_t Image$$RW_m_crash_data$$ZI$$Size; #define __CRASH_DATA_RAM_START__ Image$$RW_m_crash_data$$ZI$$Base diff --git a/platform/source/mbed_retarget.cpp b/platform/source/mbed_retarget.cpp index c07ada978c..1bd5627cf7 100644 --- a/platform/source/mbed_retarget.cpp +++ b/platform/source/mbed_retarget.cpp @@ -47,20 +47,14 @@ static SingletonPtr _mutex; #if defined(__ARMCC_VERSION) -# if __ARMCC_VERSION >= 6010050 -# include -# endif +# include # include # include # include # define PREFIX(x) _sys##x # define OPEN_MAX _SYS_OPEN # ifdef __MICROLIB -# if __ARMCC_VERSION >= 6010050 asm(" .global __use_full_stdio\n"); -# else -# pragma import(__use_full_stdio) -# endif # endif #elif defined(__ICCARM__) @@ -803,7 +797,7 @@ MBED_WEAK int mbed::minimal_console_putc(int c) } #endif // MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY -#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) +#if defined (__ARMCC_VERSION) extern "C" void PREFIX(_exit)(int return_code) { while (1) {} @@ -1084,12 +1078,8 @@ extern "C" long PREFIX(_flen)(FILEHANDLE fh) #if !defined(COMPONENT_SPE) || !defined(TARGET_TFM) #if !defined(__MICROLIB) -#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) __asm(".global __use_two_region_memory\n\t"); __asm(".global __use_no_semihosting\n\t"); -#else -#pragma import(__use_two_region_memory) -#endif #endif // Through weak-reference, we can check if ARM_LIB_HEAP is defined at run-time. diff --git a/rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c b/rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c index 9bafcef5a2..0142747f07 100644 --- a/rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c +++ b/rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c @@ -86,11 +86,9 @@ void mbed_toolchain_init() With the RTOS there is not only one stack above the heap, there are multiple stacks and some of them are underneath the heap pointer. */ -#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) +#if defined (__ARMCC_VERSION) __asm(".global __use_two_region_memory\n\t"); __asm(".global __use_no_semihosting\n\t"); -#else -#pragma import(__use_two_region_memory) #endif #define LIBSPACE_SIZE 96