From 5c6c00a9e5788135397daad297a3d31b5c226a3c Mon Sep 17 00:00:00 2001
From: Stan Cox <scox@redhat.com>
Date: Mon, 7 Feb 2022 17:01:36 -0500
Subject: [PATCH] Quiesce dwarf 5 warnings

---
 dwarf-error.patch | 11 +++++++++++
 dyninst.spec      |  7 ++++++-
 rhbz2034662.patch |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 dwarf-error.patch

diff --git a/dwarf-error.patch b/dwarf-error.patch
new file mode 100644
index 0000000..60baeca
--- /dev/null
+++ b/dwarf-error.patch
@@ -0,0 +1,11 @@
+Remove extraneous error messages of the form:
+ err message: .debug_loclists section missing
+ err message: invalid DWARF
+which are repeated in some circumstances without adding useful context
+
+--- dyninst-12.0.1/symtabAPI/src/dwarfWalker.C
++++ dyninst-12.0.1/symtabAPI/src/dwarfWalker.C
+@@ -1858,1 +1858,1 @@
+-                cerr << "err message: " << dwarf_errmsg(dwarf_errno()) << endl;
++	        dwarf_printf("(0x%lx) Error while decoding location: %s\n", id(), dwarf_errmsg(dwarf_errno()));
+
diff --git a/dyninst.spec b/dyninst.spec
index 16b4f77..b53c034 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -2,7 +2,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.dyninst.org
 Version: 12.0.1
 ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
@@ -12,6 +12,7 @@ Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{versio
 Source1: https://github.com/dyninst/testsuite/archive/%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz
 
 Patch1: rhbz2034662.patch
+Patch2: dwarf-error.patch
 
 %global dyninst_base dyninst-%{version}
 %global testsuite_base testsuite-%{__testsuite_version}
@@ -81,6 +82,7 @@ making sure that dyninst works properly.
 
 pushd %{dyninst_base}
 %patch1 -p1 -b .2034662
+%patch2 -p1 -b .dwerr
 popd
 
 pushd %{testsuite_base}
@@ -192,6 +194,9 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Mon Feb 07 2022 Stan Cox <scox@redhat.com> - 12.0.1-3
+- Quiesce dwarf 5 warnings
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/rhbz2034662.patch b/rhbz2034662.patch
index 7e9d6b5..34e2d42 100644
--- a/rhbz2034662.patch
+++ b/rhbz2034662.patch
@@ -3,8 +3,8 @@ Remove interposed definition of _r_debug
 Previously there was a dynamic relocation against _r_debug in the loader which picked up the interposed definition,
 but glibc now uses a direct internal hidden symbol reference and thus no longer updates the interposed object.
 
---- dyninst-12.0.0/dyninstAPI_RT/src/RTlinux.c
-+++ dyninst-12.0.0/dyninstAPI_RT/src/RTlinux.c
+--- dyninst-12.0.1/dyninstAPI_RT/src/RTlinux.c
++++ dyninst-12.0.1/dyninstAPI_RT/src/RTlinux.c
 @@ -404,7 +404,6 @@ void dyninstTrapHandler(int sig, siginfo_t *sg, ucontext_t *context)
  #if defined(cap_binary_rewriter)