base: restrict x86_avx2 to 64-bit (not 32-bit) x86

32-bit C/C++ compilers don't always compile the AVX intrinsics. Per the
60773 bug below,
> clang++ -m32 etc etc fuzz/c/std/jpeg_fuzzer.c
> undefined reference to `_mm_cvtsi128_si64'
> undefined reference to `_mm256_extract_epi64'

See also the "#ifdef __x86_64__" guards in
https://github.com/gcc-mirror/gcc/blob/4a3895903c29ed85da6fcb886f31ff23d4c6e935/gcc/config/i386/emmintrin.h#L228-L231
https://github.com/llvm/llvm-project/blob/08fab9ebecf72a682279d75489dc2460121cbeed/clang/lib/Headers/emmintrin.h#L3502-L3515

Note that -m32 is not the same as -mx32
> $ touch empty.c
> $ gcc       -dM -E empty.c | grep -E '__i386__|__x86_64__'
> #define __x86_64__ 1
> $ gcc -m32  -dM -E empty.c | grep -E '__i386__|__x86_64__'
> #define __i386__ 1
> $ gcc -mx32 -dM -E empty.c | grep -E '__i386__|__x86_64__'
> #define __x86_64__ 1

Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=60773
This commit is contained in:
Nigel Tao committed 2023-07-23 21:20:35 +10:00
1 parent 605b10a492
commit e2b9566fc5
7 files changed
+44 -32

No files matched your search

+1 -1
View File
@@ -594,7 +594,7 @@ test_wuffs_jpeg_decode_idct() {
if (f == 0) {
func_name = "choosy_default";
func = &wuffs_jpeg__decoder__decode_idct__choosy_default;
#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
} else if (wuffs_base__cpu_arch__have_x86_avx2()) {
func_name = "x86_avx2";
func = &wuffs_jpeg__decoder__decode_idct_x86_avx2;