From: Niels Möller <nisse@lysator.liu.se>
Date: Thu, 9 Sep 2021 19:29:07 +0000 (+0200)
Subject: Fix fat builds for x86_64 windows
X-Git-Tag: nettle_3.8_release_20220602~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5b0b9cb4f70fb9ae86512d4fbc4ba8536d1f493;p=thirdparty%2Fnettle.git

Fix fat builds for x86_64 windows
---

diff --git a/ChangeLog b/ChangeLog
index e59aa4c7..2e2a57e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-09-09  Niels Möller  <nisse@lysator.liu.se>
+
+	* x86_64/fat/cpuid.asm: Fix usage of W64_ENTRY and W64_EXIT, to
+	make fat builds work on 64-bit windows.
+
 2021-08-16  Niels Möller  <nisse@lysator.liu.se>
 
 	S390x functions for sha1, sha256 and sha512, from Mamone Tarsha:
diff --git a/x86_64/fat/cpuid.asm b/x86_64/fat/cpuid.asm
index 3987cc7c..8b976fbe 100644
--- a/x86_64/fat/cpuid.asm
+++ b/x86_64/fat/cpuid.asm
@@ -41,7 +41,7 @@ C output pointer: %rsi
 	.text
 	ALIGN(16)
 PROLOGUE(_nettle_cpuid)
-	W64_ENTRY(2)
+	W64_ENTRY(2, 0)
 	push	%rbx
 
 	movl	%edi, %eax
@@ -53,7 +53,7 @@ PROLOGUE(_nettle_cpuid)
 	mov	%edx, 12(%rsi)
 
 	pop	%rbx
-	W64_EXIT(2)
+	W64_EXIT(2, 0)
 	ret
 EPILOGUE(_nettle_cpuid)