Skip to content

Commit eee2c28

Browse files
committed
Merge bitcoin/bitcoin#26945: depends: systemtap 4.8
df7ae8b depends: systemtap: remove variadic params that trigger compiler warnings (Cory Fields) a66d82e depends: systemtap 4.8 (fanquake) Pull request description: Updates systemtap to 4.8. Includes acc2895a66a4b654e9a0a05ed0927f67f48c75b2 from #25972. Will half (depends) fix #26916. Release notes etc: https://lwn.net/Articles/913908/. ACKs for top commit: 0xB10C: ACK df7ae8b hebasto: re-ACK df7ae8b. Tree-SHA512: 0f64fba87888058380183f38b6ace7b71f4a8b5503eb32b82b283a40c99d92c449c60deecc2386df5084235cfd760af6c1e7f432fa1bd30f97bb42f100f23d62
2 parents 79e007d + df7ae8b commit eee2c28

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

depends/packages/systemtap.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package=systemtap
2-
$(package)_version=4.7
2+
$(package)_version=4.8
33
$(package)_download_path=https://sourceware.org/ftp/systemtap/releases/
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5-
$(package)_sha256_hash=43a0a3db91aa4d41e28015b39a65e62059551f3cc7377ebf3a3a5ca7339e7b1f
6-
$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch
5+
$(package)_sha256_hash=cbd50a4eba5b261394dc454c12448ddec73e55e6742fda7f508f9fbc1331c223
6+
$(package)_patches=remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch fix_variadic_warning.patch
77

88
define $(package)_preprocess_cmds
99
patch -p1 < $($(package)_patch_dir)/remove_SDT_ASM_SECTION_AUTOGROUP_SUPPORT_check.patch && \
10+
patch -p1 < $($(package)_patch_dir)/fix_variadic_warning.patch && \
1011
mkdir -p $($(package)_staging_prefix_dir)/include/sys && \
1112
cp includes/sys/sdt.h $($(package)_staging_prefix_dir)/include/sys/sdt.h
1213
endef
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Could be dropped after a migration to C++20.
2+
See: https://github.com/bitcoin/bitcoin/issues/26916.
3+
4+
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
5+
index 4075a5f..7c6138c 100644
6+
--- a/includes/sys/sdt.h
7+
+++ b/includes/sys/sdt.h
8+
@@ -276,7 +276,7 @@ __extension__ extern unsigned long long __sdt_unsp;
9+
_SDT_ASM_1(.purgem _SDT_TYPE_) \
10+
_SDT_ASM_1(.purgem _SDT_TYPE)
11+
12+
-#define _SDT_ASM_BODY(provider, name, pack_args, args, ...) \
13+
+#define _SDT_ASM_BODY(provider, name, pack_args, args) \
14+
_SDT_DEF_MACROS \
15+
_SDT_ASM_1(990: _SDT_NOP) \
16+
_SDT_ASM_3( .pushsection .note.stapsdt,_SDT_ASM_AUTOGROUP,"note") \

0 commit comments

Comments
 (0)