52-libcxxrt.patch 2.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. diff --git a/src/exception.cpp b/src/exception.cpp
  2. index e5d6b9e..915ab3f 100644
  3. --- a/src/exception.cpp
  4. +++ b/src/exception.cpp
  5. @@ -10,7 +10,7 @@
  6. #include <new>
  7. #include <typeinfo>
  8. -#if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI)
  9. +#if defined(LIBCXX_BUILDING_LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI)
  10. #include <cxxabi.h>
  11. using namespace __cxxabiv1;
  12. #define HAVE_DEPENDENT_EH_ABI 1
  13. @@ -22,14 +22,13 @@
  14. #elif defined(_LIBCPPABI_VERSION)
  15. #include "support/runtime/exception_libcxxabi.ipp"
  16. #include "support/runtime/exception_pointer_cxxabi.ipp"
  17. -#elif defined(LIBCXXRT)
  18. +#elif defined(LIBCXX_BUILDING_LIBCXXRT)
  19. #include "support/runtime/exception_libcxxrt.ipp"
  20. #include "support/runtime/exception_pointer_cxxabi.ipp"
  21. #elif defined(__GLIBCXX__)
  22. #include "support/runtime/exception_glibcxx.ipp"
  23. #include "support/runtime/exception_pointer_glibcxx.ipp"
  24. #else
  25. -#include "include/atomic_support.h"
  26. #include "support/runtime/exception_fallback.ipp"
  27. #include "support/runtime/exception_pointer_unimplemented.ipp"
  28. #endif
  29. diff --git a/src/support/runtime/exception_libcxxrt.ipp b/src/support/runtime/exception_libcxxrt.ipp
  30. index 62aa322..4e428d2 100644
  31. --- a/src/support/runtime/exception_libcxxrt.ipp
  32. +++ b/src/support/runtime/exception_libcxxrt.ipp
  33. @@ -7,7 +7,7 @@
  34. //
  35. //===----------------------------------------------------------------------===//
  36. -#ifndef LIBCXXRT
  37. +#ifndef LIBCXX_BUILDING_LIBCXXRT
  38. #error this header may only be used when targeting libcxxrt
  39. #endif
  40. diff --git a/src/support/runtime/stdexcept_default.ipp b/src/support/runtime/stdexcept_default.ipp
  41. index 99d3045..d0218bf 100644
  42. --- a/src/support/runtime/stdexcept_default.ipp
  43. +++ b/src/support/runtime/stdexcept_default.ipp
  44. @@ -10,7 +10,7 @@
  45. /* For _LIBCPPABI_VERSION */
  46. #if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \
  47. - (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(LIBCXXRT))
  48. + (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(LIBCXX_BUILDING_LIBCXXRT))
  49. #include <cxxabi.h>
  50. #endif
  51. diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp
  52. index c7f0a70..a98ceb0 100644
  53. --- a/src/typeinfo.cpp
  54. +++ b/src/typeinfo.cpp
  55. @@ -48,7 +48,7 @@ size_t std::type_info::hash_code() const noexcept {
  56. // FIXME: Remove the _LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY configuration.
  57. #if (!defined(LIBCXX_BUILDING_LIBCXXABI) && \
  58. - !defined(LIBCXXRT) && \
  59. + !defined(LIBCXX_BUILDING_LIBCXXRT) && \
  60. !defined(__GLIBCXX__) && \
  61. !defined(_LIBCPP_ABI_VCRUNTIME)) || \
  62. defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)