summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2018-02-10 21:16:06 +0100
committerNiels Möller <nisse@lysator.liu.se>2018-02-10 21:16:06 +0100
commit74c9af26e0492c22139e6f3fd0abce79df4b04cc (patch)
tree2a9a2ba0f2064700e549cdf68a671cf1dfd335b6
parente11319dd814ac01ead6fdf3bf911fd7daf3b6b03 (diff)
downloadnettle-x86_64-sha_ni-sha1.tar.gz
New configure option --enable-x86-sha-ni.x86_64-sha_ni-sha1
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac13
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a588156d..e4f93997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-10 Niels Möller <nisse@lysator.liu.se>
+
+ * configure.ac: New configure option --enable-x86-sha-ni.
+
2018-02-07 Niels Möller <nisse@lysator.liu.se>
* x86_64/fat/sha1-compress.asm: New file.
diff --git a/configure.ac b/configure.ac
index 41bf0998..0a35d3dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,10 @@ AC_ARG_ENABLE(x86-aesni,
AC_HELP_STRING([--enable-x86-aesni], [Enable x86_64 aes instructions. (default=no)]),,
[enable_x86_aesni=no])
+AC_ARG_ENABLE(x86-sha-ni,
+ AC_HELP_STRING([--enable-x86-sha-ni], [Enable x86_64 sha_ni instructions. (default=no)]),,
+ [enable_x86_sha_ni=no])
+
AC_ARG_ENABLE(mini-gmp,
AC_HELP_STRING([--enable-mini-gmp], [Enable mini-gmp, used instead of libgmp.]),,
[enable_mini_gmp=no])
@@ -405,8 +409,13 @@ if test "x$enable_assembler" = xyes ; then
if test "x$enable_fat" = xyes ; then
asm_path="x86_64/fat $asm_path"
OPT_NETTLE_SOURCES="fat-x86_64.c $OPT_NETTLE_SOURCES"
- elif test "x$enable_x86_aesni" = xyes ; then
- asm_path="x86_64/aesni $asm_path"
+ else
+ if test "x$enable_x86_aesni" = xyes ; then
+ asm_path="x86_64/aesni $asm_path"
+ fi
+ if test "x$enable_x86_sha_ni" = xyes ; then
+ asm_path="x86_64/sha_ni $asm_path"
+ fi
fi
else
asm_path=x86