Skip to content

Commit 91afbce

Browse files
theotherjimmytheotherjimmy
committed
Correct Nuvoton compiler detection logic
1 parent 7554975 commit 91afbce

File tree

13 files changed

+27
-27
lines changed

13 files changed

+27
-27
lines changed

‎targets/TARGET_NUVOTON/TARGET_M451/device/cmsis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "cmsis_nvic.h"
2222

2323
// Support linker-generated symbol as start of relocated vector table.
24-
#if defined(__CC_ARM)
24+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2525
extern uint32_t Image$$ER_IRAMVEC$$ZI$$Base;
2626
#elif defined(__ICCARM__)
2727

‎targets/TARGET_NUVOTON/TARGET_M451/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#define NVIC_NUM_VECTORS (16 + 64)
2121

22-
#if defined(__CC_ARM)
22+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2323
# define NVIC_RAM_VECTOR_ADDRESS ((uint32_t) &Image$$ER_IRAMVEC$$ZI$$Base)
2424
#elif defined(__ICCARM__)
2525
# pragma section = "IRAMVEC"

‎targets/TARGET_NUVOTON/TARGET_M451/device/startup_M451Series.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void FUN(void) __attribute__ ((weak, alias(#FUN_ALIAS)));
4747

4848

4949
/* Initialize segments */
50-
#if defined(__CC_ARM)
50+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
5151
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit;
5252
extern void __main(void);
5353
#elif defined(__ICCARM__)
@@ -152,7 +152,7 @@ WEAK_ALIAS_FUNC(SC0_IRQHandler, Default_Handler) // 58:
152152
WEAK_ALIAS_FUNC(TK_IRQHandler, Default_Handler) // 63:
153153

154154
/* Vector table */
155-
#if defined(__CC_ARM)
155+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
156156
__attribute__ ((section("RESET")))
157157
const uint32_t __vector_handlers[] = {
158158
#elif defined(__ICCARM__)
@@ -164,7 +164,7 @@ const uint32_t __vector_handlers[] = {
164164
#endif
165165

166166
/* Configure Initial Stack Pointer, using linker-generated symbols */
167-
#if defined(__CC_ARM)
167+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
168168
(uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit,
169169
#elif defined(__ICCARM__)
170170
//(uint32_t) __sfe("CSTACK"),
@@ -279,7 +279,7 @@ void Reset_Handler(void)
279279
/* Enable register write-protection function */
280280
SYS_LockReg();
281281

282-
#if defined(__CC_ARM)
282+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
283283
__main();
284284

285285
#elif defined(__ICCARM__)

‎targets/TARGET_NUVOTON/TARGET_M480/device/cmsis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "cmsis_nvic.h"
2222

2323
// Support linker-generated symbol as start of relocated vector table.
24-
#if defined(__CC_ARM)
24+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2525
extern uint32_t Image$$ER_IRAMVEC$$ZI$$Base;
2626
#elif defined(__ICCARM__)
2727

‎targets/TARGET_NUVOTON/TARGET_M480/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define NVIC_USER_IRQ_NUMBER 96
2424
#define NVIC_NUM_VECTORS (NVIC_USER_IRQ_OFFSET + NVIC_USER_IRQ_NUMBER)
2525

26-
#if defined(__CC_ARM)
26+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2727
# define NVIC_RAM_VECTOR_ADDRESS ((uint32_t) &Image$$ER_IRAMVEC$$ZI$$Base)
2828
#elif defined(__ICCARM__)
2929
# pragma section = "IRAMVEC"

‎targets/TARGET_NUVOTON/TARGET_M480/device/startup_M480.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void FUN(void) __attribute__ ((weak, alias(#FUN_ALIAS)));
5050

5151

5252
/* Initialize segments */
53-
#if defined(__CC_ARM)
53+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
5454
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit;
5555
extern void __main(void);
5656
#elif defined(__ICCARM__)
@@ -190,7 +190,7 @@ WEAK_ALIAS_FUNC(SWDC_IRQHandler, Default_Handler) // 94:
190190
WEAK_ALIAS_FUNC(ETMC_IRQHandler, Default_Handler) // 95:
191191

192192
/* Vector table */
193-
#if defined(__CC_ARM)
193+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
194194
__attribute__ ((section("RESET")))
195195
const uint32_t __vector_handlers[] = {
196196
#elif defined(__ICCARM__)
@@ -201,7 +201,7 @@ __attribute__ ((section(".vector_table")))
201201
const uint32_t __vector_handlers[] = {
202202
#endif
203203

204-
#if defined(__CC_ARM)
204+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
205205
(uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit,
206206
#elif defined(__ICCARM__)
207207
(uint32_t) &CSTACK$$Limit,
@@ -339,7 +339,7 @@ const uint32_t __vector_handlers[] = {
339339
* C/C++ runtime initialization
340340
*/
341341

342-
#if defined (__CC_ARM)
342+
#if defined(__CC_ARM)
343343

344344
__asm static void Reset_Handler(void)
345345
{
@@ -406,7 +406,7 @@ void Reset_Handler_1(void)
406406
/* Enable register write-protection function */
407407
SYS_LockReg();
408408

409-
#if defined(__CC_ARM)
409+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
410410
Reset_Handler_Cascade((void *) &Image$$ARM_LIB_STACK$$ZI$$Limit, (void *) Reset_Handler_2);
411411
#elif defined(__ICCARM__)
412412
Reset_Handler_Cascade((void *) &CSTACK$$Limit, (void *) Reset_Handler_2);
@@ -429,7 +429,7 @@ void Reset_Handler_2(void)
429429
uvisor_init();
430430
#endif
431431

432-
#if defined(__CC_ARM)
432+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
433433
__main();
434434

435435
#elif defined(__ICCARM__)

‎targets/TARGET_NUVOTON/TARGET_NANO100/device/cmsis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "cmsis_nvic.h"
2222

2323
// Support linker-generated symbol as start of relocated vector table.
24-
#if defined(__CC_ARM)
24+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2525
extern uint32_t Image$$ER_IRAMVEC$$ZI$$Base;
2626
#elif defined(__ICCARM__)
2727

‎targets/TARGET_NUVOTON/TARGET_NANO100/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define NVIC_USER_IRQ_NUMBER 32
2424
#define NVIC_NUM_VECTORS (NVIC_USER_IRQ_OFFSET + NVIC_USER_IRQ_NUMBER)
2525

26-
#if defined(__CC_ARM)
26+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2727
# define NVIC_RAM_VECTOR_ADDRESS ((uint32_t) &Image$$ER_IRAMVEC$$ZI$$Base)
2828
#elif defined(__ICCARM__)
2929
# pragma section = "IRAMVEC"

‎targets/TARGET_NUVOTON/TARGET_NANO100/device/startup_Nano100Series.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void FUN(void) __attribute__ ((weak, alias(#FUN_ALIAS)));
4545

4646

4747
/* Initialize segments */
48-
#if defined(__CC_ARM)
48+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
4949
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit;
5050
extern void __main(void);
5151
#elif defined(__ICCARM__)
@@ -114,7 +114,7 @@ WEAK_ALIAS_FUNC(DAC_IRQHandler, Default_Handler) // DAC interrupt
114114
WEAK_ALIAS_FUNC(RTC_IRQHandler, Default_Handler) // Real time clock interrupt
115115

116116
/* Vector table */
117-
#if defined(__CC_ARM)
117+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
118118
__attribute__ ((section("RESET")))
119119
const uint32_t __vector_handlers[] = {
120120
#elif defined(__ICCARM__)
@@ -126,7 +126,7 @@ const uint32_t __vector_handlers[] = {
126126
#endif
127127

128128
/* Configure Initial Stack Pointer, using linker-generated symbols */
129-
#if defined(__CC_ARM)
129+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
130130
(uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit,
131131
#elif defined(__ICCARM__)
132132
(uint32_t) &CSTACK$$Limit,
@@ -199,7 +199,7 @@ void Reset_Handler(void)
199199
/* Enable register write-protection function */
200200
SYS_LockReg();
201201

202-
#if defined(__CC_ARM)
202+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
203203
__main();
204204

205205
#elif defined(__ICCARM__)

‎targets/TARGET_NUVOTON/TARGET_NUC472/device/cmsis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
// Support linker-generated symbol as start of relocated vector table.
2424

25-
#if defined(__CC_ARM)
25+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2626
extern uint32_t Image$$ER_IRAMVEC$$ZI$$Base;
2727
#elif defined(__ICCARM__)
2828

‎targets/TARGET_NUVOTON/TARGET_NUC472/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#define NVIC_NUM_VECTORS (16 + 142)
2121

22-
#if defined(__CC_ARM)
22+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2323
# define NVIC_RAM_VECTOR_ADDRESS ((uint32_t) &Image$$ER_IRAMVEC$$ZI$$Base)
2424
#elif defined(__ICCARM__)
2525
# pragma section = "IRAMVEC"

‎targets/TARGET_NUVOTON/TARGET_NUC472/device/startup_NUC472_442.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void FUN(void) __attribute__ ((weak, alias(#FUN_ALIAS)));
4747

4848

4949
/* Initialize segments */
50-
#if defined(__CC_ARM)
50+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
5151
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit;
5252
extern void __main(void);
5353
#elif defined(__ICCARM__)
@@ -232,7 +232,7 @@ WEAK_ALIAS_FUNC(CRYPTO_IRQHandler, Default_Handler) // 140: CRYPTO
232232
WEAK_ALIAS_FUNC(CRC_IRQHandler, Default_Handler) // 141: CRC
233233

234234
/* Vector table */
235-
#if defined(__CC_ARM)
235+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
236236
__attribute__ ((section("RESET")))
237237
const uint32_t __vector_handlers[] = {
238238
#elif defined(__ICCARM__)
@@ -244,7 +244,7 @@ const uint32_t __vector_handlers[] = {
244244
#endif
245245

246246
/* Configure Initial Stack Pointer, using linker-generated symbols */
247-
#if defined(__CC_ARM)
247+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
248248
(uint32_t) &Image$$ARM_LIB_STACK$$ZI$$Limit,
249249
#elif defined(__ICCARM__)
250250
//(uint32_t) __sfe("CSTACK"),
@@ -439,7 +439,7 @@ void Reset_Handler(void)
439439
/* Enable register write-protection function */
440440
SYS_LockReg();
441441

442-
#if defined(__CC_ARM)
442+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
443443
__main();
444444

445445
#elif defined(__ICCARM__)

‎targets/TARGET_NUVOTON/mbed_rtx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#if defined(TARGET_NUVOTON)
2323

24-
#if defined(__CC_ARM)
24+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
2525
extern uint32_t Image$$ARM_LIB_HEAP$$ZI$$Base[];
2626
extern uint32_t Image$$ARM_LIB_HEAP$$ZI$$Length[];
2727
extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];

0 commit comments

Comments
 (0)