kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 18:15:18 -07:00
Code Releases Wiki Activity

Undefine HAVE_{AMD64,AVX}_ASM with the Windows calling convention

Browse Source 
Fixes #1371
This commit is contained in:
Frank Denis 2024-05-23 15:47:02 +02:00
parent 2e662fb56f
commit e9cc216804
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.zig
View File

@ -37,7 +37,6 @@ fn initLibConfig(b: *std.Build, target: std.Build.ResolvedTarget, lib: *Compile)
lib.defineCMacro("HAVE_CATCHABLE_SEGV", "1"); lib.defineCMacro("HAVE_CATCHABLE_SEGV", "1");
lib.defineCMacro("HAVE_CLOCK_GETTIME", "1"); lib.defineCMacro("HAVE_CLOCK_GETTIME", "1");
lib.defineCMacro("HAVE_GETPID", "1"); lib.defineCMacro("HAVE_GETPID", "1");
lib.defineCMacro("HAVE_INLINE_ASM", "1");
lib.defineCMacro("HAVE_MADVISE", "1"); lib.defineCMacro("HAVE_MADVISE", "1");
lib.defineCMacro("HAVE_MLOCK", "1"); lib.defineCMacro("HAVE_MLOCK", "1");
lib.defineCMacro("HAVE_MMAP", "1"); lib.defineCMacro("HAVE_MMAP", "1");
@ -104,8 +103,13 @@ fn initLibConfig(b: *std.Build, target: std.Build.ResolvedTarget, lib: *Compile)
switch (target.result.cpu.arch) { switch (target.result.cpu.arch) {
.x86_64 => { .x86_64 => {
switch (target.result.os.tag) {
.windows => {},
else => {
lib.defineCMacro("HAVE_AMD64_ASM", "1"); lib.defineCMacro("HAVE_AMD64_ASM", "1");
lib.defineCMacro("HAVE_AVX_ASM", "1"); lib.defineCMacro("HAVE_AVX_ASM", "1");
},
}
lib.defineCMacro("HAVE_CPUID", "1"); lib.defineCMacro("HAVE_CPUID", "1");
lib.defineCMacro("HAVE_MMINTRIN_H", "1"); lib.defineCMacro("HAVE_MMINTRIN_H", "1");
lib.defineCMacro("HAVE_EMMINTRIN_H", "1"); lib.defineCMacro("HAVE_EMMINTRIN_H", "1");