From 5d4d27dda9bca3000ee7eae40aa76f0b3fc6449e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 17 Aug 2021 15:03:42 +0100
Subject: [PATCH] Annocheck: Conditionalize detection of AArch64's PAC+BTI
 protection. Annocheck: Add linker generated function for s390x exceptions. 
 (#1981410)

---
 annobin.spec | 13 ++++++++++++-
 sources      |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index c8e0b75..5851b64 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 9.88
+Version: 9.89
 Release: 1%{?dist}
 License: GPLv3+
 # Maintainer: nickc@redhat.com
@@ -332,8 +332,15 @@ CONFIG_ARGS="$CONFIG_ARGS --with-llvm"
 CONFIG_ARGS="$CONFIG_ARGS --without-test"
 %endif
 
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+
 %if %{without annocheck}
 CONFIG_ARGS="$CONFIG_ARGS --without-annocheck"
+%else
+# Fedora supports AArch64's -mbranch-protection=bti, RHEL does not.
+%if 0%{?fedora} != 0
+export CFLAGS="$CFLAGS -DAARCh64_BRANCH_PROTECTION_SUPPORTED=1"
+%endif
 %endif
 
 %set_build_flags
@@ -451,6 +458,10 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Tue Aug 17 2021 Nick Clifton  <nickc@redhat.com> - 9.89-1
+- Annocheck: Conditionalize detection of AArch64's PAC+BTI protection.
+- Annocheck: Add linker generated function for s390x exceptions.  (#1981410)
+
 * Tue Aug 17 2021 Nick Clifton  <nickc@redhat.com> - 9.88-1
 - Annocheck: Generate MAYB results for gaps in notes covering the .text section.  (#1991943)
 - Annocheck: Close DWARF file descriptors once the debug info is no longer needed.  (#1981410)
diff --git a/sources b/sources
index 5b0b9e5..89a184a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-9.88.tar.xz) = 7ac19047cb617bf164f55e13fe0ce7ef2f72b56583bbd383d1632af47732a9e55409c456b2b717905179a6153bad40e15660dd5b8444acd819d273a21fe2e1e7
+SHA512 (annobin-9.89.tar.xz) = 90151e93b17ed1a95317d6d1006f41c3ce8c9d530436413b45e5c862fbc02a72ff299874f2a231b354d67b7e65d294024237d4f87c9752847d8b9173042b9841