Skip to content

Commit ae8e7df

Browse files
committed
Enable Compiling K64F with ARMC6
1 parent 3ef4650 commit ae8e7df

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/device/MK64F12.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,8 @@ typedef enum _dma_request_source
409409
** Start of section using anonymous unions
410410
*/
411411

412-
#if defined(__ARMCC_VERSION)
412+
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
413+
#elif defined(__ARMCC_VERSION)
413414
#pragma push
414415
#pragma anon_unions
415416
#elif defined(__CWCC__)
@@ -12617,7 +12618,8 @@ typedef struct {
1261712618
** End of section using anonymous unions
1261812619
*/
1261912620

12620-
#if defined(__ARMCC_VERSION)
12621+
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
12622+
#elif defined(__ARMCC_VERSION)
1262112623
#pragma pop
1262212624
#elif defined(__CWCC__)
1262312625
#pragma pop

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/device/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; l
122122
}
123123
RW_IRAM1 ImageLimit(RW_m_data_2) { ; Heap region growing up
124124
}
125-
}
125+
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/device/TOOLCHAIN_ARM_STD/sys.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
extern "C" {
1010
#endif
1111

12+
#include <arm_compat.h>
1213
#include <rt_misc.h>
1314
#include <stdint.h>
1415

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/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_MCU_K64F/drivers/fsl_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void __assert_func(const char *file, int line, const char *func, const char *fai
5858
void InstallIRQHandler(IRQn_Type irq, uint32_t irqHandler)
5959
{
6060
/* Addresses for VECTOR_TABLE and VECTOR_RAM come from the linker file */
61-
#if defined(__CC_ARM)
61+
#if defined(__CC_ARM) || (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
6262
extern uint32_t Image$$VECTOR_ROM$$Base[];
6363
extern uint32_t Image$$VECTOR_RAM$$Base[];
6464
extern uint32_t Image$$RW_m_data$$Base[];

0 commit comments

Comments
 (0)