From 16dc61822e85d7254c4f26d046a5548aac9b0858 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 14 Feb 2022 10:41:18 +0100 Subject: Correct haswell function target for clang Clang uses arch names directly, and not the "arch=xxx" format of GCC. Appears we do not use this target though. Change-Id: I1d295f25fe2278c5c6bc0f617496555e28427bea Reviewed-by: Thiago Macieira (cherry picked from commit 1cc0494f7dbb0731533c7d691685bb50d3e1dd1a) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qsimd_p.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h index 118a62e6ac..62f2b84270 100644 --- a/src/corelib/global/qsimd_p.h +++ b/src/corelib/global/qsimd_p.h @@ -238,7 +238,11 @@ // // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell). -# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "arch=haswell" +# if defined(Q_CC_CLANG) +# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "haswell" +# else +# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "arch=haswell" +# endif # if defined(__AVX2__) && defined(__BMI__) && defined(__BMI2__) && defined(__F16C__) && \ defined(__FMA__) && defined(__LZCNT__) && defined(__RDRND__) # define __haswell__ 1 -- cgit v1.2.3