ruby-changes:72204
From: Jeremiah <ko1@a...>
Date: Fri, 17 Jun 2022 11:58:25 +0900 (JST)
Subject: [ruby-changes:72204] 1dfe007e16 (master): Update configure.ac
https://git.ruby-lang.org/ruby.git/commit/?id=1dfe007e16 From 1dfe007e1696128ff0d3ec78e54d3406073f7727 Mon Sep 17 00:00:00 2001 From: Jeremiah Gowdy <jgowdy@g...> Date: Thu, 16 Jun 2022 10:29:28 -0700 Subject: Update configure.ac Co-authored-by: Nobuyoshi Nakada <nobu@r...> --- configure.ac | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index ef3f521a6d..7bfc2a03ef 100644 --- a/configure.ac +++ b/configure.ac @@ -782,14 +782,11 @@ AS_IF([test "$GCC" = yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L782 # aarch64 branch protection AS_CASE(["$target_cpu"], [aarch64], [ - branch_protection=no - RUBY_TRY_CFLAGS(-mbranch-protection=pac-ret,[branch_protection=yes]) - AS_IF([test "x$branch_protection" = xyes], [ - RUBY_APPEND_OPTION(XCFLAGS, -mbranch-protection=pac-ret) - ], - [ - RUBY_TRY_CFLAGS(-msign-return-address=all, [ - RUBY_APPEND_OPTION(XCFLAGS, -msign-return-address=all) + AS_FOR(option, opt, [-mbranch-protection=pac-ret -msign-return-address=all], [ + RUBY_TRY_CFLAGS(option, [branch_protection=yes], [branch_protection=no]) + AS_IF([test "x$branch_protection" = xyes], [ + RUBY_APPEND_OPTION(XCFLAGS, option) + break ]) ]) ]) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/