Fix fat builds for x86_64 windows

diff --git a/ChangeLog b/ChangeLog
index e59aa4c7f5a0a65d8a9b33979b946e7ed24ef6f1..2e2a57e3e545eaeff608dca5fd83441970556a7c 100644 (file)
--- 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 3987cc7c73fb1ceb5c91fc73d8332aa5e4841c34..8b976fbe53e2118e65eb1248620ebe4445449d86 100644 (file)
--- 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)