Diff: targets/TARGET_NUVOTON/TARGET_M480/device/startup_M480.c

Revision:

174:b96e65c34a4d

Parent:

172:7d866c31b3c5

Child:

188:bcfe06ba3d64

--- a/targets/TARGET_NUVOTON/TARGET_M480/device/startup_M480.c	Fri Sep 15 14:59:18 2017 +0100
+++ b/targets/TARGET_NUVOTON/TARGET_M480/device/startup_M480.c	Mon Oct 02 15:33:19 2017 +0100
@@ -50,7 +50,7 @@
 
 
 /* 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 void __main(void);
 #elif defined(__ICCARM__)
@@ -190,7 +190,7 @@
 WEAK_ALIAS_FUNC(ETMC_IRQHandler, Default_Handler)       // 95:
 
 /* Vector table */
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 __attribute__ ((section("RESET")))
 const uint32_t __vector_handlers[] = {
 #elif defined(__ICCARM__)
@@ -201,7 +201,7 @@
 const uint32_t __vector_handlers[] = {
 #endif
 
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
     (uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit,
 #elif defined(__ICCARM__)
     (uint32_t) &CSTACK$$Limit,
@@ -339,7 +339,7 @@
  *  C/C++ runtime initialization
  */
      
-#if defined (__CC_ARM)
+#if defined(__CC_ARM)
 
 __asm static void Reset_Handler(void)
 {    
@@ -406,7 +406,7 @@
     /* Enable register write-protection function */
     SYS_LockReg();
     
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
     Reset_Handler_Cascade((void *) &Image$$ARM_LIB_STACK$$ZI$$Limit, (void *) Reset_Handler_2);
 #elif defined(__ICCARM__)
     Reset_Handler_Cascade((void *) &CSTACK$$Limit, (void *) Reset_Handler_2);
@@ -429,7 +429,7 @@
     uvisor_init();
 #endif
 
-#if defined(__CC_ARM)
+#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
     __main();
     
 #elif defined(__ICCARM__)