diff --git a/ChangeLog b/ChangeLog index a588156df224810f3624a688ad94ab19a7766044..e4f9399719406d8ecbe8a4873f973c46e2313d95 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 41bf0998b7e52e8dd8d4ec433bf2652929b457b2..0a35d3dd6fa3f6664331a4773a4087dcaf640517 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