From 9e7064eb80ef41ee2cab91282019f7d3ea100b7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 24 Sep 2013 11:51:42 +0200 Subject: fix compile for arm targets, from upstream git --- package/uclibc++/patches/patch-include_unwind-cxx_h | 21 +++++++++++++++++++++ .../patches/patch-include_unwind-cxx_h.orig | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 package/uclibc++/patches/patch-include_unwind-cxx_h create mode 100644 package/uclibc++/patches/patch-include_unwind-cxx_h.orig (limited to 'package') diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h new file mode 100644 index 000000000..a81d44cc7 --- /dev/null +++ b/package/uclibc++/patches/patch-include_unwind-cxx_h @@ -0,0 +1,21 @@ +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 + + // 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 diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h.orig b/package/uclibc++/patches/patch-include_unwind-cxx_h.orig new file mode 100644 index 000000000..c86833a75 --- /dev/null +++ b/package/uclibc++/patches/patch-include_unwind-cxx_h.orig @@ -0,0 +1,21 @@ +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