From 61ef5c96bfedf5c7b6007430494b8f1f9694f482 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 09 2022 12:11:08 +0000
Subject: import annobin-10.64-1.el8


---

diff --git a/.annobin.metadata b/.annobin.metadata
index 1e70d14..e525e4a 100644
--- a/.annobin.metadata
+++ b/.annobin.metadata
@@ -1 +1 @@
-4984e9dfea53ef0c5519851d07fe830203a72e0a SOURCES/annobin-10.58.tar.xz
+925ff1fa94597d5fc707d5663d325cbc15ab4d37 SOURCES/annobin-10.64.tar.xz
diff --git a/.gitignore b/.gitignore
index 02a886b..ce66a09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/annobin-10.58.tar.xz
+SOURCES/annobin-10.64.tar.xz
diff --git a/SOURCES/annobin-nop.patch b/SOURCES/annobin-nop.patch
index 0478c64..d3260a2 100644
--- a/SOURCES/annobin-nop.patch
+++ b/SOURCES/annobin-nop.patch
@@ -1,12 +1,12 @@
-diff -rup annobin.orig/gcc-plugin/annobin.cc annobin-9.72/gcc-plugin/annobin.cc
---- annobin.orig/gcc-plugin/annobin.cc	2021-05-17 17:25:32.693441649 +0100
-+++ annobin-9.72/gcc-plugin/annobin.cc	2021-05-17 17:25:50.176331776 +0100
-@@ -1722,7 +1722,7 @@ annobin_emit_start_sym_and_version_note
+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 (".nop", "Inserted by the annobin plugin.  Disable with -fplugin-arg-annobin-no-ppc64-nops");
-+	annobin_emit_asm ("nop", "Inserted by the annobin plugin.  Disable with -fplugin-arg-annobin-no-ppc64-nops");
-     }
-   else
-     fprintf (asm_out_file, "\t.equiv %s%s, .\n", annobin_output_filesym, suffix);
+ 	annobin_emit_asm (ANNOBIN_NOP_INSN,
diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec
index 75c26f1..09ee6d4 100644
--- a/SPECS/annobin.spec
+++ b/SPECS/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 10.58
+Version: 10.64
 Release: 1%{?dist}
 License: GPLv3+
 # Maintainer: nickc@redhat.com
@@ -235,7 +235,7 @@ CONFIG_ARGS="$CONFIG_ARGS --with-llvm"
 %endif
 
 %if %{without tests}
-CONFIG_ARGS="$CONFIG_ARGS --without-test"
+CONFIG_ARGS="$CONFIG_ARGS --without-tests"
 %endif
 
 %set_build_flags
@@ -369,6 +369,15 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Apr 06 2022 Nick Clifton  <nickc@redhat.com> - 10.64-1
+- Annocheck: Add more special cases for AArch64 glibc on RHEL-8.  (#2072082)
+- llvm-plugin: Fix a thinko in the sources.
+- gcc-plugin: Add remap of OPT_Wall.
+- configure: Fix typo in top level configure.ac.
+- Add support for building using meson+ninja.
+- Annocheck: Fix test for AArch64 property notes.  (#2068657)
+- gcc-plugin: Do not issue warning messages for autoconf generated source files.  (#2009958)
+
 * Thu Mar 24 2022 Nick Clifton  <nickc@redhat.com> - 10.58-1
 - Rebase to 10.58.  (#2067148)
 - gcc-plugin: Do not issue warning messages for autoconf generated source files.  (#2009958)