Skip to content

Commit cd4fd86

Browse files
committed
Correct Freescale + NXP compiler detection macros
Also removes duplication of common files
1 parent f4b7d8b commit cd4fd86

File tree

24 files changed

+14
-1133
lines changed

24 files changed

+14
-1133
lines changed

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef MBED_CMSIS_NVIC_H
3232
#define MBED_CMSIS_NVIC_H
3333

34-
#if defined(__CC_ARM)
34+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
3535
extern uint32_t Image$$VECTOR_RAM$$Base[];
3636
#define __VECTOR_RAM Image$$VECTOR_RAM$$Base
3737
#else

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/drivers/fsl_common.c

Lines changed: 0 additions & 101 deletions
This file was deleted.

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#ifndef MBED_CMSIS_NVIC_H
3333
#define MBED_CMSIS_NVIC_H
3434

35-
#if defined(__CC_ARM)
35+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
3636
extern uint32_t Image$$VECTOR_RAM$$Base[];
3737
#define __VECTOR_RAM Image$$VECTOR_RAM$$Base
3838
#else

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef MBED_CMSIS_NVIC_H
3232
#define MBED_CMSIS_NVIC_H
3333

34-
#if defined(__CC_ARM)
34+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
3535
extern uint32_t Image$$VECTOR_RAM$$Base[];
3636
#define __VECTOR_RAM Image$$VECTOR_RAM$$Base
3737
#else

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/drivers/fsl_common.c

Lines changed: 0 additions & 101 deletions
This file was deleted.

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef MBED_CMSIS_NVIC_H
3232
#define MBED_CMSIS_NVIC_H
3333

34-
#if defined(__CC_ARM)
34+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
3535
extern uint32_t Image$$VECTOR_RAM$$Base[];
3636
#define __VECTOR_RAM Image$$VECTOR_RAM$$Base
3737
#else

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/drivers/fsl_common.c

Lines changed: 0 additions & 101 deletions
This file was deleted.

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/device/cmsis_nvic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifndef MBED_CMSIS_NVIC_H
3232
#define MBED_CMSIS_NVIC_H
3333

34-
#if defined(__CC_ARM)
34+
#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
3535
extern uint32_t Image$$VECTOR_RAM$$Base[];
3636
#define __VECTOR_RAM Image$$VECTOR_RAM$$Base
3737
#else

0 commit comments

Comments
 (0)