From eeabf351d4c7515bb16a8789be518388a7dac3e67524de2e00afab343559cb42 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Tue, 15 Feb 2022 14:47:59 +0000 Subject: [PATCH] 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 | 26 +++++++++++++++++ sys-sdt.h-fp-constraints-arm32.patch | 23 +++++++++++++++ sys-sdt.h-fp-constraints-x86_64.patch | 31 +++++++++++++++++++++ systemtap-dtrace.changes | 10 +++++++ systemtap-dtrace.spec | 6 ++++ systemtap-headers.changes | 8 ++++++ systemtap-headers.spec | 7 ++++- systemtap.changes | 8 ++++++ systemtap.spec | 4 +++ 9 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 sys-sdt.h-fp-constraints-aarch64-s390.patch create mode 100644 sys-sdt.h-fp-constraints-arm32.patch create mode 100644 sys-sdt.h-fp-constraints-x86_64.patch diff --git a/sys-sdt.h-fp-constraints-aarch64-s390.patch b/sys-sdt.h-fp-constraints-aarch64-s390.patch new file mode 100644 index 0000000..63d28c7 --- /dev/null +++ b/sys-sdt.h-fp-constraints-aarch64-s390.patch @@ -0,0 +1,26 @@ +From: Stan Cox +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 + + 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 diff --git a/sys-sdt.h-fp-constraints-arm32.patch b/sys-sdt.h-fp-constraints-arm32.patch new file mode 100644 index 0000000..68a4f35 --- /dev/null +++ b/sys-sdt.h-fp-constraints-arm32.patch @@ -0,0 +1,23 @@ +From: Frank Ch. Eigler +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 + + + 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 diff --git a/sys-sdt.h-fp-constraints-x86_64.patch b/sys-sdt.h-fp-constraints-x86_64.patch new file mode 100644 index 0000000..957d091 --- /dev/null +++ b/sys-sdt.h-fp-constraints-x86_64.patch @@ -0,0 +1,31 @@ +From: Frank Ch. Eigler +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 + + 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__ diff --git a/systemtap-dtrace.changes b/systemtap-dtrace.changes index 65154d2..0b7c5a9 100644 --- a/systemtap-dtrace.changes +++ b/systemtap-dtrace.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Feb 14 15:46:00 UTC 2022 - Tony Jones + +- 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 diff --git a/systemtap-dtrace.spec b/systemtap-dtrace.spec index 1148c82..d99e9ea 100644 --- a/systemtap-dtrace.spec +++ b/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 diff --git a/systemtap-headers.changes b/systemtap-headers.changes index 997167b..27d0201 100644 --- a/systemtap-headers.changes +++ b/systemtap-headers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 14 15:46:00 UTC 2022 - Tony Jones + +- 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 diff --git a/systemtap-headers.spec b/systemtap-headers.spec index 7ba8b16..f3529fa 100644 --- a/systemtap-headers.spec +++ b/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 diff --git a/systemtap.changes b/systemtap.changes index f324681..19d86a5 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 14 15:46:00 UTC 2022 - Tony Jones + +- 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 diff --git a/systemtap.spec b/systemtap.spec index 6ec7122..5fd4fa1 100644 --- a/systemtap.spec +++ b/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++