diff --git a/hal/common/retarget.cpp b/hal/common/retarget.cpp index ef2ae2485f..abc1d82a6f 100644 --- a/hal/common/retarget.cpp +++ b/hal/common/retarget.cpp @@ -752,7 +752,7 @@ extern "C" void __iar_argc_argv() { // Provide implementation of _sbrk (low-level dynamic memory allocation // routine) for GCC_ARM which compares new heap pointer with MSP instead of // SP. This make it compatible with RTX RTOS thread stacks. -#if defined(TOOLCHAIN_GCC_ARM) +#if defined(TOOLCHAIN_GCC_ARM) || defined(TOOLCHAIN_GCC_CR) // Linker defined symbol used by _sbrk to indicate where heap should start. extern "C" int __end__; @@ -803,7 +803,7 @@ extern "C" caddr_t _sbrk(int incr) { #endif #endif -#if defined TOOLCHAIN_GCC_ARM +#if defined(TOOLCHAIN_GCC_ARM) || defined(TOOLCHAIN_GCC_CR) extern "C" void _exit(int return_code) { #else namespace std { @@ -827,7 +827,7 @@ extern "C" void exit(int return_code) { while (1); } -#if !defined(TOOLCHAIN_GCC_ARM) +#if !defined(TOOLCHAIN_GCC_ARM) && !defined(TOOLCHAIN_GCC_CR) } //namespace std #endif diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11U6X/TOOLCHAIN_GCC_CR/TARGET_LPC11U68/startup_LPC11U68.cpp b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11U6X/TOOLCHAIN_GCC_CR/TARGET_LPC11U68/startup_LPC11U68.cpp index 65cab8cac9..2acd2af4ab 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11U6X/TOOLCHAIN_GCC_CR/TARGET_LPC11U68/startup_LPC11U68.cpp +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11U6X/TOOLCHAIN_GCC_CR/TARGET_LPC11U68/startup_LPC11U68.cpp @@ -191,11 +191,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {} int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;} } - -#include - -void *operator new(size_t size) {return malloc(size);} -void *operator new[](size_t size){return malloc(size);} - -void operator delete(void *p) {free(p);} -void operator delete[](void *p) {free(p);} diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/TARGET_LPC11U35_501/LPC11U35.ld b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/TARGET_LPC11U35_501/LPC11U35.ld index 0ec42868b1..2eaa866a34 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/TARGET_LPC11U35_501/LPC11U35.ld +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/TARGET_LPC11U35_501/LPC11U35.ld @@ -1,7 +1,7 @@ /* mbed - LPC11U35 linker script * Based linker script generated by Code Red Technologies Red Suite 4.1 */ -GROUP(libgcc.a libc_s.a libstdc++_s.a libm.a libcr_newlib_nohost.a crti.o crtn.o crtbegin.o crtend.o) +GROUP(libgcc.a libc.a libstdc++.a libm.a libcr_newlib_nohost.a crti.o crtn.o crtbegin.o crtend.o) MEMORY { diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/startup_LPC11xx.cpp b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/startup_LPC11xx.cpp index 68163d3abd..8aa0d83fe4 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/startup_LPC11xx.cpp +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/startup_LPC11xx.cpp @@ -152,14 +152,6 @@ AFTER_VECTORS void PendSV_Handler (void) {while(1){}} AFTER_VECTORS void SysTick_Handler (void) {while(1){}} AFTER_VECTORS void IntDefaultHandler(void) {while(1){}} -#include - -void *operator new (size_t size) {return malloc(size);} -void *operator new[](size_t size) {return malloc(size);} - -void operator delete (void *p) {free(p);} -void operator delete[](void *p) {free(p);} - int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) { return 0; } diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/LPC1114.ld b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/LPC1114.ld index a9931373fb..89576a6a22 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/LPC1114.ld +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/LPC1114.ld @@ -1,7 +1,8 @@ /* mbed - LPC1114 linker script * Based linker script generated by Code Red Technologies Red Suite 4.1 */ -GROUP(libgcc.a libc_s.a libstdc++_s.a libm.a libcr_newlib_nohost.a crti.o crtn.o crtbegin.o crtend.o) +GROUP(libgcc.a libc.a libstdc++.a libm.a libcr_newlib_nohost.a crti.o crtn.o crtbegin.o crtend.o) + MEMORY { /* Define each memory region */ diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/startup_LPC11xx.cpp b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/startup_LPC11xx.cpp index d5d3304669..5532eadc91 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/startup_LPC11xx.cpp +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/startup_LPC11xx.cpp @@ -152,14 +152,6 @@ AFTER_VECTORS void PendSV_Handler (void) {while(1){}} AFTER_VECTORS void SysTick_Handler (void) {while(1){}} AFTER_VECTORS void IntDefaultHandler(void) {while(1){}} -#include - -void *operator new (size_t size) {return malloc(size);} -void *operator new[](size_t size) {return malloc(size);} - -void operator delete (void *p) {free(p);} -void operator delete[](void *p) {free(p);} - int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) { return 0; } diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR/startup_LPC15xx.cpp b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR/startup_LPC15xx.cpp index 3337ed5bff..3712091f14 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR/startup_LPC15xx.cpp +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR/startup_LPC15xx.cpp @@ -209,11 +209,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {} int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;} } - -#include - -void *operator new(size_t size) {return malloc(size);} -void *operator new[](size_t size){return malloc(size);} - -void operator delete(void *p) {free(p);} -void operator delete[](void *p) {free(p);} diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_GCC_CR/startup_LPC17xx.cpp b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_GCC_CR/startup_LPC17xx.cpp index 4da3084c32..ebf805d76e 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_GCC_CR/startup_LPC17xx.cpp +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_GCC_CR/startup_LPC17xx.cpp @@ -173,11 +173,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {} int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;} } - -#include - -void *operator new(size_t size) {return malloc(size);} -void *operator new[](size_t size){return malloc(size);} - -void operator delete(void *p) {free(p);} -void operator delete[](void *p) {free(p);} diff --git a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_GCC_CR/startup_lpc407x_8x.cpp b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_GCC_CR/startup_lpc407x_8x.cpp index 122f8abc80..56cf9768e2 100644 --- a/hal/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_GCC_CR/startup_lpc407x_8x.cpp +++ b/hal/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_GCC_CR/startup_lpc407x_8x.cpp @@ -428,11 +428,3 @@ void IntDefaultHandler(void) { } } - -#include - -void *operator new(size_t size) {return malloc(size);} -void *operator new[](size_t size){return malloc(size);} - -void operator delete(void *p) {free(p);} -void operator delete[](void *p) {free(p);}