SOURCES/annobin-nop.patch

@@ -1,11 +0,0 @@
---- annobin.orig/gcc-plugin/annobin.cc	2023-04-28 09:58:05.487156290 +0100
-+++ annobin-12.09/gcc-plugin/annobin.cc	2023-04-28 09:58:36.434248542 +0100
-@@ -2104,7 +2104,7 @@ annobin_emit_start_sym_and_version_note
- 	     Ensure that we do not have empty special text sections so that the
- 	     annobin start symbols are never beyond the end of the sections.  */
- #ifndef ANNOBIN_NOP_INSN
--#define ANNOBIN_NOP_INSN ".nop"
-+#define ANNOBIN_NOP_INSN "nop"
- #endif
- 	  if (* suffix && enable_ppc64_nops)
- 	    annobin_emit_asm (ANNOBIN_NOP_INSN,

SOURCES/annobin-tmp-default-to-using-group-attach.patch

@@ -1,6 +1,6 @@
---- annobin.orig/gcc-plugin/annobin.cc	2024-08-01 15:11:39.354764926 +0100
-+++ annobin-12.65/gcc-plugin/annobin.cc	2024-08-01 15:12:52.266046180 +0100
-@@ -3311,7 +3311,7 @@ plugin_init (struct plugin_name_args *
+--- 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

SOURCES/annobin-tmp-skip-libannocheck-test.patch

@@ -0,0 +1,12 @@
+diff -rup annobin.orig/tests/libannocheck-test annobin-12.14/tests/libannocheck-test
+--- annobin.orig/tests/libannocheck-test	2023-06-23 10:25:50.591952049 +0100
++++ annobin-12.14/tests/libannocheck-test	2023-06-23 10:26:29.757972286 +0100
+@@ -16,6 +16,8 @@ TEST_NAME=libannocheck
+ . $srcdir/common.sh
+ 
+ start_test
++end_test
++exit 0
+ 
+ LIBANNOCHECKDIR=${LIBANNOCHECKDIR:-../../annocheck/.libs}
+ INCDIR=${INCDIR:-$srcdir/../annocheck}

SPECS/annobin.spec

@@ -71,8 +71,8 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources}
 # For the latest sources use:  git clone git://sourceware.org/git/annobin.git
 
 # Insert patches here, if needed.
-Patch01: annobin-nop.patch
-Patch02: annobin-tmp-default-to-using-group-attach.patch
+Patch01: annobin-tmp-default-to-using-group-attach.patch
+Patch02: annobin-tmp-skip-libannocheck-test.patch
 
 # This is where a copy of the sources will be installed.
 %global annobin_source_dir %{?_scl_root}/%{_usrsrc}/annobin
@@ -576,13 +576,10 @@ make check GCC=%gcc_for_annobin
 %changelog
 * Mon Aug 12 2024 Nick Clifton  <nickc@redhat.com> - 12.69-1
 - BuiltBy: Fix seg-fault when comparing language version strings.  (RHEL-53497)
-- Spec File: Use correct names for the symlinks.  (RHEL-53572)
+- Spec File: Use correct names for the symlinks.  (RHEL-53574)
 
 * Fri Aug 09 2024 Nick Clifton  <nickc@redhat.com> - 12.65-3
-- Spec File: Use correct names for the symlinks.  (RHEL-53572)
-
-* Thu Aug 01 2024 Nick Clifton  <nickc@redhat.com> - 12.65-2
-- Spec File: Rebase annobin-tmp-default-to-using-group-attach.patch.
+- Spec File: Use correct names for the symlinks.  (RHEL-53574)
 
 * Tue Jul 30 2024 Nick Clifton  <nickc@redhat.com> - 12.65-1
 - Rebase to 12.65.  (RHEL-51018)
@@ -603,13 +600,10 @@ make check GCC=%gcc_for_annobin
 - Annocheck: Defer passing the branch protection test until all notes have been checked.
 - GCC Plugin: Add extra code for detecting the branch protection setting.  (RHEL-35958)
 
-* Mon Jul 29 2024 Nick Clifton  <nickc@redhat.com> - 12.52-1
-- Rebuild with LLVM 18.  (RHEL-50803)
+* Mon Jul 22 2024 Nick Clifton  <nickc@redhat.com> - 12.52-1
+- Rebuild with LLVM 18.  (RHEL-49954)
 - Rebase to 12.52 in order to bring in fixes for LLVM 18.
 
-* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 12.32-2
-- Rebuilt for MSVSphere 8.9
-
 * Tue Nov 28 2023 Nick Clifton  <nickc@redhat.com> - 12.32-2
 - GCC Plugin: Add %%verify tokens to show that the default plugin names are symbolic links. (RHEL-17505)
 
@@ -632,13 +626,15 @@ make check GCC=%gcc_for_annobin
 * Mon Jul 17 2023 Nick Clifton  <nickc@redhat.com> - 12.20-1
 - Annocheck: Ignore AArch64 $x and $d symbols.  (#2221192)
 - GCC Plugin: Suppress active checks for fortran sources.  Improve scanning of COLLECT_GCC_OPTIONS.
+
+* Mon Jul 03 2023 Nick Clifton  <nickc@redhat.com> - 12.18-1
 - Annocheck: Remove dependency upon libiberty.
 
 * Fri Jun 30 2023 Nick Clifton  <nickc@redhat.com> - 12.17-1
-- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps.  (#2217868)
+- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps.  (#2217864)
 
 * Tue Jun 27 2023 Nick Clifton  <nickc@redhat.com> - 12.16-1
-- Spec File: Rebuild with annobin annotation.  (#2217812)
+- Spec File: Rebuild with annobin annotation.  (#2217814)
 - Annocheck: Ignore weak/undef function symbols when checking to see if a binary contains code.  (#2217840)
 - Annocheck: Add --suppress-version-warnings option.
 
@@ -646,17 +642,16 @@ make check GCC=%gcc_for_annobin
 - Annocheck: Do not ignore separate debuginfo files that do not contain any DWARF.  (#2144553)
 - Annocheck: Ignore /dev/null filename in string notes.
 - Annocheck: More tweaks to glibc detection heuristics.  (#2215968)
-- Annocheck: Check for string notes in separate debug info files.  (#2211694)
-- Annocheck: Add support for el10 and rhel-10 profiles.  (RHEL-526)
 
-* Tue May 09 2023 Nick Clifton  <nickc@redhat.com> - 12.10-2
-- Rebuild against GTS-13 gcc.  (#2196506)
+* Wed Jun 07 2023 Nick Clifton  <nickc@redhat.com> - 12.12-1
+- Rebuild against GTS-13 gcc.  (#2196505)
 
-* Wed May 03 2023 Nick Clifton  <nickc@redhat.com> - 12.10-1
-- Add gating.yaml file.  (#2192491)
+* Tue May 02 2023 Nick Clifton  <nickc@redhat.com> - 12.10-1
+- Add gating.yaml file.  (#2192492)
+- Annocheck: Suppress more tests for Rust binaries.
 
 * Tue Apr 25 2023 Nick Clifton  <nickc@redhat.com> - 12.09-1
-- Rebase to 12.09  (#2188638)
+- Rebase to 12.09  (#2144553)
 
 * Tue Apr 25 2023 Nick Clifton  <nickc@redhat.com> - 12.09-1
 - Annocheck: Fix detection of missing plugin options.  (#2189492)