.annobin.metadata

@@ -1 +1 @@
-54956e8dfce9d977814449907acaeb26c50dd1cc SOURCES/annobin-11.13.tar.xz
+07f5617e6d0f8cb6c3efd66004e38f9081e6b8f5 SOURCES/annobin-12.31.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/annobin-11.13.tar.xz
+SOURCES/annobin-12.31.tar.xz

SOURCES/annobin-annocheck-no-debuginfod.patch

@@ -1,12 +0,0 @@
-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>
- #include <elfutils/libdwfl.h>
-+#undef  HAVE_LIBDEBUGINFOD 
-+#define HAVE_LIBDEBUGINFOD 0
- #ifndef LIBANNOCHECK
- #include <rpm/rpmlib.h>
- #if HAVE_LIBDEBUGINFOD

SOURCES/annobin-nop.patch

@@ -1,12 +0,0 @@
-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.  */
- #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-strings-no-attach.patch

@@ -0,0 +1,36 @@
+--- annobin.orig/gcc-plugin/annobin.cc	2024-01-17 14:00:26.889983192 +0000
++++ annobin-12.31/gcc-plugin/annobin.cc	2024-01-17 14:01:27.517055850 +0000
+@@ -3261,18 +3261,24 @@ plugin_init (struct plugin_name_args *
+   target_start_sym_bias = annobin_target_start_symbol_bias ();
+   if (annobin_attach_type == not_set)
+     {
+-      /* Choose a default attachment type.  Link ordering is preferable
+-	 as it is more resistant to changes in compiler section building.
+-	 But it can only be used if the target assembler supports link_order sections
+-	 and the target linker is sufficiently new that it implements them correctly.
+-	 For now we use a test of the GCC version as an approximation to the binutils
+-	 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 (annobin_note_format == string)
++	/* String format notes do not need section groups.  */
++	annobin_attach_type = none;
++      else
++	{
++	  /* Choose a default attachment type.  Link ordering is preferable
++	     as it is more resistant to changes in compiler section building.
++	     But it can only be used if the target assembler supports link_order sections
++	     and the target linker is sufficiently new that it implements them correctly.
++	     For now we use a test of the GCC version as an approximation to the binutils
++	     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 = link_order;
+ #else
+-      annobin_attach_type = group;
++	  annobin_attach_type = group;
+ #endif
++	}
+     }
+   annobin_inform (INFORM_VERBOSE, "Attach mode: %s", attach_mode_name (annobin_attach_type));
+