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

Merge pull request #6553 from theotherjimmy/stmL4-armc6 

Correct armc6 detection logic for STM32L4
pull/3955/merge
Martin Kojtal 2018-04-09 17:36:52 +02:00 committed by GitHub
parent 854e436d92 d374bb4a5a
commit 8b2eb20a54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_STM/TARGET_STM32L4/l4_retarget.c
View File

@ -32,7 +32,7 @@
* *
****************************************************************************** ******************************************************************************
*/ */
#if (defined(TWO_RAM_REGIONS) && defined(__GNUC__) && !defined(__CC_ARM)) #if (defined(TWO_RAM_REGIONS) && defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC_VERSION))
#include <errno.h> #include <errno.h>
#include "stm32l4xx.h" #include "stm32l4xx.h"
extern uint32_t __mbed_sbrk_start; extern uint32_t __mbed_sbrk_start;

2
targets/TARGET_STM/mbed_rtx.h
View File

@ -122,7 +122,7 @@
#endif #endif
#endif // INITIAL_SP #endif // INITIAL_SP
#if (defined(__GNUC__) && !defined(__CC_ARM) && defined(TWO_RAM_REGIONS)) #if (defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC_VERSION) && defined(TWO_RAM_REGIONS))
extern uint32_t __StackLimit[]; extern uint32_t __StackLimit[];
extern uint32_t __StackTop[]; extern uint32_t __StackTop[];
extern uint32_t __end__[]; extern uint32_t __end__[];