summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2020-02-25 18:37:58 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2020-02-25 18:37:58 +0000
commitad5b1569c6a5e143bee49c050645c32d6acb7708 (patch)
treeb074cbb3cb2389f1defeb278f3f42da5e9dd9f7e
parent0f48ce3d377e4975324216543d9a2d352ec825c3 (diff)
parent044652add76d1cf97730053b07fd021cc1dcc0ab (diff)
downloadgnutls-ad5b1569c6a5e143bee49c050645c32d6acb7708.tar.gz
Merge branch 'macosx-aarch64-accel' into 'master'
Adding missing macosx directory for aarch64 acceleration See merge request gnutls/gnutls!1198
-rw-r--r--lib/accelerated/aarch64/Makefile.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/accelerated/aarch64/Makefile.am b/lib/accelerated/aarch64/Makefile.am
index 90443bb36b..0c245aca40 100644
--- a/lib/accelerated/aarch64/Makefile.am
+++ b/lib/accelerated/aarch64/Makefile.am
@@ -44,11 +44,9 @@ libaarch64_la_SOURCES = aarch64-common.c aarch64-common.h sha-aarch64.h sha-aarc
hmac-sha-aarch64.c aes-cbc-aarch64.c aes-gcm-aarch64.c aes-aarch64.h aes-ccm-aarch64.c
if MACOSX
-ADIR=macosx
+libaarch64_la_SOURCES += macosx/sha1-armv8.s macosx/sha512-armv8.s macosx/sha256-armv8.s \
+ macosx/aes-aarch64.s macosx/ghash-aarch64.s
else
-ADIR=elf
+libaarch64_la_SOURCES += elf/sha1-armv8.s elf/sha512-armv8.s elf/sha256-armv8.s \
+ elf/aes-aarch64.s elf/ghash-aarch64.s
endif
-
-libaarch64_la_SOURCES += $(ADIR)/sha1-armv8.s $(ADIR)/sha512-armv8.s $(ADIR)/sha256-armv8.s \
- $(ADIR)/aes-aarch64.s $(ADIR)/ghash-aarch64.s
-