Skip to content

Commit 6c0a0e1

Browse files
committed
Fix multiple definition errors in GCC_CR build
1 parent 64a30a0 commit 6c0a0e1

File tree

6 files changed

+0
-48
lines changed

6 files changed

+0
-48
lines changed

hal/targets/cmsis/TARGET_NXP/TARGET_LPC11U6X/TOOLCHAIN_GCC_CR/TARGET_LPC11U68/startup_LPC11U68.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {}
191191

192192
int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;}
193193
}
194-
195-
#include <stdlib.h>
196-
197-
void *operator new(size_t size) {return malloc(size);}
198-
void *operator new[](size_t size){return malloc(size);}
199-
200-
void operator delete(void *p) {free(p);}
201-
void operator delete[](void *p) {free(p);}

hal/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_CR/startup_LPC11xx.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,6 @@ AFTER_VECTORS void PendSV_Handler (void) {while(1){}}
152152
AFTER_VECTORS void SysTick_Handler (void) {while(1){}}
153153
AFTER_VECTORS void IntDefaultHandler(void) {while(1){}}
154154

155-
#include <stdlib.h>
156-
157-
void *operator new (size_t size) {return malloc(size);}
158-
void *operator new[](size_t size) {return malloc(size);}
159-
160-
void operator delete (void *p) {free(p);}
161-
void operator delete[](void *p) {free(p);}
162-
163155
int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {
164156
return 0;
165157
}

hal/targets/cmsis/TARGET_NXP/TARGET_LPC11XX_11CXX/TOOLCHAIN_GCC_CR/TARGET_LPC11XX/startup_LPC11xx.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,6 @@ AFTER_VECTORS void PendSV_Handler (void) {while(1){}}
152152
AFTER_VECTORS void SysTick_Handler (void) {while(1){}}
153153
AFTER_VECTORS void IntDefaultHandler(void) {while(1){}}
154154

155-
#include <stdlib.h>
156-
157-
void *operator new (size_t size) {return malloc(size);}
158-
void *operator new[](size_t size) {return malloc(size);}
159-
160-
void operator delete (void *p) {free(p);}
161-
void operator delete[](void *p) {free(p);}
162-
163155
int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {
164156
return 0;
165157
}

hal/targets/cmsis/TARGET_NXP/TARGET_LPC15XX/TOOLCHAIN_GCC_CR/startup_LPC15xx.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {}
209209

210210
int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;}
211211
}
212-
213-
#include <stdlib.h>
214-
215-
void *operator new(size_t size) {return malloc(size);}
216-
void *operator new[](size_t size){return malloc(size);}
217-
218-
void operator delete(void *p) {free(p);}
219-
void operator delete[](void *p) {free(p);}

hal/targets/cmsis/TARGET_NXP/TARGET_LPC176X/TOOLCHAIN_GCC_CR/startup_LPC17xx.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,3 @@ AFTER_VECTORS void IntDefaultHandler (void) {}
173173

174174
int __aeabi_atexit(void *object, void (*destructor)(void *), void *dso_handle) {return 0;}
175175
}
176-
177-
#include <stdlib.h>
178-
179-
void *operator new(size_t size) {return malloc(size);}
180-
void *operator new[](size_t size){return malloc(size);}
181-
182-
void operator delete(void *p) {free(p);}
183-
void operator delete[](void *p) {free(p);}

hal/targets/cmsis/TARGET_NXP/TARGET_LPC408X/TOOLCHAIN_GCC_CR/startup_lpc407x_8x.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,3 @@ void IntDefaultHandler(void)
428428
{
429429
}
430430
}
431-
432-
#include <stdlib.h>
433-
434-
void *operator new(size_t size) {return malloc(size);}
435-
void *operator new[](size_t size){return malloc(size);}
436-
437-
void operator delete(void *p) {free(p);}
438-
void operator delete[](void *p) {free(p);}

0 commit comments

Comments
 (0)