Skip to content

Fix multiple definition errors in GCC_CR build #2498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hal/common/retarget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,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__;

Expand Down Expand Up @@ -614,7 +614,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 {
Expand All @@ -638,7 +638,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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {}

int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;}
}

#include <stdlib.h>

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);}
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdlib.h>

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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdlib.h>

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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {}

int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;}
}

#include <stdlib.h>

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);}
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {}

int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;}
}

#include <stdlib.h>

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);}
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,3 @@ void IntDefaultHandler(void)
{
}
}

#include <stdlib.h>

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);}