dyninst rebase for c10s

Resolves: RHEL-87001
2025-04-30 14:47:23 -04:00 · 2025-04-30 14:47:23 -04:00 · ae9416d304
commit ae9416d304
parent ad9164dd22
10 changed files with 303 additions and 114 deletions
--- a/.gitignore
+++ b/.gitignore
@ -35,3 +35,4 @@
 /testsuite-12.2.0.tar.gz
 /dyninst-12.3.0.tar.gz
 /testsuite-12.3.0.tar.gz
+/dyninst-13.0.0.tar.gz
--- a/dwarf-error.patch
+++ b/dwarf-error.patch
@ -1,11 +0,0 @@
-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.1.0/symtabAPI/src/dwarfWalker.C
-+++ dyninst-12.1.0/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()));
-
--- a/dyninst-cmake3.27.patch
+++ b/dyninst-cmake3.27.patch
@ -1,11 +0,0 @@
-diff -up dyninst-12.3.0/cmake/warnings.cmake.cmake3.27 dyninst-12.3.0/cmake/warnings.cmake
--- dyninst-12.3.0/cmake/warnings.cmake.cmake3.27	2023-02-22 14:39:56.000000000 -0700
-+++ dyninst-12.3.0/cmake/warnings.cmake	2023-06-09 19:59:32.831350952 -0600
-@@ -127,6 +127,7 @@ endif()
- 
- if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang)$")
-     include(CheckCXXCompilerFlag)
-+    include(CheckCXXSourceCompiles)
-     foreach(f IN LISTS REQUESTED_WARNING_FLAGS)
-         string(REGEX REPLACE "[^a-zA-Z0-9]" "_" v "HAS_CPP_FLAG_${f}")
-         set(CMAKE_REQUIRED_FLAGS "-${f}")
--- a/dyninst.spec
+++ b/dyninst.spec
@ -2,22 +2,19 @@ Summary: An API for Run-time Code Generation
 License: LGPL-2.1-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LicenseRef-Fedora-Public-Domain AND BSD-3-Clause
 Name: dyninst
 Group: Development/Libraries
-Release: 8%{?dist}
+Release: 1%{?dist}
 URL: http://www.dyninst.org
-Version: 12.3.0
-ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
+Version: 13.0.0
+ExclusiveArch: x86_64 ppc64le aarch64
+Obsoletes: dyninst-testsuite < %{version} 

-%define __testsuite_version 12.3.0
-Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{version}.tar.gz
-Source1: https://github.com/dyninst/testsuite/archive/v%{__testsuite_version}/testsuite-%{__testsuite_version}.tar.gz
-
-Patch1: dwarf-error.patch
-Patch2: onetbb.patch
-# Support cmake 3.27 - https://github.com/dyninst/dyninst/pull/1438
-Patch3: dyninst-cmake3.27.patch
+Source0: dyninst-13.0.0.tar.gz
+Patch1: github-pr1721.patch
+Patch2: github-pr1880.patch
+Patch3: github-pr1880-ish.patch
+Patch4: github-pr1730.patch

 %global dyninst_base dyninst-%{version}
-%global testsuite_base testsuite-%{__testsuite_version}

 BuildRequires: gcc-c++
 BuildRequires: elfutils-devel
@ -29,17 +26,11 @@ BuildRequires: cmake
 BuildRequires: libtirpc-devel
 BuildRequires: tbb tbb-devel
 BuildRequires: tex-latex
-
-# Extra requires just for the testsuite
-BuildRequires: gcc-gfortran libxml2-devel
 BuildRequires: make

-# Testsuite files should not provide/require anything
-%{?filter_setup:
-%filter_provides_in %{_libdir}/dyninst/testsuite/
-%filter_requires_in %{_libdir}/dyninst/testsuite/
-%filter_setup
-}
+# https://fedoraproject.org/wiki/Changes/Linker_Error_On_Security_Issues
+# may impact the RT library
+%undefine _hardened_linker_errors

 %description

@ -72,32 +63,20 @@ dyninst-devel includes the C header files that specify the Dyninst user-space
 libraries and interfaces. This is required for rebuilding any program
 that uses Dyninst.

-%package testsuite
-Summary: Programs for testing Dyninst
-Group: Development/System
-Requires: dyninst = %{version}-%{release}
-Requires: dyninst-devel = %{version}-%{release}
-License: BSD-3-Clause AND LGPL-2.1-or-later
-
-
-%description testsuite
-dyninst-testsuite includes the test harness and target programs for
-making sure that dyninst works properly.
-
 %prep
 %setup -q -n %{name}-%{version} -c
-%setup -q -T -D -a 1

 pushd %{dyninst_base}
-%patch -P1 -p1 -b .dwerr
-%patch -P2 -p1 -b .onetbb
-%patch -P3 -p1 -b .cmake3.27
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
 popd

 # cotire seems to cause non-deterministic gcc errors
 # https://bugzilla.redhat.com/show_bug.cgi?id=1420551
-sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \
-  %{dyninst_base}/cmake/shared.cmake
+# sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \
+#  %{dyninst_base}/cmake/shared.cmake

 %build

@ -112,50 +91,31 @@ LDFLAGS="$LDFLAGS $RPM_LD_FLAGS"
 CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS LDFLAGS

-%cmake \
+%cmake --log-level=DEBUG \
 -DENABLE_DEBUGINFOD=1 \
- -DINSTALL_LIB_DIR:PATH=%{_libdir}/dyninst \
- -DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \
- -DINSTALL_CMAKE_DIR:PATH=%{_libdir}/cmake/Dyninst \
 -DCMAKE_BUILD_TYPE=None \
- -DCMAKE_SKIP_RPATH:BOOL=YES
-%cmake_build
-
-# Hack to install dyninst nearby, so the testsuite can use it
-DESTDIR="../install" %__cmake --install "%{__cmake_builddir}"
-find ../install -name '*.cmake' -execdir \
-     sed -i -e "s!%{_prefix}!$PWD/../install&!" '{}' '+'
-# cmake mistakenly looks for libtbb.so in the dyninst install dir
-sed -i '/libtbb.so/ s/".*usr/"\/usr/' $PWD/../install%{_libdir}/cmake/Dyninst/commonTargets.cmake
-
-cd ../%{testsuite_base}
-# testsuite build sometimes encounters dependency issues with -jN
-%define _smp_mflags -j1
-%cmake \
- -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \
- -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \
- -DCMAKE_BUILD_TYPE:STRING=Debug \
- -DCMAKE_SKIP_RPATH:BOOL=YES
-%cmake_build
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DINSTALL_CMAKE_DIR:PATH=/usr/lib64/cmake/Dyninst \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_INSTALL_INCLUDEDIR:PATH=/usr/include/dyninst \
+ -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib64/dyninst
+%cmake_build -v -v -v

 %install

 cd %{dyninst_base}
-%cmake_install
+%cmake_install -v -v -v

-cd ../%{testsuite_base}
-%cmake_install
+# move /usr/lib64//dyninst/cmake/Dyninst to /usr/lib64/cmake/Dyninst
+mkdir -p %{buildroot}/%{_libdir}/cmake
+mv %{buildroot}/%{_libdir}/dyninst/cmake/Dyninst %{buildroot}/%{_libdir}/cmake/Dyninst
+
+# this is a testsuite-like binary, not needed in main package
+rm -f "%{buildroot}%{_bindir}/parseThat"

 mkdir -p %{buildroot}/etc/ld.so.conf.d
 echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf

-# Ugly hack to mask testsuite files from debuginfo extraction.  Running the
-# testsuite requires debuginfo, so extraction is useless.  However, debuginfo
-# extraction is still nice for the main libraries, so we don't want to disable
-# it package-wide.  The permissions are restored by attr(755,-,-) in files.
-find %{buildroot}%{_libdir}/dyninst/testsuite/ \
-  -type f '!' -name '*.a' -execdir chmod 644 '{}' '+'
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig

@ -187,13 +147,11 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %{_libdir}/dyninst/*.so
 %{_libdir}/cmake/Dyninst

-%files testsuite
-%{_bindir}/parseThat
-%dir %{_libdir}/dyninst/testsuite/
-%attr(755,root,root) %{_libdir}/dyninst/testsuite/*[!a]
-%attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
-
 %changelog
+* Fri May 02 2025 Frank Ch. Eigler <fche@redhat.com> - 13.0.0-1
+- Rebased to dyninst 13.0.0 + buildability patches
+- Dropping testsuite
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 12.3.0-8
 - Bump release for October 2024 mass rebuild:
  Resolves: RHEL-64018
--- a/github-pr1721.patch
+++ b/github-pr1721.patch
@ -0,0 +1,55 @@
+commit e70b1001eb5082bb0204b602e3ca1cfccd67fc94
+gpg: Signature made Tue 09 Apr 2024 11:21:17 AM EDT
+gpg:                using RSA key B5690EEEBB952194
+gpg: Can't check signature: No public key
+Author: kupsch <kupsch@cs.wisc.edu>
+Date:   Tue Apr 9 10:21:17 2024 -0500
+
+    improve cmake install dirs (#1721)
+    
+    * Use cmake's GNUInstallDirs to get the lib, bin and include directory
+      names instead of always using 'lib', 'bin', and 'include'.  This
+      results in two changes to the installation:
+    
+      - lib directory becomes 'lib64' on platforms where this is the
+        convention
+    
+      - the lib, bin and include may be overwritten using the cmake
+        variables CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and
+        CMAKE_INSTALL_INCLUDEDIR respectively
+    
+    * Update github workflows to handle the lib install dir lib64:
+    
+      - use Dyninst_ROOT instead of Dyninst_DIR as it searches for the
+        directory used
+    
+      - for non-cmake uses search for lib* to find either lib or lib64
+
+diff --git a/cmake/DyninstLibrarySettings.cmake b/cmake/DyninstLibrarySettings.cmake
+index d3627f8789f2..e8cb26b95c39 100644
+--- a/cmake/DyninstLibrarySettings.cmake
+++ b/cmake/DyninstLibrarySettings.cmake
+@@ -25,9 +25,10 @@ else()
+   set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+ endif()
+ 
+-set(DYNINST_INSTALL_BINDIR "bin")
+-set(DYNINST_INSTALL_LIBDIR "lib")
+-set(DYNINST_INSTALL_INCLUDEDIR "include")
+include(GNUInstallDirs)
+set(DYNINST_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
+set(DYNINST_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+set(DYNINST_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+ set(DYNINST_INSTALL_CMAKEDIR "${DYNINST_INSTALL_LIBDIR}/cmake/Dyninst")
+ 
+ # -- Set up the RPATH ---
+diff --git a/parseThat/CMakeLists.txt b/parseThat/CMakeLists.txt
+index ffe4b7aea29c..d4697a8a1d99 100644
+--- a/parseThat/CMakeLists.txt
+++ b/parseThat/CMakeLists.txt
+@@ -29,4 +29,4 @@ target_link_libraries(parseThat PRIVATE dyninstAPI)
+ target_include_directories(parseThat BEFORE
+                            PRIVATE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/common/h>")
+ 
+-install(TARGETS parseThat RUNTIME DESTINATION bin)
+install(TARGETS parseThat RUNTIME DESTINATION "${DYNINST_INSTALL_BINDIR}")
--- a/github-pr1730.patch
+++ b/github-pr1730.patch
@ -0,0 +1,151 @@
+commit eae798d4e5f938cb85758571dbab9afbbea7b5d2 (HEAD -> v13.0.0)
+Author: Frank Ch. Eigler <fche@redhat.com>
+Date:   Thu Feb 6 08:35:33 2025 -0500
+
+    MachRegister: fix initialization order bug (#1731)
+    
+    Backported upstream commit to 13.0.0 base.
+    
+    commit a29f32ac87c4483b97a2c5cb9beed5642124ae8f
+    Author: Tim Haines <thaines.astro@gmail.com>
+    Date:   Mon Apr 22 15:32:12 2024 -0500
+    
+        MachRegister: fix initialization order bug (#1731)
+    
+        This fixes the static initialization ordering issue reported in https://github.com/dyninst/dyninst/issues/1730.
+
+diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
+index 669659e44c76..b6507772858c 100644
+--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
+@@ -39,7 +39,6 @@ set(_public_headers
+     h/registers/AMDGPU/amdgpu_gfx90a_regs.h
+     h/registers/AMDGPU/amdgpu_gfx940_regs.h
+     h/registers/cuda_regs.h
+-    h/registers/MachRegister.h
+     h/registers/ppc32_regs.h
+     h/registers/ppc64_regs.h
+     h/registers/reg_def.h
+@@ -72,12 +71,12 @@ set(_private_headers
+     src/lprintf.h
+     src/lru_cache.h
+     src/MappedFile.h
+    src/registers/MachRegisterCache.h
+     src/NodeIterator.h
+     src/ntHeaders.h
+     src/parseauxv.h
+     src/pathName.h
+     src/pool_allocators.h
+-    src/registers/MachRegister.C
+     src/sha1.h
+     src/singleton_object_pool.h
+     src/stats.h
+@@ -111,6 +110,7 @@ set(_sources
+     src/debug_common.C
+     src/VariableLocation.C
+     src/Buffer.C
+    src/registers/MachRegister.C
+     src/MachSyscall.C)
+ 
+ if(DYNINST_OS_UNIX)
+diff --git a/common/src/dyn_regs.C b/common/src/dyn_regs.C
+index 3fcd194a71dd..7951dbe753bc 100644
+--- a/common/src/dyn_regs.C
+++ b/common/src/dyn_regs.C
+@@ -28,8 +28,16 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+#include "registers/MachRegisterCache.h"
+
+namespace Dyninst { namespace registers {
+    // These are used in MachRegister.C
+    name_cache names;
+}}
+
+ //clang-format: off
+ #define DYN_DEFINE_REGS
+ #include "dyn_regs.h"
+ #undef DYN_DEFINE_REGS
+ //clang-format: on
+
+diff --git a/common/src/registers/MachRegister.C b/common/src/registers/MachRegister.C
+index ccd01abc1811..93c020c04415 100644
+--- a/common/src/registers/MachRegister.C
+++ b/common/src/registers/MachRegister.C
+@@ -1,4 +1,5 @@
+ #include "common/h/registers/MachRegister.h"
+#include "registers/MachRegisterCache.h"
+ #include "debug_common.h"
+ #include "dyn_regs.h"
+ #include "external/rose/amdgpuInstructionEnum.h"
+@@ -10,17 +11,24 @@
+ #include <unordered_map>
+ 
+ namespace {
+-  std::unordered_map<signed int, std::string> names;
+   const std::string invalid_reg_name{"<INVALID_REG>"};
+ }
+ 
+namespace Dyninst { namespace registers {
+    // These are defined in dyn_regs.C to ensure global constructor initialization ordering
+    extern name_cache names;
+  }
+}
+
+
+ namespace Dyninst {
+ 
+   MachRegister::MachRegister() : reg(0) {}
+ 
+   MachRegister::MachRegister(signed int r) : reg(r) {}
+ 
+-  MachRegister::MachRegister(signed int r, std::string n) : reg(r) { names.emplace(r, std::move(n)); }
+  MachRegister::MachRegister(signed int r, std::string n) : reg(r) {
+    registers::names.emplace(r, std::move(n)); }
+ 
+   unsigned int MachRegister::regClass() const { return reg & 0x00ff0000; }
+ 
+@@ -106,8 +114,8 @@ namespace Dyninst {
+   bool MachRegister::isValid() const { return (reg != InvalidReg.reg); }
+ 
+   std::string const& MachRegister::name() const {
+-    auto iter = names.find(reg);
+-    if(iter != names.end()) {
+    auto iter = registers::names.find(reg);
+    if(iter != registers::names.end()) {
+ 	return iter->second;
+     }
+     common_parsing_printf("No MachRegister found with value %x\n", static_cast<unsigned int>(reg));
+diff --git a/common/src/dyn_regs.C b/common/src/registers/MachRegisterCache.h
+similarity index 80%
+copy from common/src/dyn_regs.C
+copy to common/src/registers/MachRegisterCache.h
+index 3fcd194a71dd..2a74bbde821a 100644
+--- a/common/src/dyn_regs.C
+++ b/common/src/registers/MachRegisterCache.h
+@@ -28,8 +28,19 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-//clang-format: off
+-#define DYN_DEFINE_REGS
+-#include "dyn_regs.h"
+-#undef DYN_DEFINE_REGS
+-//clang-format: on
+#ifndef DYNINST_COMMON_REGISTERS_MACHREGISTERCACHE_H
+#define DYNINST_COMMON_REGISTERS_MACHREGISTERCACHE_H
+
+#include "registers/MachRegister.h"
+
+#include <unordered_map>
+#include <map>
+#include <vector>
+#include <string>
+
+namespace Dyninst { namespace registers {
+    typedef std::unordered_map<signed int, std::string> name_cache;
+}}
+
+
+#endif
--- a/github-pr1880-ish.patch
+++ b/github-pr1880-ish.patch
@ -0,0 +1,36 @@
+diff --git a/common/h/Annotatable.h b/common/h/Annotatable.h
+index 6588e3dd36da..262a193ffbb8 100644
+--- a/common/h/Annotatable.h
+++ b/common/h/Annotatable.h
+@@ -44,6 +44,7 @@
+ #include <assert.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+#include <cstdint>
+ #include "util.h"
+ #include "compiler_annotations.h"
+ 
+diff --git a/instructionAPI/h/ArchSpecificFormatters.h b/instructionAPI/h/ArchSpecificFormatters.h
+index b32d4cc14e03..145c604f9619 100644
+--- a/instructionAPI/h/ArchSpecificFormatters.h
+++ b/instructionAPI/h/ArchSpecificFormatters.h
+@@ -34,6 +34,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
+#include <cstdint>
+ #include "Architecture.h"
+ #include "registers/MachRegister.h"
+ 
+diff --git a/common/src/arch-x86.h b/common/src/arch-x86.h
+index ecdc3dc13..7745306d3 100644
+--- a/common/src/arch-x86.h
+++ b/common/src/arch-x86.h
+@@ -40,6 +40,7 @@
+ #include <set>
+ #include <map>
+ #include <vector>
+#include <cstdint>
+ #include "entryIDs.h"
+ #include "registers/MachRegister.h"
+ #include "common/src/ia32_locations.h"
--- a/github-pr1880.patch
+++ b/github-pr1880.patch
@ -0,0 +1,23 @@
+commit 165402aa1640afb394b11a096b38c6bc3a5bf9d0 (github-fche/patch-1)
+gpg: Signature made Wed 22 Jan 2025 03:35:55 PM EST
+gpg:                using RSA key B5690EEEBB952194
+gpg: Can't check signature: No public key
+Author: Frank Ch. Eigler <fche@elastic.org>
+Date:   Wed Jan 22 15:35:55 2025 -0500
+
+    Update sha1.C: #include <cstdint>
+    
+    Subject header is needed on gcc15 to compile sha1.C, supplying declaration of types like uint32_t.
+
+diff --git a/common/src/sha1.C b/common/src/sha1.C
+index 91e9ad291561..d6e76c5727ac 100644
+--- a/common/src/sha1.C
+++ b/common/src/sha1.C
+@@ -102,6 +102,7 @@ A million repetitions of "a"
+ 
+ #include <stdio.h>
+ #include <string.h>
+#include <cstdint>
+ 
+ #include "dyntypes.h"
+ #include "common/src/sha1.h"
--- a/onetbb.patch
+++ b/onetbb.patch
@ -1,12 +0,0 @@
--- dyninst-12.2.0/cmake/Modules/FindTBB.cmake~	2023-06-27 22:52:25.396598265 +0100
-+++ dyninst-12.2.0/cmake/Modules/FindTBB.cmake	2023-06-27 22:52:27.776601825 +0100
-@@ -154,7 +154,8 @@
- if(TBB_INCLUDE_DIRS)
-     # Starting in 2020.1.1, tbb_stddef.h is replaced by version.h
-     set(_version_files "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h"
-                       "${TBB_INCLUDE_DIRS}/tbb/version.h")
-+                       "${TBB_INCLUDE_DIRS}/tbb/version.h"
-+                       "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h")
-     foreach(f IN ITEMS ${_version_files})
-         if(EXISTS ${f})
-             set(_version_file ${f})
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (dyninst-12.3.0.tar.gz) = 894980c2ce0701c0544877e841e2933a59963eb49ff9b8cde17f67e300d618b77e9fc95f60301a4b8ecaee729010fbab3ec78ef6e2c2fcea118c56d26cb1c3ce
-SHA512 (testsuite-12.3.0.tar.gz) = c8d09395cc37ac1ebbd73049e365b703d1fc904d84b73c7749809d8f9dc36ce0b3b842a2fa9e28ba6ffda4e6d2aeb4ca70c2265d3cacc199db3d10c26a12df33
+SHA512 (dyninst-13.0.0.tar.gz) = efa09018c411f6138e6e2cf6510007b29b00ed9e0d643df702303ee0ccb39b1ea1640bba18555f4cb0a7dbab677362c88ffe0eccace62b57860daee9350a4eee