1
0

006-eabi_fix.patch 1.2 KB

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