| 1 | --- a/include/typeinfo |
| 2 | +++ b/include/typeinfo |
| 3 | @@ -44,6 +44,7 @@ namespace __cxxabiv1 |
| 4 | class __class_type_info; |
| 5 | } // namespace __cxxabiv1 |
| 6 | |
| 7 | +#ifndef __GXX_MERGED_TYPEINFO_NAMES |
| 8 | #if !__GXX_WEAK__ |
| 9 | // If weak symbols are not supported, typeinfo names are not merged. |
| 10 | #define __GXX_MERGED_TYPEINFO_NAMES 0 |
| 11 | @@ -51,6 +52,7 @@ namespace __cxxabiv1 |
| 12 | // On platforms that support weak symbols, typeinfo names are merged. |
| 13 | #define __GXX_MERGED_TYPEINFO_NAMES 1 |
| 14 | #endif |
| 15 | +#endif |
| 16 | |
| 17 | namespace std |
| 18 | { |
| 19 | --- a/include/unwind-cxx.h |
| 20 | +++ b/include/unwind-cxx.h |
| 21 | @@ -173,6 +173,7 @@ extern std::unexpected_handler __unexpec |
| 22 | |
| 23 | // This is the exception class we report -- "GNUCC++\0". |
| 24 | const _Unwind_Exception_Class __gxx_exception_class |
| 25 | +#ifndef __ARM_EABI_UNWINDER__ |
| 26 | = ((((((((_Unwind_Exception_Class) 'G' |
| 27 | << 8 | (_Unwind_Exception_Class) 'N') |
| 28 | << 8 | (_Unwind_Exception_Class) 'U') |
| 29 | @@ -181,6 +182,9 @@ const _Unwind_Exception_Class __gxx_exce |
| 30 | << 8 | (_Unwind_Exception_Class) '+') |
| 31 | << 8 | (_Unwind_Exception_Class) '+') |
| 32 | << 8 | (_Unwind_Exception_Class) '\0'); |
| 33 | +#else |
| 34 | += "GNUC++"; |
| 35 | +#endif |
| 36 | |
| 37 | // GNU C++ personality routine, Version 0. |
| 38 | extern "C" _Unwind_Reason_Code __gxx_personality_v0 |
| 39 | |
