aarch64: Rename arm64/v8/ --> arm64/crypto/

diff --git a/ChangeLog b/ChangeLog
index fba49192f1eb3ed44a2b6586d54b44c6cca0382f..d9de955766885502cd990c23af73c51398e84d7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-03  Niels Möller  <nisse@lysator.liu.se>
+
+       * arm64/crypto/gcm-hash.asm: Renamed directory, moved file,...
+       * arm64/v8/gcm-hash.asm: ... old name.
+
 2021-02-02  Niels Möller  <nisse@lysator.liu.se>
 
        * arm64/v8/gcm-hash.asm: Add ".arch armv8-a+crypto" directive.

diff --git a/Makefile.in b/Makefile.in
index 2697ad6d06697cb02e487e39e8d8d2c8145e7695..e3ac82e64879bb7b9c07aaaa45958d335a8e0096 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -616,7 +616,7 @@ distdir: $(DISTFILES)
        set -e; for d in sparc32 sparc64 x86 \
                x86_64 x86_64/aesni x86_64/sha_ni x86_64/fat \
                arm arm/neon arm/v6 arm/fat \
-               arm64 arm64/v8 \
+               arm64 arm64/crypto \
                powerpc64 powerpc64/p7 powerpc64/p8 powerpc64/fat ; do \
          mkdir "$(distdir)/$$d" ; \
          find "$(srcdir)/$$d" -maxdepth 1 '(' -name '*.asm' -o -name '*.m4' -o -name README ')' \

diff --git a/arm64/v8/gcm-hash.asm b/arm64/crypto/gcm-hash.asm
similarity index 100%
rename from arm64/v8/gcm-hash.asm
rename to arm64/crypto/gcm-hash.asm

diff --git a/configure.ac b/configure.ac
index 33ece246667ad07dae28e8b1021c733347213dbe..7a81598656f94d87aab1664a19d27984294d5ecc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -81,9 +81,9 @@ AC_ARG_ENABLE(arm-neon,
   AC_HELP_STRING([--enable-arm-neon], [Enable ARM Neon assembly. (default=auto)]),,
   [enable_arm_neon=auto])
 
-AC_ARG_ENABLE(armv8-a-crypto,
-  AC_HELP_STRING([--enable-armv8-a-crypto], [Enable Armv8-A Crypto extension. (default=no)]),,
-  [enable_armv8_a_crypto=no])
+AC_ARG_ENABLE(arm64-crypto,
+  AC_HELP_STRING([--enable-arm64-crypto], [Enable Arm64 crypto extension. (default=no)]),,
+  [enable_arm64_crypto=no])
 
 AC_ARG_ENABLE(x86-aesni,
   AC_HELP_STRING([--enable-x86-aesni], [Enable x86_64 aes instructions. (default=no)]),,
@@ -477,8 +477,8 @@ if test "x$enable_assembler" = xyes ; then
     aarch64*)
       if test "$ABI" = 64 ; then
        asm_path=arm64
-       if test "$enable_armv8_a_crypto" = yes ; then
-          asm_path="arm64/v8 $asm_path"
+       if test "$enable_arm64_crypto" = yes ; then
+          asm_path="arm64/crypto $asm_path"
         fi
       else
        # As far as I understand, Neon instructions are unlikely to be