diff options
| -rw-r--r-- | cores/arduino/Printable.h | 2 | ||||
| -rw-r--r-- | cores/arduino/abi.cpp | 35 | ||||
| -rw-r--r-- | cores/arduino/new.cpp | 38 | ||||
| -rw-r--r-- | cores/arduino/new.h | 28 | ||||
| -rw-r--r-- | platform.txt | 4 |
5 files changed, 78 insertions, 29 deletions
diff --git a/cores/arduino/Printable.h b/cores/arduino/Printable.h index d03c9af..2a1b2e9 100644 --- a/cores/arduino/Printable.h +++ b/cores/arduino/Printable.h @@ -20,7 +20,7 @@ #ifndef Printable_h #define Printable_h -#include <new.h> +#include <stdlib.h> class Print; diff --git a/cores/arduino/abi.cpp b/cores/arduino/abi.cpp new file mode 100644 index 0000000..8d719b8 --- /dev/null +++ b/cores/arduino/abi.cpp @@ -0,0 +1,35 @@ +/* + Copyright (c) 2014 Arduino. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <stdlib.h> + +extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__)); +extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__)); + +void __cxa_pure_virtual(void) { + // We might want to write some diagnostics to uart in this case + //std::terminate(); + abort(); +} + +void __cxa_deleted_virtual(void) { + // We might want to write some diagnostics to uart in this case + //std::terminate(); + abort(); +} + diff --git a/cores/arduino/new.cpp b/cores/arduino/new.cpp index b81031e..cf6f89c 100644 --- a/cores/arduino/new.cpp +++ b/cores/arduino/new.cpp @@ -1,28 +1,36 @@ -#include <new.h> +/* + Copyright (c) 2014 Arduino. All right reserved. -void * operator new(size_t size) -{ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <stdlib.h> + +void *operator new(size_t size) { return malloc(size); } -void * operator new[](size_t size) -{ +void *operator new[](size_t size) { return malloc(size); } -void operator delete(void * ptr) -{ +void operator delete(void * ptr) { free(ptr); } -void operator delete[](void * ptr) -{ +void operator delete[](void * ptr) { free(ptr); } -int __cxa_guard_acquire(__guard *g) {return !*(char *)(g);}; -void __cxa_guard_release (__guard *g) {*(char *)g = 1;}; -void __cxa_guard_abort (__guard *) {}; - -void __cxa_pure_virtual(void) {}; - diff --git a/cores/arduino/new.h b/cores/arduino/new.h index 991c86c..6e1b68f 100644 --- a/cores/arduino/new.h +++ b/cores/arduino/new.h @@ -1,6 +1,20 @@ -/* Header to define new/delete operators as they aren't provided by avr-gcc by default - Taken from http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&t=59453 - */ +/* + Copyright (c) 2014 Arduino. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #ifndef NEW_H #define NEW_H @@ -12,13 +26,5 @@ void * operator new[](size_t size); void operator delete(void * ptr); void operator delete[](void * ptr); -__extension__ typedef int __guard __attribute__((mode (__DI__))); - -extern "C" int __cxa_guard_acquire(__guard *); -extern "C" void __cxa_guard_release (__guard *); -extern "C" void __cxa_guard_abort (__guard *); - -extern "C" void __cxa_pure_virtual(void); - #endif diff --git a/platform.txt b/platform.txt index 66257ef..9a2565f 100644 --- a/platform.txt +++ b/platform.txt @@ -6,7 +6,7 @@ # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification name=Arduino AVR Boards -version=1.5.6 +version=1.5.8 # AVR compile variables # --------------------- @@ -21,7 +21,7 @@ compiler.c.elf.flags=-w -Os -Wl,--gc-sections compiler.c.elf.cmd=avr-gcc compiler.S.flags=-c -g -x assembler-with-cpp compiler.cpp.cmd=avr-g++ -compiler.cpp.flags=-c -g -Os -w -fno-exceptions -ffunction-sections -fdata-sections -MMD +compiler.cpp.flags=-c -g -Os -w -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD compiler.ar.cmd=avr-ar compiler.ar.flags=rcs compiler.objcopy.cmd=avr-objcopy |