gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-28 14:47:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

cmake: use wrapped __cxa_throw on GNU/Linux

Browse Source
This commit is contained in:
selsta
2026-07-11 02:57:09 +02:00
parent d46a05e8c8
commit 0dcafa84cb
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+5
View File
@@ -32,6 +32,11 @@ if (WIN32 OR STATIC)
add_definitions(-DSTATICLIB) add_definitions(-DSTATICLIB)
endif () endif ()
set(STACK_TRACE_USE_WRAP OFF)
if (STACK_TRACE AND NOT STATIC AND CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(STACK_TRACE_USE_WRAP ON)
endif()
function (monero_private_headers group) function (monero_private_headers group)
source_group("${group}\\Private" source_group("${group}\\Private"
FILES FILES
src/common/CMakeLists.txt
+10
View File
@@ -63,6 +63,10 @@ monero_add_library(common
${common_headers} ${common_headers}
${common_private_headers}) ${common_private_headers})
if (STACK_TRACE_USE_WRAP)
target_compile_definitions(obj_common PRIVATE STACK_TRACE_USE_WRAP)
endif()
if(BUILD_TRANSLATIONS) if(BUILD_TRANSLATIONS)
add_dependencies(obj_common generate_translations_header) add_dependencies(obj_common generate_translations_header)
endif() endif()
@@ -80,6 +84,12 @@ target_link_libraries(common
PRIVATE PRIVATE
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
if (STACK_TRACE_USE_WRAP)
set_property(TARGET common APPEND PROPERTY INTERFACE_LINK_OPTIONS
"-Wl,--wrap=__cxa_throw"
"-Wl,-u,__wrap___cxa_throw")
endif()
target_include_directories(common target_include_directories(common
PRIVATE PRIVATE
${Boost_INCLUDE_DIRS}) ${Boost_INCLUDE_DIRS})
src/common/stack_trace.cpp
+6 -6
View File
@@ -41,7 +41,7 @@
#include <libunwind.h> #include <libunwind.h>
#include <cxxabi.h> #include <cxxabi.h>
#endif #endif
#ifndef STATICLIB #if !defined(STATICLIB) && !defined(STACK_TRACE_USE_WRAP)
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@@ -74,12 +74,12 @@
#define CXA_THROW_INFO_T void #define CXA_THROW_INFO_T void
#endif // !__clang__ #endif // !__clang__
#ifdef STATICLIB #if defined(STATICLIB) || defined(STACK_TRACE_USE_WRAP)
#define CXA_THROW __wrap___cxa_throw #define CXA_THROW __wrap___cxa_throw
extern "C" extern "C"
__attribute__((noreturn)) __attribute__((noreturn))
void __real___cxa_throw(void *ex, CXA_THROW_INFO_T *info, void (*dest)(void*)); void __real___cxa_throw(void *ex, CXA_THROW_INFO_T *info, void (*dest)(void*));
#else // !STATICLIB #else // STATICLIB || STACK_TRACE_USE_WRAP
#define CXA_THROW __cxa_throw #define CXA_THROW __cxa_throw
extern "C" extern "C"
typedef typedef
@@ -87,7 +87,7 @@ typedef
__attribute__((noreturn)) __attribute__((noreturn))
#endif // __clang__ #endif // __clang__
void (cxa_throw_t)(void *ex, CXA_THROW_INFO_T *info, void (*dest)(void*)); void (cxa_throw_t)(void *ex, CXA_THROW_INFO_T *info, void (*dest)(void*));
#endif // !STATICLIB #endif // STATICLIB || STACK_TRACE_USE_WRAP
extern "C" extern "C"
__attribute__((noreturn)) __attribute__((noreturn))
@@ -99,12 +99,12 @@ void CXA_THROW(void *ex, CXA_THROW_INFO_T *info, void (*dest)(void*))
tools::log_stack_trace((std::string("Exception: ")+((!status && dsym) ? dsym : (const char*)info)).c_str()); tools::log_stack_trace((std::string("Exception: ")+((!status && dsym) ? dsym : (const char*)info)).c_str());
free(dsym); free(dsym);
#ifndef STATICLIB #if !defined(STATICLIB) && !defined(STACK_TRACE_USE_WRAP)
#ifndef __clang__ // for GCC the attr can't be applied in typedef like for clang #ifndef __clang__ // for GCC the attr can't be applied in typedef like for clang
__attribute__((noreturn)) __attribute__((noreturn))
#endif // !__clang__ #endif // !__clang__
cxa_throw_t *__real___cxa_throw = (cxa_throw_t*)dlsym(RTLD_NEXT, "__cxa_throw"); cxa_throw_t *__real___cxa_throw = (cxa_throw_t*)dlsym(RTLD_NEXT, "__cxa_throw");
#endif // !STATICLIB #endif // !STATICLIB && !STACK_TRACE_USE_WRAP
__real___cxa_throw(ex, info, dest); __real___cxa_throw(ex, info, dest);
} }