From: Niels Möller <nisse@lysator.liu.se>
Date: Sun, 8 Jul 2018 07:57:04 +0000 (+0200)
Subject: Fix x86_64 fat setup for nettle_sha1_compress.
X-Git-Tag: nettle_3.5rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc12925fc90179b42b67610317e2a24bce592c72;p=thirdparty%2Fnettle.git

Fix x86_64 fat setup for nettle_sha1_compress.
---

diff --git a/ChangeLog b/ChangeLog
index 1a43b7d5..0312c62e 100644
--- 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 904c0eaa..a95a592c 100644
--- 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 8bbc430f..fddfa965 100644
--- 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 04b522ae..0f2c6ec6 100644
--- 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>)