From c5b91ce4a52af84c6cded494fa52a03c450550ae Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sun, 13 Feb 2022 13:04:40 +0000 Subject: [PATCH] symbolizer-path =================================================================== Gbp-Pq: Name symbolizer-path.diff --- compiler-rt/lib/sanitizer_common/CMakeLists.txt | 1 + .../sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt index 674835aba1..f04d42de0d 100644 --- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt @@ -195,6 +195,7 @@ set(SANITIZER_IMPL_HEADERS ) include_directories(..) +include_directories(${LLVM_INCLUDE_DIR}) set(SANITIZER_COMMON_DEFINITIONS HAVE_RPC_XDR_H=${HAVE_RPC_XDR_H}) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp index 4dd5cc3ad7..4b0b2d8ac9 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +++ b/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" +#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR + +#define TOSTR2(X) #X +#define TOSTR(X) TOSTR2(X) #include // for dlsym() #include @@ -433,7 +437,7 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) { return new(*allocator) AtosSymbolizer(found_path, allocator); } #endif // SANITIZER_MAC - if (const char *found_path = FindPathToBinary("llvm-symbolizer")) { + if (const char *found_path = "/usr/bin/llvm-symbolizer-" TOSTR(LLVM_VERSION_MAJOR)) { VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); return new(*allocator) LLVMSymbolizer(found_path, allocator); } -- 2.30.2