diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-24 21:18:21 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-24 21:18:21 +0200 |
| commit | 2a8c74815479fd1b3064ac6e3efb7e8c62192bbf (patch) | |
| tree | 0653f2074e58a5cafab3c4ba5b535aca4b1a7c50 /package/uclibc++ | |
| parent | 3e43622856850d8c412e63897f9a9b74ea6e1606 (diff) | |
| parent | 3064f02816dfac549b6d8f6f8c47a48d5a78fa55 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/uclibc++')
| -rw-r--r-- | package/uclibc++/Makefile | 2 | ||||
| -rw-r--r-- | package/uclibc++/patches/patch-include_unwind-cxx_h | 21 |
2 files changed, 22 insertions, 1 deletions
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 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
|