fix: Only define new/del when AVR core does not provide <new>

Since AVR core 1.8.3, it provides an (incomplete) new header that breaks
compilation of the uclibc++ new/delete .cpp files. Since 1.8.4 it
provides a complete new header, but that also introduces a linker
duplicate symbol issue for std::nothrow.

This commit adds a USING_NEW_FROM_UCLIBC define to our new include file,
which allows detecting which version of the new include is used. That
define is used to completely skip all new/delete code (all new_*.cpp and
del_*.cpp files) when the new header from the AVR-core is used.

This should fix all conflicts, except:
 - On AVR core 1.8.3, new/delete is now imcomplete. However, the missing
   functions (array placement new, placement delete, nothrow versions
   and delete with size) are probably not commonly used.
 - If another library *also* offers <new>, then things might break in
   different ways. Again, this is a rare corner case.
 - This no longer provides set_new_handler, which the AVR core declares
   but does not define. However, since the uclibc++ version did not
   actually *use* the handler passed, not defining it is probably
   better.

Author: matthijskooijman

src/del_op.cpp

@@ -17,15 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-// Arduino 1.0 contains an implementation for this.
-#if ARDUINO < 100
-
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
 _UCXXEXPORT void operator delete(void* ptr) throw(){
 	free(ptr);
 }
-
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100

src/del_opnt.cpp

@@ -21,8 +21,8 @@
 #include <cstdlib>
 #include <func_exception>
 
-#ifndef NO_NOTHROW
+#if defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
 _UCXXEXPORT void operator delete(void* ptr, const std::nothrow_t& ) throw() {
 	free(ptr);
 }
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)

src/del_ops.cpp

@@ -22,6 +22,8 @@
 #include <cstdlib>
 #include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC)
 _UCXXEXPORT void operator delete(void* ptr, std::size_t) throw(){
 	::operator delete (ptr);
 }
+#endif // defined(USING_NEW_FROM_UCLIBC)

src/del_opv.cpp

@@ -17,15 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-// Arduino 1.0 contains an implementation for this.
-#if ARDUINO < 100
-
+#if defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
 _UCXXEXPORT void operator delete[](void * ptr) throw(){
 	free(ptr);
 }
-
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100

src/del_opvnt.cpp

@@ -21,8 +21,8 @@
 #include <cstdlib>
 #include <func_exception>
 
-#ifndef NO_NOTHROW
+#if defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
 _UCXXEXPORT void operator delete[](void* ptr, const std::nothrow_t& ) throw(){
 	free(ptr);
 }
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)

src/del_opvs.cpp

@@ -22,6 +22,8 @@
 #include <cstdlib>
 #include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC)
 _UCXXEXPORT void operator delete[](void * ptr, std::size_t) throw(){
 	::operator delete[] (ptr);
 }
+#endif // defined(USING_NEW_FROM_UCLIBC)

src/new

@@ -24,6 +24,8 @@
 #ifndef __STD_NEW_OPERATOR
 #define __STD_NEW_OPERATOR 1
 
+#define USING_NEW_FROM_UCLIBC
+
 #pragma GCC visibility push(default)
 
 namespace std{

src/new_handler.cpp

@@ -19,6 +19,7 @@
 
 #include <new>
 
+#if defined(USING_NEW_FROM_UCLIBC)
 const std::nothrow_t std::nothrow = { };
 
 //Name selected to be compatable with g++ code
@@ -29,3 +30,4 @@ _UCXXEXPORT std::new_handler std::set_new_handler(std::new_handler new_p) throw(
 	__new_handler = new_p;
 	return retval;
 }
+#endif // defined(USING_NEW_FROM_UCLIBC)

src/new_op.cpp

@@ -17,13 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-// Arduino 1.0 contains an implementation for this.
-#if ARDUINO < 100
-
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
 _UCXXEXPORT void* operator new(std::size_t numBytes) throw(std::bad_alloc){
 	//C++ stardard 5.3.4.8 requires that a valid pointer be returned for
 	//a call to new(0). Thus:
@@ -36,5 +34,4 @@ _UCXXEXPORT void* operator new(std::size_t numBytes) throw(std::bad_alloc){
 	}
 	return p;
 }
-
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100

src/new_opnt.cpp

@@ -21,8 +21,8 @@
 #include <cstdlib>
 #include <func_exception>
 
-#ifndef NO_NOTHROW
+#if defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
 _UCXXEXPORT void* operator new(std::size_t numBytes, const std::nothrow_t& ) throw(){
 	return malloc(numBytes);
 }
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)

src/new_opv.cpp

@@ -17,13 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-// Arduino 1.0 contains an implementation for this.
-#if ARDUINO < 100
-
 #include <new>
 #include <cstdlib>
 #include <func_exception>
 
+#if defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100
 _UCXXEXPORT void* operator new[](std::size_t numBytes) throw(std::bad_alloc){
 	//C++ stardard 5.3.4.8 requires that a valid pointer be returned for
 	//a call to new(0). Thus:
@@ -37,4 +35,4 @@ _UCXXEXPORT void* operator new[](std::size_t numBytes) throw(std::bad_alloc){
 	return p;
 }
 
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && ARDUINO < 100

src/new_opvnt.cpp

@@ -21,8 +21,8 @@
 #include <cstdlib>
 #include <func_exception>
 
-#ifndef NO_NOTHROW
+#if defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)
 _UCXXEXPORT void* operator new[](std::size_t numBytes, const std::nothrow_t& ) throw(){
 	return malloc(numBytes);
 }
-#endif
+#endif // defined(USING_NEW_FROM_UCLIBC) && !defined(NO_NOTHROW)