Skip to content

Commit b090065

Browse files
authored
Merge pull request #12708 from rajkan01/ARM_compiler_version
Remove compatibility for Arm Compiler versions prior to 6.01.0050
2 parents 8b92972 + 47e68b2 commit b090065

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

platform/source/mbed_crash_data_offsets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern "C" {
2525
/** \ingroup mbed-os-internal */
2626
/** \addtogroup platform-internal-api */
2727
/** @{*/
28-
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
28+
#if defined(__ARMCC_VERSION)
2929
extern uint32_t Image$$RW_m_crash_data$$ZI$$Base[];
3030
extern uint32_t Image$$RW_m_crash_data$$ZI$$Size;
3131
#define __CRASH_DATA_RAM_START__ Image$$RW_m_crash_data$$ZI$$Base

platform/source/mbed_retarget.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,14 @@
4747
static SingletonPtr<PlatformMutex> _mutex;
4848

4949
#if defined(__ARMCC_VERSION)
50-
# if __ARMCC_VERSION >= 6010050
51-
# include <arm_compat.h>
52-
# endif
50+
# include <arm_compat.h>
5351
# include <rt_sys.h>
5452
# include <rt_misc.h>
5553
# include <stdint.h>
5654
# define PREFIX(x) _sys##x
5755
# define OPEN_MAX _SYS_OPEN
5856
# ifdef __MICROLIB
59-
# if __ARMCC_VERSION >= 6010050
6057
asm(" .global __use_full_stdio\n");
61-
# else
62-
# pragma import(__use_full_stdio)
63-
# endif
6458
# endif
6559

6660
#elif defined(__ICCARM__)
@@ -803,7 +797,7 @@ MBED_WEAK int mbed::minimal_console_putc(int c)
803797
}
804798
#endif // MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY
805799

806-
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
800+
#if defined (__ARMCC_VERSION)
807801
extern "C" void PREFIX(_exit)(int return_code)
808802
{
809803
while (1) {}
@@ -1084,12 +1078,8 @@ extern "C" long PREFIX(_flen)(FILEHANDLE fh)
10841078
#if !defined(COMPONENT_SPE) || !defined(TARGET_TFM)
10851079

10861080
#if !defined(__MICROLIB)
1087-
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
10881081
__asm(".global __use_two_region_memory\n\t");
10891082
__asm(".global __use_no_semihosting\n\t");
1090-
#else
1091-
#pragma import(__use_two_region_memory)
1092-
#endif
10931083
#endif
10941084

10951085
// Through weak-reference, we can check if ARM_LIB_HEAP is defined at run-time.

rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,9 @@ void mbed_toolchain_init()
8686
With the RTOS there is not only one stack above the heap, there are multiple
8787
stacks and some of them are underneath the heap pointer.
8888
*/
89-
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
89+
#if defined (__ARMCC_VERSION)
9090
__asm(".global __use_two_region_memory\n\t");
9191
__asm(".global __use_no_semihosting\n\t");
92-
#else
93-
#pragma import(__use_two_region_memory)
9492
#endif
9593

9694
#define LIBSPACE_SIZE 96

0 commit comments

Comments
 (0)