summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-14 10:41:18 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-16 22:47:13 +0100
commit1cc0494f7dbb0731533c7d691685bb50d3e1dd1a (patch)
treea3fb3ba7c1e81baca6739846d453d587882a2192
parentfedd4f26ad9afb0f848ad12cf621e5a7a6208742 (diff)
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. Pick-to: 6.3 6.2 Change-Id: I1d295f25fe2278c5c6bc0f617496555e28427bea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/global/qsimd_p.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
index cb02b31990..21eaeeef93 100644
--- a/src/corelib/global/qsimd_p.h
+++ b/src/corelib/global/qsimd_p.h
@@ -236,7 +236,11 @@ asm(
//
// 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