c649282
From db4ba95bf12f9303e38a9a78979cd363cb9a19fb Mon Sep 17 00:00:00 2001
308b2c0
From: Jarek Prokop <jprokop@redhat.com>
308b2c0
Date: Fri, 12 Jan 2024 18:33:34 +0100
c649282
Subject: [PATCH] aarch64: Prepend -mbranch-protection=standard option when
308b2c0
 checking branch protection.
308b2c0
308b2c0
Related Upstream issue: https://bugs.ruby-lang.org/issues/20154
308b2c0
---
308b2c0
 configure.ac | 2 +-
308b2c0
 1 file changed, 1 insertion(+), 1 deletion(-)
308b2c0
308b2c0
diff --git a/configure.ac b/configure.ac
308b2c0
index 18b4247991..5ea8ada8f7 100644
308b2c0
--- a/configure.ac
308b2c0
+++ b/configure.ac
308b2c0
@@ -827,7 +827,7 @@ AS_IF([test "$GCC" = yes], [
308b2c0
 
308b2c0
     # aarch64 branch protection
308b2c0
     AS_CASE(["$target_cpu"], [aarch64], [
308b2c0
-	AS_FOR(option, opt, [-mbranch-protection=pac-ret -msign-return-address=all], [
308b2c0
+	AS_FOR(option, opt, [-mbranch-protection=standard -mbranch-protection=pac-ret -msign-return-address=all], [
308b2c0
             RUBY_TRY_CFLAGS(option, [branch_protection=yes], [branch_protection=no])
308b2c0
             AS_IF([test "x$branch_protection" = xyes], [
308b2c0
                 # C compiler and assembler must be consistent for -mbranch-protection