From 85e48722a8f0b263943cc44d579f372a1e4cbc0d Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 8 Apr 2021 11:13:40 +0200
Subject: [PATCH] Enable crypto extensions on ARMv8

---
 configure.ac                  | 2 +-
 dist-build/android-armv8-a.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c34474d1..2ed09129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,7 +393,7 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
           AC_MSG_CHECKING(for ARM crypto instructions set with -march=armv8-a+crypto)
           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]], [[ vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(__ARM_FEATURE_CRYPTO)) ]])],
             [
-              AC_MSG_RESULT(yes)
+              AC_MSG_RESULT(yes - with addition of -march=armv8-a+crypto)
               have_armcrypto=yes
               CFLAGS_ARMCRYPTO="-march=armv8-a+crypto"
             ],
diff --git a/dist-build/android-armv8-a.sh b/dist-build/android-armv8-a.sh
index 1bf13ae8..16299828 100755
--- a/dist-build/android-armv8-a.sh
+++ b/dist-build/android-armv8-a.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-export TARGET_ARCH=armv8-a
+export TARGET_ARCH=armv8-a+crypto
 export CFLAGS="-Os -march=${TARGET_ARCH}"
 NDK_PLATFORM=android-21 ARCH=arm64 HOST_COMPILER=aarch64-linux-android "$(dirname "$0")/android-build.sh"