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

ARMC6 compiler related changes

pull/7631/head
Deepika 2017-09-14 11:21:19 -05:00 committed by Cruz Monrreal II
parent 42b713cab2
commit 0be7de013e
8 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_NUVOTON/TARGET_M2351/device/M2351.h
View File

@ -31508,7 +31508,7 @@ typedef struct
#pragma pop #pragma pop
#elif defined (__ICCARM__) #elif defined (__ICCARM__)
/* leave anonymous unions enabled */ /* leave anonymous unions enabled */
#elif (__ARMCC_VERSION >= 6010050) #elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
#pragma clang diagnostic pop #pragma clang diagnostic pop
#elif defined (__GNUC__) #elif defined (__GNUC__)
/* anonymous unions are enabled by default */ /* anonymous unions are enabled by default */

4
targets/TARGET_NUVOTON/TARGET_M2351/device/M2351_funcs.S
View File

@ -1,4 +1,4 @@
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
AREA |.text|, CODE, READONLY AREA |.text|, CODE, READONLY
__PC PROC __PC PROC
EXPORT __PC EXPORT __PC
@ -23,7 +23,7 @@ __PC
BLX lr BLX lr
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
ALIGN ALIGN
END END
#elif defined(__GNUC__) #elif defined(__GNUC__)

6
targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_MICRO/sys.cpp
View File

@ -9,13 +9,17 @@
extern "C" { extern "C" {
#endif #endif
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
#include <arm_compat.h>
#endif
#include <rt_misc.h> #include <rt_misc.h>
#include <stdint.h> #include <stdint.h>
extern char Image$$ARM_LIB_STACK$$ZI$$Limit[]; extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
extern char Image$$ARM_LIB_HEAP$$Base[]; extern char Image$$ARM_LIB_HEAP$$Base[];
extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[]; extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) { extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
struct __initial_stackheap r; struct __initial_stackheap r;
r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base; r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;

6
targets/TARGET_NUVOTON/TARGET_M2351/device/TOOLCHAIN_ARM_STD/sys.cpp
View File

@ -9,13 +9,17 @@
extern "C" { extern "C" {
#endif #endif
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
#include <arm_compat.h>
#endif
#include <rt_misc.h> #include <rt_misc.h>
#include <stdint.h> #include <stdint.h>
extern char Image$$ARM_LIB_STACK$$ZI$$Limit[]; extern char Image$$ARM_LIB_STACK$$ZI$$Limit[];
extern char Image$$ARM_LIB_HEAP$$Base[]; extern char Image$$ARM_LIB_HEAP$$Base[];
extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[]; extern char Image$$ARM_LIB_HEAP$$ZI$$Limit[];
extern __value_in_regs struct __initial_stackheap __user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) { extern __value_in_regs struct __initial_stackheap _mbed_user_setup_stackheap(uint32_t R0, uint32_t R1, uint32_t R2, uint32_t R3) {
struct __initial_stackheap r; struct __initial_stackheap r;
r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base; r.heap_base = (uint32_t)Image$$ARM_LIB_HEAP$$Base;

2
targets/TARGET_NUVOTON/TARGET_M2351/device/cmsis.h
View File

@ -21,7 +21,7 @@
#include "cmsis_nvic.h" #include "cmsis_nvic.h"
// Support linker-generated symbol as start of relocated vector table. // Support linker-generated symbol as start of relocated vector table.
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
extern uint32_t Image$$ER_IRAMVEC$$ZI$$Base; extern uint32_t Image$$ER_IRAMVEC$$ZI$$Base;
#elif defined(__ICCARM__) #elif defined(__ICCARM__)

2
targets/TARGET_NUVOTON/TARGET_M2351/device/cmsis_nvic.h
View File

@ -19,7 +19,7 @@
#define NVIC_NUM_VECTORS (16 + 102) #define NVIC_NUM_VECTORS (16 + 102)
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
# define NVIC_RAM_VECTOR_ADDRESS ((uint32_t) &Image$$ER_IRAMVEC$$ZI$$Base) # define NVIC_RAM_VECTOR_ADDRESS ((uint32_t) &Image$$ER_IRAMVEC$$ZI$$Base)
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
# pragma section = "IRAMVEC" # pragma section = "IRAMVEC"

8
targets/TARGET_NUVOTON/TARGET_M2351/device/startup_M2351.c
View File

@ -48,7 +48,7 @@ void FUN(void) __attribute__ ((weak, alias(#FUN_ALIAS)));
/* Initialize segments */ /* Initialize segments */
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit; extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit;
extern void __main(void); extern void __main(void);
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
@ -181,7 +181,7 @@ WEAK_ALIAS_FUNC(TRNG_IRQHandler, Default_Handler) // 101:
/* Vector table */ /* Vector table */
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
__attribute__ ((section("RESET"))) __attribute__ ((section("RESET")))
const uint32_t __vector_handlers[] = { const uint32_t __vector_handlers[] = {
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
@ -193,7 +193,7 @@ const uint32_t __vector_handlers[] = {
#endif #endif
/* Configure Initial Stack Pointer, using linker-generated symbols */ /* Configure Initial Stack Pointer, using linker-generated symbols */
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
(uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit, (uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit,
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
//(uint32_t) __sfe("CSTACK"), //(uint32_t) __sfe("CSTACK"),
@ -342,7 +342,7 @@ void Reset_Handler(void)
*/ */
SystemInit(); SystemInit();
#if defined(__CC_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
__main(); __main();
#elif defined(__ICCARM__) #elif defined(__ICCARM__)

2
targets/targets.json
View File

@ -4294,7 +4294,7 @@
"default_toolchain": "GCC_ARM", "default_toolchain": "GCC_ARM",
"extra_labels": ["NUVOTON", "M2351", "M2351K1AAEES"], "extra_labels": ["NUVOTON", "M2351", "M2351K1AAEES"],
"is_disk_virtual": true, "is_disk_virtual": true,
"supported_toolchains": ["GCC_ARM", "IAR"], "supported_toolchains": ["GCC_ARM", "IAR", "ARMC6"],
"inherits": ["Target"], "inherits": ["Target"],
"device_has": ["LOWPOWERTIMER", "RTC", "INTERRUPTIN","PORTIN", "PORTINOUT", "PORTOUT", "SERIAL","SERIAL_ASYNCH", "SERIAL_FC", "STDIO_MESSAGES", "SLEEP"], "device_has": ["LOWPOWERTIMER", "RTC", "INTERRUPTIN","PORTIN", "PORTINOUT", "PORTOUT", "SERIAL","SERIAL_ASYNCH", "SERIAL_FC", "STDIO_MESSAGES", "SLEEP"],
"release_versions": ["5"] "release_versions": ["5"]