From a5318897a7b206489f51bf68a8b60f60c3aabb3d Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Wed, 22 Jul 2026 09:41:49 +0100
Subject: [PATCH] Update RHEL-8 specific patches

---
 annobin-annocheck-no-debuginfod.patch | 15 +++++++--------
 annobin-nop.patch                     | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/annobin-annocheck-no-debuginfod.patch b/annobin-annocheck-no-debuginfod.patch
index 4483df3..a1d8b0c 100644
--- a/annobin-annocheck-no-debuginfod.patch
+++ b/annobin-annocheck-no-debuginfod.patch
@@ -1,12 +1,11 @@
-diff -rup annobin.orig/annocheck/annocheck.c annobin-11.12/annocheck/annocheck.c
---- annobin.orig/annocheck/annocheck.c	2023-03-03 16:09:24.659603476 +0000
-+++ annobin-11.12/annocheck/annocheck.c	2023-03-03 16:09:57.249530355 +0000
-@@ -20,6 +20,8 @@
- #include <sys/stat.h>
- #include <elfutils/libdwelf.h>
+--- annobin-13.25,orig/annocheck/annocheck.c	2026-07-22 09:39:03.065591990 +0100
++++ annobin-13.25/annocheck/annocheck.c	2026-07-22 09:40:57.431346957 +0100
+@@ -22,6 +22,8 @@
  #include <elfutils/libdwfl.h>
-+#undef  HAVE_LIBDEBUGINFOD 
-+#define HAVE_LIBDEBUGINFOD 0
  #ifndef LIBANNOCHECK
  #include <rpm/rpmlib.h>
++#undef  HAVE_LIBDEBUGINFOD 
++#define HAVE_LIBDEBUGINFOD 0
  #if HAVE_LIBDEBUGINFOD
+ #include <elfutils/debuginfod.h>
+ #endif
diff --git a/annobin-nop.patch b/annobin-nop.patch
index d3260a2..e914319 100644
--- a/annobin-nop.patch
+++ b/annobin-nop.patch
@@ -1,12 +1,11 @@
-diff -rup annobin.orig/gcc-plugin/annobin.cc annobin-10.64/gcc-plugin/annobin.cc
---- annobin.orig/gcc-plugin/annobin.cc	2022-04-06 12:55:02.350469755 +0100
-+++ annobin-10.64/gcc-plugin/annobin.cc	2022-04-06 12:55:28.503296390 +0100
-@@ -1851,7 +1851,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.  */
+--- annobin-13.25,orig/gcc-plugin/annobin.cc	2026-07-22 09:39:03.054591918 +0100
++++ annobin-13.25/gcc-plugin/annobin.cc	2026-07-22 09:39:38.086821040 +0100
+@@ -2192,7 +2192,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,
+ 	  if (* suffix && enable_ppc64_nops)
+ 	    annobin_emit_asm (ANNOBIN_NOP_INSN,