From 2c1a8d319ce3d523dd57e490f734f79889d0bf37 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Wed, 20 Mar 2024 10:33:47 +0000
Subject: [PATCH] Spec File: Enable AArch64 BTI testing for all binaries.
 Resolves: RHEL-526

---
 annobin.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index 3a6822a..f3d05d3 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -2,7 +2,7 @@
 Name:    annobin
 Summary: Annotate and examine compiled binary files
 Version: 12.44
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later
 URL: https://sourceware.org/annobin/
 # Maintainer: nickc@redhat.com
@@ -363,11 +363,8 @@ CONFIG_ARGS="$CONFIG_ARGS --without-tests"
 %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
 
@@ -529,6 +526,9 @@ make check
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Mar 20 2024 Nick Clifron  <nickc@redhat.com> - 12.44-2
+- Spec File: Enable AArch64 BTI testing for all binaries.  (RHEL-526)
+
 * Mon Mar 18 2024 Nick Clifron  <nickc@redhat.com> - 12.44-1
 - Clang Plugin: Fix building with Clang 18.  (RHEL-27727)
 - Configure: Remove check for FrontendPluginRegistry.h header as it is stored in a non-standard location on Debian systems.