From d3b808d734541ca701f1430b9b73aa0ed4e418ce Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 22 Jul 2024 14:38:09 +0100 Subject: [PATCH] Rebuild with LLVM 18. Rebase to 12.52 in order to bring in fixes for LLVM 18. Resolves: RHEL-49954 --- .gitignore | 1 + annobin-tmp-default-to-using-group-attach.patch | 16 ++++++++-------- annobin.spec | 10 +++++++--- sources | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e7d1dab..9476db4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /annobin-12.18.tar.xz /annobin-12.20.tar.xz /annobin-12.32.tar.xz +/annobin-12.52.tar.xz diff --git a/annobin-tmp-default-to-using-group-attach.patch b/annobin-tmp-default-to-using-group-attach.patch index cdab789..459f1c6 100644 --- a/annobin-tmp-default-to-using-group-attach.patch +++ b/annobin-tmp-default-to-using-group-attach.patch @@ -1,11 +1,11 @@ ---- annobin.orig/gcc-plugin/annobin.cc 2023-06-23 09:52:10.176119281 +0100 -+++ annobin-12.14/gcc-plugin/annobin.cc 2023-06-23 10:06:28.621554381 +0100 -@@ -3155,7 +3155,7 @@ plugin_init (struct plugin_name_args * - versions that are needed. (Note - 2.35.2, as used by RHEL-9, is insufficient). - See BZ 2016458 for an example of where this solution is needed. */ +--- annobin.orig/gcc-plugin/annobin.cc 2024-07-22 14:02:09.227059334 +0100 ++++ annobin-12.52/gcc-plugin/annobin.cc 2024-07-22 14:03:38.516398800 +0100 +@@ -3300,7 +3300,7 @@ plugin_init (struct plugin_name_args * + versions that are needed. (Note - 2.35.2, as used by RHEL-9, is insufficient). + See BZ 2016458 for an example of where this solution is needed. */ #if GCCPLUGIN_VERSION_MAJOR >= 12 -- annobin_attach_type = link_order; -+ annobin_attach_type = group; +- annobin_attach_type = link_order; ++ annobin_attach_type = group; #else - annobin_attach_type = group; + annobin_attach_type = group; #endif diff --git a/annobin.spec b/annobin.spec index edfd4ca..47f77f6 100644 --- a/annobin.spec +++ b/annobin.spec @@ -8,8 +8,8 @@ BuildRequires: scl-utils-build Name: %{?scl_prefix}annobin Summary: Annotate and examine compiled binary files -Version: 12.32 -Release: 2%{?dist} +Version: 12.52 +Release: 1%{?dist} License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -472,7 +472,7 @@ mv %{buildroot}/%{llvm_plugin_dir}/annobin-for-clang.so %{buildroot}/%{clang_plu # Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes # without the NVR being altered. See BZ #2030671 for more discussion on this. mkdir -p %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR} -cat `gcc --print-file-name=rpmver` > %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver} +cat `%gcc_for_annobin --print-file-name=rpmver` > %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver} # Also install a copy of the sources into the build tree. mkdir -p %{buildroot}%{annobin_source_dir} @@ -557,6 +557,10 @@ make check GCC=%gcc_for_annobin #--------------------------------------------------------------------------------- %changelog +* Mon Jul 22 2024 Nick Clifton - 12.52-1 +- Rebuild with LLVM 18. (RHEL-49954) +- Rebase to 12.52 in order to bring in fixes for LLVM 18. + * Tue Nov 28 2023 Nick Clifton - 12.32-2 - GCC Plugin: Add %%verify tokens to show that the default plugin names are symbolic links. (RHEL-17505) diff --git a/sources b/sources index f3ff8e9..9856bd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-12.32.tar.xz) = 10ab73bc48d0a95102292d90d28c87440b969055ab07e964020703276b6c5db35b8693e828fb0063e1d6e5efb025c8ffe3fafb2dd40377c25767b09a986bc02b +SHA512 (annobin-12.52.tar.xz) = d5ef0bf20fb9db1fb3c86000fbd2f130f30fabc45e6ea183438f272f57119f0c34267ce47fe7ba6a9c227657c4aeecb9c71b4390cc808e8d1ddd9fd85ce02c8a