From ae41a9009ccadd374c770ea373840f0266822167 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 24 Sep 2013 11:52:07 +0200 Subject: fix compile for arm targets, from upstream git --- package/uclibc++/Makefile | 2 +- .../patches/patch-include_unwind-cxx_h.orig | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 package/uclibc++/patches/patch-include_unwind-cxx_h.orig diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 6c1097e19..c51819429 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= uClibc++ PKG_VERSION:= 0.2.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 394c119363dd8b469fb898442a6764b8 PKG_DESCR:= A standard c++ library for embedded systems PKG_SECTION:= libs diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h.orig b/package/uclibc++/patches/patch-include_unwind-cxx_h.orig deleted file mode 100644 index c86833a75..000000000 --- a/package/uclibc++/patches/patch-include_unwind-cxx_h.orig +++ /dev/null @@ -1,21 +0,0 @@ -http://git.uclibc.org/uClibc++/commit/?id=cf73cb907c03ca2fb22bfe7fe2f732c10714b9ad ---- uClibc++-0.2.4.orig/include/unwind-cxx.h 2012-05-25 23:15:31.000000000 +0200 -+++ uClibc++-0.2.4/include/unwind-cxx.h 2013-09-24 11:47:15.000000000 +0200 -@@ -173,6 +173,7 @@ extern std::unexpected_handler __unexpec - - // This is the exception class we report -- "GNUCC++\0". - const _Unwind_Exception_Class __gxx_exception_class -+#ifndef __ARM_EABI_UNWINDER__ - = ((((((((_Unwind_Exception_Class) 'G' - << 8 | (_Unwind_Exception_Class) 'N') - << 8 | (_Unwind_Exception_Class) 'U') -@@ -181,6 +182,9 @@ const _Unwind_Exception_Class __gxx_exce - << 8 | (_Unwind_Exception_Class) '+') - << 8 | (_Unwind_Exception_Class) '+') - << 8 | (_Unwind_Exception_Class) '\0'); -+#else -+= "GNUCC++"; -+#endif - - // GNU C++ personality routine, Version 0. - extern "C" _Unwind_Reason_Code __gxx_personality_v0 -- cgit v1.2.3