From 3ca1407b8b0078cfdef9934741533c2ee279460a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 17 Oct 2015 12:01:47 +0200 Subject: uclibcxx: fix compile for rpi --- .../uclibc++/patches/patch-include_unwind-cxx_h | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'package/uclibc++/patches/patch-include_unwind-cxx_h') diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h index a81d44cc7..f086bd4e2 100644 --- a/package/uclibc++/patches/patch-include_unwind-cxx_h +++ b/package/uclibc++/patches/patch-include_unwind-cxx_h @@ -1,21 +1,20 @@ 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:48:52.000000000 +0200 -@@ -173,6 +173,7 @@ extern std::unexpected_handler __unexpec ++++ uClibc++-0.2.4/include/unwind-cxx.h 2015-10-14 17:02:55.000000000 +0200 +@@ -172,15 +172,7 @@ extern std::unexpected_handler __unexpec + // These are explicitly GNU C++ specific. // 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 +-const _Unwind_Exception_Class __gxx_exception_class +-= ((((((((_Unwind_Exception_Class) 'G' +- << 8 | (_Unwind_Exception_Class) 'N') +- << 8 | (_Unwind_Exception_Class) 'U') +- << 8 | (_Unwind_Exception_Class) 'C') +- << 8 | (_Unwind_Exception_Class) 'C') +- << 8 | (_Unwind_Exception_Class) '+') +- << 8 | (_Unwind_Exception_Class) '+') +- << 8 | (_Unwind_Exception_Class) '\0'); ++const _Unwind_Exception_Class __gxx_exception_class = "GNUCC++"; // GNU C++ personality routine, Version 0. extern "C" _Unwind_Reason_Code __gxx_personality_v0 -- cgit v1.2.3