[vlc-commits] configure: update AArch64 branch protection

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Nov 29 20:05:42 2019 +0200| [2b24b500a6522a4a4917f3e3908cc98ed3da9285] | committer: Rémi Denis-Courmont

configure: update AArch64 branch protection

Use the new compiler flag syntax. This fixes a warning per build.
This also enables use of BTI in C/C++ code.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b24b500a6522a4a4917f3e3908cc98ed3da9285
---

 configure.ac | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index d8f45de762..1bf3411e46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1694,15 +1694,15 @@ asm volatile("ptrue p0.s" ::: "p0");
 ])
 AM_CONDITIONAL([HAVE_SVE], [test "${ac_cv_arm_sve}" = "yes"])
 
-AC_ARG_ENABLE([pointer-auth],
-  AS_HELP_STRING([--disable-pointer-auth],
-    [disable ARMv8.3 Pointer Authentication (default auto)]),, [
-  AS_IF([test "${host_cpu}" = "aarch64"], [enable_ptrauth="yes"] ,[enable_ptrauth="no"])
-])
-AS_IF([test "${enable_ptrauth}" != "no"], [
-  AX_CHECK_COMPILE_FLAG([-msign-return-address=non-leaf], [
-    AX_APPEND_FLAG([-msign-return-address=non-leaf], [CFLAGS])
-    AX_APPEND_FLAG([-msign-return-address=non-leaf], [CXXFLAGS])
+AC_ARG_ENABLE([branch-protection],
+  AS_HELP_STRING([--disable-branch-protection],
+    [disable AArch64 branch protection (default auto)]),, [
+  AS_IF([test "${host_cpu}" = "aarch64"], [enable_brprot="yes"] ,[enable_brprot="no"])
+])
+AS_IF([test "${enable_brprot}" != "no"], [
+  AX_CHECK_COMPILE_FLAG([-mbranch-protection=standard], [
+    AX_APPEND_FLAG([-mbranch-protection=standard], [CFLAGS])
+    AX_APPEND_FLAG([-mbranch-protection=standard], [CXXFLAGS])
   ])
 ])