rebase of the patches

This commit is contained in:
Sylvestre Ledru 2023-04-29 10:12:21 +02:00
parent e8ff2b4a8c
commit 3e1b8a9eac

View File

@ -1,19 +1,20 @@
Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
===================================================================
--- llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -25,6 +25,10 @@
#include "sanitizer_symbolizer_internal.h"
#include "sanitizer_symbolizer_libbacktrace.h"
#include "sanitizer_symbolizer_mac.h"
--- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -33,6 +33,11 @@
# include "sanitizer_symbolizer_libbacktrace.h"
# include "sanitizer_symbolizer_mac.h"
+#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR
+
+#define TOSTR2(X) #X
+#define TOSTR(X) TOSTR2(X)
#include <dlfcn.h> // for dlsym()
#include <errno.h>
@@ -452,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym
+
// C++ demangling function, as required by Itanium C++ ABI. This is weak,
// because we do not require a C++ ABI library to be linked to a program
// using sanitizers; if it's not present, we'll just use the mangled name.
@@ -451,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym
return new(*allocator) AtosSymbolizer(found_path, allocator);
}
#endif // SANITIZER_APPLE
@ -22,11 +23,11 @@ Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/
VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
return new(*allocator) LLVMSymbolizer(found_path, allocator);
}
Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/CMakeLists.txt
Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -202,6 +202,7 @@ set(SANITIZER_IMPL_HEADERS
--- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -203,6 +203,7 @@ set(SANITIZER_IMPL_HEADERS
)
include_directories(..)