Update RHEL-8 specific patches

This commit is contained in:
Nick Clifton 2026-07-22 09:41:49 +01:00
parent 3d6ba27cb7
commit a5318897a7
2 changed files with 14 additions and 16 deletions

View File

@ -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

View File

@ -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,