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

LPC2368 [GCC_ARM]: Fixed: Compilation and link errors in case "SD" example.

pull/66/head
dinau 2013-09-13 21:59:11 +09:00
parent b9d52bda50
commit 43acaa4166
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/mbed/common/retarget.cpp
View File

@ -439,13 +439,20 @@ extern "C" int __end__;
#undef errno #undef errno
extern "C" int errno; extern "C" int errno;
// For ARM7 only
register unsigned char * stack_ptr __asm ("sp");
// Dynamic memory allocation related syscall. // Dynamic memory allocation related syscall.
extern "C" caddr_t _sbrk(int incr) { extern "C" caddr_t _sbrk(int incr) {
static unsigned char* heap = (unsigned char*)&__end__; static unsigned char* heap = (unsigned char*)&__end__;
unsigned char* prev_heap = heap; unsigned char* prev_heap = heap;
unsigned char* new_heap = heap + incr; unsigned char* new_heap = heap + incr;
#ifdef __get_MSP
if (new_heap >= (unsigned char*)__get_MSP()) { if (new_heap >= (unsigned char*)__get_MSP()) {
#else
if (new_heap >= stack_ptr) {
#endif
errno = ENOMEM; errno = ENOMEM;
return (caddr_t)-1; return (caddr_t)-1;
} }

1
libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/TOOLCHAIN_GCC_ARM/LPC2368.ld
View File

@ -143,6 +143,7 @@ SECTIONS
. = ALIGN( 8 ) ; . = ALIGN( 8 ) ;
__heap_start__ = . ; __heap_start__ = . ;
end = . ; end = . ;
__end__ = . ;
.stab 0 (NOLOAD) : { *(.stab) } .stab 0 (NOLOAD) : { *(.stab) }
.stabstr 0 (NOLOAD) : { *(.stabstr) } .stabstr 0 (NOLOAD) : { *(.stabstr) }