Accepting request 954972 from home:jones_tony:branches:devel:tools

OBS-URL: https://build.opensuse.org/request/show/954972
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=132

sys-sdt.h-fp-constraints-aarch64-s390.patch

@@ -0,0 +1,26 @@
+From: Stan Cox <scox@redhat.com>
+Date: Tue Dec 7 09:55:01 2021 -0500
+Subject: sys/sdt.h fp constraints: aarch64, s390
+Git-commit: 209b5a19c6ee30c2db3f6c849620544a851013e8
+References: https://build.suse.de/request/show/263498
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+    sys/sdt.h fp constraints: aarch64, s390
+    
+    Remove float constraints as per commit 1d3653936 but for aarch64 and s390.
+
+diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
+index 3e1f00b6c..48cb7263f 100644
+--- a/includes/sys/sdt.h
++++ b/includes/sys/sdt.h
+@@ -102,10 +102,6 @@
+ # define STAP_SDT_ARG_CONSTRAINT        nZr
+ # elif defined __x86_64__
+ # define STAP_SDT_ARG_CONSTRAINT norx
+-# elif defined __aarch64__
+-# define STAP_SDT_ARG_CONSTRAINT norw
+-# elif defined __s390__ || defined __s390x__
+-# define STAP_SDT_ARG_CONSTRAINT        norf
+ # elif defined __arm__
+ # define STAP_SDT_ARG_CONSTRAINT        g
+ # else

sys-sdt.h-fp-constraints-arm32.patch

@@ -0,0 +1,23 @@
+From: Frank Ch. Eigler <fche@redhat.com>
+Date: Wed Dec 1 10:59:27 2021 -0500
+Subject: RHBZ2026858: on __arm__ (arm32), use STAP_SDT_ARG_CONSTRAINT = G
+Git-commit: 34facf7ee6b43dae66cc109973a4eda42e439163
+References: https://build.suse.de/request/show/263498
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+
+    RHBZ2026858: on __arm__ (arm32), use STAP_SDT_ARG_CONSTRAINT = g
+
+diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
+index 9ecb1cb6f..28d236d91 100644
+--- a/includes/sys/sdt.h
++++ b/includes/sys/sdt.h
+@@ -106,6 +106,8 @@
+ # define STAP_SDT_ARG_CONSTRAINT norw
+ # elif defined __s390__ || defined __s390x__
+ # define STAP_SDT_ARG_CONSTRAINT        norf
++# elif defined __arm__
++# define STAP_SDT_ARG_CONSTRAINT        g
+ # else
+ # define STAP_SDT_ARG_CONSTRAINT        nor
+ # endif

sys-sdt.h-fp-constraints-x86_64.patch

@@ -0,0 +1,31 @@
+From: Frank Ch. Eigler <fche@redhat.com>
+Date: Mon Dec 6 12:06:06 2021 -0500
+Subject: sys/sdt.h fp constraints cont'd, x86-64 edition
+Git-commit: 1d3653936fc1fd13135a723a27e6c7e959793ad0
+References: https://build.suse.de/request/show/263498
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+    sys/sdt.h fp constraints cont'd, x86-64 edition
+    
+    It appears that various versions of gcc continue to show signs of
+    confusion at our newly offered asm-operand alternatives for floating
+    point sdt.h marker parameters.
+    
+    e.g., https://bugzilla.redhat.com/show_bug.cgi?id=2028798
+    
+    We may need to restore previous constraints broadly, forcing the
+    compiler to plop floating point parameters into integer storage.
+
+diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
+index 24d5e01c3..3e1f00b6c 100644
+--- a/includes/sys/sdt.h
++++ b/includes/sys/sdt.h
+@@ -101,7 +101,7 @@
+ # if defined __powerpc__
+ # define STAP_SDT_ARG_CONSTRAINT        nZr
+ # elif defined __x86_64__
+-# define STAP_SDT_ARG_CONSTRAINT norfxy
++# define STAP_SDT_ARG_CONSTRAINT norx
+ # elif defined __aarch64__
+ # define STAP_SDT_ARG_CONSTRAINT norw
+ # elif defined __s390__ || defined __s390x__

systemtap-dtrace.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Feb 14 15:46:00 UTC 2022 - Tony Jones <tonyj@suse.com>
+
+- Resolve gcc compilation error reported against glib2 and libvirt
+    New patch: sys-sdt.h-fp-constraints-arm32.patch
+    New patch: sys-sdt.h-fp-constraints-x86_64.patch
+    New patch: sys-sdt.h-fp-constraints-aarch64-s390.patch
+
+- Add existing patch systemtap-build-source-dir.patch to spec for consistency
+
 -------------------------------------------------------------------
 Thu Jan 27 23:26:36 UTC 2022 - Tony Jones <tonyj@suse.com>
 

systemtap-dtrace.spec

@@ -31,6 +31,11 @@ Source1:        http://sourceware.org/systemtap/ftp/releases/systemtap-%{version
 Source2:        systemtap.keyring
 Source3:        README-BEFORE-ADDING-PATCHES
 Source4:        README-KEYRING
+Patch1:         systemtap-build-source-dir.patch
+Patch2:         sys-sdt.h-fp-constraints-arm32.patch
+Patch3:         sys-sdt.h-fp-constraints-x86_64.patch
+Patch4:         sys-sdt.h-fp-constraints-aarch64-s390.patch
+
 BuildArch:      noarch
 
 %description
@@ -40,6 +45,7 @@ definitions.
 
 %prep
 %setup -q -n systemtap-%{version}
+%autopatch -p1
 
 %build
 # Our binutils always support '?' in the section characters on all

systemtap-headers.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb 14 15:46:00 UTC 2022 - Tony Jones <tonyj@suse.com>
+
+- Resolve gcc compilation error reported against glib2 and libvirt
+    New patch: sys-sdt.h-fp-constraints-arm32.patch
+    New patch: sys-sdt.h-fp-constraints-x86_64.patch
+    New patch: sys-sdt.h-fp-constraints-aarch64-s390.patch
+
 -------------------------------------------------------------------
 Thu Jan 27 23:26:36 UTC 2022 - Tony Jones <tonyj@suse.com>
 

systemtap-headers.spec

@@ -37,6 +37,10 @@ Source3:        README-BEFORE-ADDING-PATCHES
 Source4:        README-KEYRING
 Source5:        stap-server.conf
 Patch1:         systemtap-build-source-dir.patch
+Patch2:         sys-sdt.h-fp-constraints-arm32.patch
+Patch3:         sys-sdt.h-fp-constraints-x86_64.patch
+Patch4:         sys-sdt.h-fp-constraints-aarch64-s390.patch
+
 # sdt-devel provides the same header files as us, so we
 # must conflict
 Conflicts:      systemtap-sdt-devel
@@ -49,7 +53,8 @@ systemtap-sdt-devel, which also contains these headers.
 
 %prep
 %setup -q -n systemtap-%{version}
-%patch1 -p1
+%autopatch -p1
+
 
 %build
 # Our binutils always support '?' in the section characters on all

systemtap.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Feb 14 15:46:00 UTC 2022 - Tony Jones <tonyj@suse.com>
+
+- Resolve gcc compilation error reported against glib2 and libvirt
+    New patch: sys-sdt.h-fp-constraints-arm32.patch
+    New patch: sys-sdt.h-fp-constraints-x86_64.patch
+    New patch: sys-sdt.h-fp-constraints-aarch64-s390.patch
+
 -------------------------------------------------------------------
 Thu Jan 27 23:21:10 UTC 2022 - Tony Jones <tonyj@suse.com>
 

systemtap.spec

@@ -33,6 +33,10 @@ Source3:        README-BEFORE-ADDING-PATCHES
 Source4:        README-KEYRING
 Source5:        stap-server.conf
 Patch1:         systemtap-build-source-dir.patch
+Patch2:         sys-sdt.h-fp-constraints-arm32.patch
+Patch3:         sys-sdt.h-fp-constraints-x86_64.patch
+Patch4:         sys-sdt.h-fp-constraints-aarch64-s390.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++