61 lines
2.7 KiB
Diff
61 lines
2.7 KiB
Diff
diff -ruN a/libcxxabi-14.0.0rc2.src.orig/src/cxa_default_handlers.cpp a/libcxxabi-14.0.0rc2.src/src/cxa_default_handlers.cpp
|
|
--- a/libcxxabi-14.0.0rc2.src.orig/src/cxa_default_handlers.cpp 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/libcxxabi-14.0.0rc2.src/src/cxa_default_handlers.cpp 2022-03-03 15:13:26.573237421 +0100
|
|
@@ -16,7 +16,7 @@
|
|
#include "cxa_handlers.h"
|
|
#include "cxa_exception.h"
|
|
#include "private_typeinfo.h"
|
|
-#include "include/atomic_support.h" // from libc++
|
|
+#include <libcxx-internal/atomic_support.h>
|
|
|
|
#if !defined(LIBCXXABI_SILENT_TERMINATE)
|
|
|
|
diff -ruN a/libcxxabi-14.0.0rc2.src.orig/src/cxa_exception.cpp a/libcxxabi-14.0.0rc2.src/src/cxa_exception.cpp
|
|
--- a/libcxxabi-14.0.0rc2.src.orig/src/cxa_exception.cpp 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/libcxxabi-14.0.0rc2.src/src/cxa_exception.cpp 2022-03-03 15:13:54.560419466 +0100
|
|
@@ -17,7 +17,7 @@
|
|
#include "cxa_exception.h"
|
|
#include "cxa_handlers.h"
|
|
#include "fallback_malloc.h"
|
|
-#include "include/atomic_support.h" // from libc++
|
|
+#include <libcxx-internal/atomic_support.h>
|
|
|
|
#if __has_feature(address_sanitizer)
|
|
#include <sanitizer/asan_interface.h>
|
|
diff -ruN a/libcxxabi-14.0.0rc2.src.orig/src/cxa_guard_impl.h a/libcxxabi-14.0.0rc2.src/src/cxa_guard_impl.h
|
|
--- a/libcxxabi-14.0.0rc2.src.orig/src/cxa_guard_impl.h 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/libcxxabi-14.0.0rc2.src/src/cxa_guard_impl.h 2022-03-03 15:14:07.350502656 +0100
|
|
@@ -44,7 +44,7 @@
|
|
*/
|
|
|
|
#include "__cxxabi_config.h"
|
|
-#include "include/atomic_support.h" // from libc++
|
|
+#include <libcxx-internal/atomic_support.h>
|
|
#if defined(__has_include)
|
|
# if __has_include(<sys/syscall.h>)
|
|
# include <sys/syscall.h>
|
|
diff -ruN a/libcxxabi-14.0.0rc2.src.orig/src/cxa_handlers.cpp a/libcxxabi-14.0.0rc2.src/src/cxa_handlers.cpp
|
|
--- a/libcxxabi-14.0.0rc2.src.orig/src/cxa_handlers.cpp 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/libcxxabi-14.0.0rc2.src/src/cxa_handlers.cpp 2022-03-03 15:13:43.419346996 +0100
|
|
@@ -17,7 +17,7 @@
|
|
#include "cxa_handlers.h"
|
|
#include "cxa_exception.h"
|
|
#include "private_typeinfo.h"
|
|
-#include "include/atomic_support.h" // from libc++
|
|
+#include <libcxx-internal/atomic_support.h>
|
|
|
|
namespace std
|
|
{
|
|
diff -ruN a/libcxxabi-14.0.0rc2.src.orig/src/stdlib_stdexcept.cpp a/libcxxabi-14.0.0rc2.src/src/stdlib_stdexcept.cpp
|
|
--- a/libcxxabi-14.0.0rc2.src.orig/src/stdlib_stdexcept.cpp 2022-03-02 01:46:37.000000000 +0100
|
|
+++ a/libcxxabi-14.0.0rc2.src/src/stdlib_stdexcept.cpp 2022-03-03 14:36:19.052773915 +0100
|
|
@@ -12,7 +12,7 @@
|
|
#include <cstring>
|
|
#include <cstdint>
|
|
#include <cstddef>
|
|
-#include "include/refstring.h" // from libc++
|
|
+#include <libcxx-internal/refstring.h>
|
|
|
|
static_assert(sizeof(std::__libcpp_refstring) == sizeof(const char *), "");
|
|
|