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

- Remove the pre-processor directive __ARMCC_VERSION >= 6010050 

- Add the code prior to 6.01.0050 versions.
pull/12708/head
Rajkumar Kanagaraj 2020-03-27 14:37:01 +00:00
parent 6e17268bbd
commit 47e68b20cb
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/source/mbed_crash_data_offsets.h
View File

@ -25,7 +25,7 @@ extern "C" {
/** \ingroup mbed-os-internal */ /** \ingroup mbed-os-internal */
/** \addtogroup platform-internal-api */ /** \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$$Base[];
extern uint32_t Image$$RW_m_crash_data$$ZI$$Size; extern uint32_t Image$$RW_m_crash_data$$ZI$$Size;
#define __CRASH_DATA_RAM_START__ Image$$RW_m_crash_data$$ZI$$Base #define __CRASH_DATA_RAM_START__ Image$$RW_m_crash_data$$ZI$$Base

12
platform/source/mbed_retarget.cpp
View File

@ -47,20 +47,14 @@
static SingletonPtr<PlatformMutex> _mutex; static SingletonPtr<PlatformMutex> _mutex;
#if defined(__ARMCC_VERSION) #if defined(__ARMCC_VERSION)
# if __ARMCC_VERSION >= 6010050
# include <arm_compat.h> # include <arm_compat.h>
# endif
# include <rt_sys.h> # include <rt_sys.h>
# include <rt_misc.h> # include <rt_misc.h>
# include <stdint.h> # include <stdint.h>
# define PREFIX(x) _sys##x # define PREFIX(x) _sys##x
# define OPEN_MAX _SYS_OPEN # define OPEN_MAX _SYS_OPEN
# ifdef __MICROLIB # ifdef __MICROLIB
# if __ARMCC_VERSION >= 6010050
asm(" .global __use_full_stdio\n"); asm(" .global __use_full_stdio\n");
# else
# pragma import(__use_full_stdio)
# endif
# endif # endif
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
@ -803,7 +797,7 @@ MBED_WEAK int mbed::minimal_console_putc(int c)
} }
#endif // MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY #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) extern "C" void PREFIX(_exit)(int return_code)
{ {
while (1) {} while (1) {}
@ -1084,12 +1078,8 @@ extern "C" long PREFIX(_flen)(FILEHANDLE fh)
#if !defined(COMPONENT_SPE) || !defined(TARGET_TFM) #if !defined(COMPONENT_SPE) || !defined(TARGET_TFM)
#if !defined(__MICROLIB) #if !defined(__MICROLIB)
#if defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
__asm(".global __use_two_region_memory\n\t"); __asm(".global __use_two_region_memory\n\t");
__asm(".global __use_no_semihosting\n\t"); __asm(".global __use_no_semihosting\n\t");
#else
#pragma import(__use_two_region_memory)
#endif
#endif #endif
// Through weak-reference, we can check if ARM_LIB_HEAP is defined at run-time. // Through weak-reference, we can check if ARM_LIB_HEAP is defined at run-time.

4
rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
View File

@ -86,11 +86,9 @@ void mbed_toolchain_init()
With the RTOS there is not only one stack above the heap, there are multiple 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. 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_two_region_memory\n\t");
__asm(".global __use_no_semihosting\n\t"); __asm(".global __use_no_semihosting\n\t");
#else
#pragma import(__use_two_region_memory)
#endif #endif
#define LIBSPACE_SIZE 96 #define LIBSPACE_SIZE 96