[src/trunk]: src/sys/arch/aarch64/conf In gcc10, -msign-return-address is no ...

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3696bac172a0
branches:  trunk
changeset: 983491:3696bac172a0
user:      ryo <ryo%NetBSD.org@localhost>
date:      Thu May 27 06:19:38 2021 +0000

description:
In gcc10, -msign-return-address is no longer supported.
Instead, (LLVM-compatible) -mbranch-protection option is supported.

diffstat:

 sys/arch/aarch64/conf/Makefile.aarch64 |  13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diffs (34 lines):

diff -r 3cb25b6e9671 -r 3696bac172a0 sys/arch/aarch64/conf/Makefile.aarch64
--- a/sys/arch/aarch64/conf/Makefile.aarch64    Thu May 27 06:11:34 2021 +0000
+++ b/sys/arch/aarch64/conf/Makefile.aarch64    Thu May 27 06:19:38 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.aarch64,v 1.22 2021/02/10 08:25:01 ryo Exp $
+#      $NetBSD: Makefile.aarch64,v 1.23 2021/05/27 06:19:38 ryo Exp $
 
 # Makefile for NetBSD
 #
@@ -44,7 +44,6 @@
 CFLAGS+=       -fno-optimize-sibling-calls
 .endif
 
-.if ${HAVE_LLVM:Uno} == "yes"
 .if ${ARMV83_PAC:U0} > 0 && ${ARMV85_BTI:U0} > 0
 CFLAGS+=       -mbranch-protection=pac-ret+bti
 .else
@@ -55,16 +54,6 @@
 CFLAGS+=       -mbranch-protection=bti
 .endif
 .endif
-.endif
-
-.if ${HAVE_GCC:U0} > 0
-.if ${ARMV83_PAC:U0} > 0
-CFLAGS+=       -msign-return-address=all
-.endif
-.if ${ARMV85_BTI:U0} > 0
-# XXX: notyet for gcc
-.endif
-.endif
 
 .if ${KASAN:U0} > 0 && ${HAVE_GCC:U0} > 0
 KASANFLAGS=    -fsanitize=kernel-address \