Fix x86_64 fat setup for nettle_sha1_compress.

diff --git a/ChangeLog b/ChangeLog
index 1a43b7d558f87765dc1d4f6472ce49639447c12f..0312c62e6a6b3399bf63140aca572cf32d3f8827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-08  Niels Möller  <nisse@lysator.liu.se>
+
+       * fat-x86_64.c (fat_init): Fix setup for nettle_sha1_compress.
+       * x86_64/fat/sha1-compress.asm: Add leading underscore to symbol name.
+       * x86_64/fat/sha1-compress-2.asm: Likewise.
+
 2018-07-07  Niels Möller  <nisse@lysator.liu.se>
 
        From Nikos Mavrogiannopoulos.

diff --git a/fat-x86_64.c b/fat-x86_64.c
index 904c0eaa85a0ac12537124c414e9e263f8e0a05a..a95a592c1ad8918f0e1ae1d49a7afa844f09e56e 100644 (file)
--- a/fat-x86_64.c
+++ b/fat-x86_64.c
@@ -182,7 +182,7 @@ fat_init (void)
     {
       if (verbose)
        fprintf (stderr, "libnettle: not using sha_ni instructions.\n");
-      _nettle_sha1_compress_vec = _nettle_sha1_compress_x86_64;
+      nettle_sha1_compress_vec = _nettle_sha1_compress_x86_64;
       _nettle_sha256_compress_vec = _nettle_sha256_compress_x86_64;
     }
   if (features.vendor == X86_INTEL)

diff --git a/x86_64/fat/sha1-compress-2.asm b/x86_64/fat/sha1-compress-2.asm
index 8bbc430f8adc6d0c8dd1f8c7a89ec879867534c8..fddfa9654cd1edb1c4f8e87207a8f96f3dce6631 100644 (file)
--- a/x86_64/fat/sha1-compress-2.asm
+++ b/x86_64/fat/sha1-compress-2.asm
@@ -30,5 +30,5 @@ ifelse(<
    not, see http://www.gnu.org/licenses/.
 >)
 
-define(<fat_transform>, <$1_sha_ni>)
+define(<fat_transform>, <_$1_sha_ni>)
 include_src(<x86_64/sha_ni/sha1-compress.asm>)

diff --git a/x86_64/fat/sha1-compress.asm b/x86_64/fat/sha1-compress.asm
index 04b522ae5456d24e153b6411bec4e1ff326ccdf4..0f2c6ec6c1ef7670664698ea24dcee0cef466a5c 100644 (file)
--- a/x86_64/fat/sha1-compress.asm
+++ b/x86_64/fat/sha1-compress.asm
@@ -30,5 +30,5 @@ ifelse(<
    not, see http://www.gnu.org/licenses/.
 >)
 
-define(<fat_transform>, <$1_x86_64>)
+define(<fat_transform>, <_$1_x86_64>)
 include_src(<x86_64/sha1-compress.asm>)