diff --git a/.pick_status.json b/.pick_status.json index f877ac04a44..b94b36e4364 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6074,7 +6074,7 @@ "description": "meson: disable SIMD blake optimisations on x32 host", "nominated": false, "nomination_type": 0, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/util/blake3/meson.build b/src/util/blake3/meson.build index 6b53daab6b3..33c500588e0 100644 --- a/src/util/blake3/meson.build +++ b/src/util/blake3/meson.build @@ -24,6 +24,10 @@ if cpu_family == 'x86_64' else files_blake3 += ['blake3_sse2_x86-64_windows_gnu.S', 'blake3_sse41_x86-64_windows_gnu.S', 'blake3_avx2_x86-64_windows_gnu.S', 'blake3_avx512_x86-64_windows_gnu.S'] endif + # Disable blake assembly for x32, x86-64 with 32-bit pointers. + # GNU triplet is x86_64-linux-gnux32 + elif cc.sizeof('void *') == 4 + blake3_defs += blake3_x86_no_simd_defs else files_blake3 += ['blake3_sse2_x86-64_unix.S', 'blake3_sse41_x86-64_unix.S', 'blake3_avx2_x86-64_unix.S', 'blake3_avx512_x86-64_unix.S'] endif