From 457bbd3f8b5121d5a54bf29d16b37588a7fe52f2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:54:18 +0000
Subject: [PATCH] merge bitcoin#25360: SystemTap 4.7 (RISC-V support)

---
 depends/packages/systemtap.mk                 |  4 ++--
 ..._ASM_SECTION_AUTOGROUP_SUPPORT_check.patch | 22 ++++++++-----------
 doc/dependencies.md                           |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/depends/packages/systemtap.mk b/depends/packages/systemtap.mk
index 498db4982f..ad74323d98 100644
--- a/depends/packages/systemtap.mk
+++ b/depends/packages/systemtap.mk
@@ -1,8 +1,8 @@
 package=systemtap
-$(package)_version=4.5
+$(package)_version=4.7
 $(package)_download_path=https://sourceware.org/ftp/systemtap/releases/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=75078ed37e0dd2a769c9d1f9394170b2d9f4d7daa425f43ca80c13bad6cfc925
+$(package)_sha256_hash=43a0a3db91aa4d41e28015b39a65e62059551f3cc7377ebf3a3a5ca7339e7b1f
 $(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
 
 define $(package)_preprocess_cmds
diff --git a/depends/patches/systemtap/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch b/depends/patches/systemtap/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
index eae0cf72d6..c115bc43e8 100644
--- a/depends/patches/systemtap/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
+++ b/depends/patches/systemtap/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
@@ -1,19 +1,15 @@
-commit b92d4c121486f3c6e8a2cea537c53eb09894479a
-Author: 0xb10c <0xb10c@gmail.com>
-Date:   Tue Dec 7 11:02:07 2021 +0100
+Remove _SDT_ASM_SECTION_AUTOGROUP_SUPPORT check
 
-    Remove _SDT_ASM_SECTION_AUTOGROUP_SUPPORT check
-    
-    We assume that the assembler supports "?" in .pushsection directives.
-    This enables us to skip configure and make.
-    
-    See https://github.com/bitcoin/bitcoin/issues/23297.
+We assume that the assembler supports "?" in .pushsection directives.
+This enables us to skip configure and make.
+
+See https://github.com/bitcoin/bitcoin/issues/23297.
 
 diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
-index 97766e710..352b4ee25 100644
+index ca0162b..f96e0ee 100644
 --- a/includes/sys/sdt.h
 +++ b/includes/sys/sdt.h
-@@ -230,12 +230,10 @@ __extension__ extern unsigned long long __sdt_unsp;
+@@ -241,12 +241,10 @@ __extension__ extern unsigned long long __sdt_unsp;
     nice with code in COMDAT sections, which comes up in C++ code.
     Without that assembler support, some combinations of probe placements
     in certain kinds of C++ code may produce link-time errors.  */
@@ -27,5 +23,5 @@ index 97766e710..352b4ee25 100644
 -# define _SDT_ASM_AUTOGROUP ""
 -#endif
  
- #define _SDT_ASM_BODY(provider, name, pack_args, args)			      \
-   _SDT_ASM_1(990:	_SDT_NOP)					      \
+ #define _SDT_DEF_MACROS							     \
+ 	_SDT_ASM_1(.altmacro)						     \
diff --git a/doc/dependencies.md b/doc/dependencies.md
index e50f8113a1..bca313c40e 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -24,7 +24,7 @@ These are the dependencies currently used by Dash Core. You can find instruction
 | Qt | [5.15.11](https://download.qt.io/official_releases/qt/) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No | |  |
 | SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) |  |  |  |
 | XCB |  |  |  |  | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) (Linux only) |
-| systemtap ([tracing](tracing.md))| [4.5](https://sourceware.org/ftp/systemtap/releases/) |  |  |  | |
+| systemtap ([tracing](tracing.md))| [4.7](https://sourceware.org/ftp/systemtap/releases/) |  |  |  | |
 | xkbcommon |  |  |  |  | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) (Linux only) |
 | ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.0.0 | No |  |  |
 | zlib |  |  |  |  | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) |