highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-15 08:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

trace: Workaround GCC bug compiling with old systemtap

Browse Source 
Github-Pull: #33310
Rebased-From: 93a29ff283
This commit is contained in:
Luke Dashjr
2025-09-04 19:25:33 +00:00
committed by fanquake
parent f7eded1dca
commit 35038b03c9
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/module/FindUSDT.cmake
View File

@@ -36,6 +36,10 @@ if(USDT_INCLUDE_DIR)
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
set(CMAKE_REQUIRED_INCLUDES ${USDT_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${USDT_INCLUDE_DIR})
check_cxx_source_compiles(" check_cxx_source_compiles("
#if defined(__arm__)
# define STAP_SDT_ARG_CONSTRAINT g
#endif
// Setting SDT_USE_VARIADIC lets systemtap (sys/sdt.h) know that we want to use // Setting SDT_USE_VARIADIC lets systemtap (sys/sdt.h) know that we want to use
// the optional variadic macros to define tracepoints. // the optional variadic macros to define tracepoints.
#define SDT_USE_VARIADIC 1 #define SDT_USE_VARIADIC 1

7
src/util/trace.h
View File

@@ -9,6 +9,13 @@
#ifdef ENABLE_TRACING #ifdef ENABLE_TRACING
// Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103395
// systemtap 4.6 on 32-bit ARM triggers internal compiler error
// (this workaround is included in systemtap 4.7+)
#if defined(__arm__)
# define STAP_SDT_ARG_CONSTRAINT g
#endif
// Setting SDT_USE_VARIADIC lets systemtap (sys/sdt.h) know that we want to use // Setting SDT_USE_VARIADIC lets systemtap (sys/sdt.h) know that we want to use
// the optional variadic macros to define tracepoints. // the optional variadic macros to define tracepoints.
#define SDT_USE_VARIADIC 1 #define SDT_USE_VARIADIC 1