From 3124e0156374453c58aaa73c068b894d9698dcb4 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 19 Mar 2018 10:14:51 +0000
Subject: [PATCH] Sync with rawhide, since that seems to fix #1557511. Bias
 file start symbols by 2 in order to avoid them confused with function
 symbols.  (#1554332) Version jump is to sync the version number with the
 annobin plugins internal version number.

---
 .gitignore   |  1 +
 annobin.spec | 10 +++++++---
 sources      |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95a22a0..eafae9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /annobin-3.2.tar.xz
 /annobin-3.3.tar.xz
 /annobin-3.4.tar.xz
+/annobin-5.0.tar.xz
diff --git a/annobin.spec b/annobin.spec
index fdc2f06..0294f94 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -11,7 +11,7 @@
 
 Name:    annobin
 Summary: Binary annotation plugin for GCC
-Version: 3.4
+Version: 5.0
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -55,7 +55,7 @@ of the resulting files.
 %endif
 #---------------------------------------------------------------------------------
 
-%global ANNOBIN_PLUGIN_DIR %(g++ -print-file-name=plugin)
+%global ANNOBIN_PLUGIN_DIR %(gcc --print-file-name=plugin)
 
 %prep
 %autosetup -p1
@@ -104,8 +104,12 @@ exit 0
 %doc %{_infodir}/annobin.info.gz
 
 #---------------------------------------------------------------------------------
-
 %changelog
+* Mon Mar 19 2018 Nick Clifton <nickc@redhat.com> - 5.0-1
+- Sync with rawhide, since that seems to fix #1557511.
+- Bias file start symbols by 2 in order to avoid them confused with function symbols.  (#1554332)
+- Version jump is to sync the version number with the annobin plugins internal version number.
+
 * Fri Feb 09 2018 Nick Clifton <nickc@redhat.com> - 3.4-1
 - Change type and size of symbols to STT_NOTYPE/0 so that they do not confuse GDB.  (#1539664)
 - Add run-on-binaries-in.sh script to allow the other scripts to be run over a repository.
diff --git a/sources b/sources
index c3898d5..90275d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-3.4.tar.xz) = 387ab363b463d182c4d775ed516eeaea898640b5117937db16a100034ff83867c7012e0045dda5eb272d6c09a3d6003683d0918524907cbbb69500c19fd478b4
+SHA512 (annobin-5.0.tar.xz) = 4b21b2bad73584374915756262726ccca62724e7f381ea962f591b3a2eead779c52d9334e433858dc310c86ae42a9126ec8a0f2cfdc9c76aebc973b433c92417