summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2021-02-03 16:36:33 +0100
committerNiels Möller <nisse@lysator.liu.se>2021-02-03 16:36:33 +0100
commita471ae85f768b2b496b2e2e4272ba76fa74d5785 (patch)
tree9b2501f484fe527d7efbae36eaf3e21573be6e58
parent0489825ec047835a2ad1e2d3c9ba3570783f5739 (diff)
downloadnettle-arm64.tar.gz
aarch64: Rename arm64/v8/ --> arm64/crypto/arm64
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
-rw-r--r--arm64/crypto/gcm-hash.asm (renamed from arm64/v8/gcm-hash.asm)0
-rw-r--r--configure.ac10
4 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fba49192..d9de9557 100644
--- 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 2697ad6d..e3ac82e6 100644
--- 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
index b77b08d6..b77b08d6 100644
--- a/arm64/v8/gcm-hash.asm
+++ b/arm64/crypto/gcm-hash.asm
diff --git a/configure.ac b/configure.ac
index 33ece246..7a815986 100644
--- 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