summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-18 10:33:35 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-19 00:52:43 +0000
commita22656bfd105baf7bf252d6734f2d76c1678d406 (patch)
tree3fce7466897332d14426831c18dcca7021c9e320
parent2f334e5619d7ae437c802c60c579d54e954aadd0 (diff)
Revert "Correct haswell function target for clang"
This reverts commit 1cc0494f7dbb0731533c7d691685bb50d3e1dd1a. Reason for revert: Not a fix, but a break Change-Id: Ie41d8870dbd52f87059f6bad2335e272409c3046 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6944b4df7bac464eaee8e03ea724db25303fdbc1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/global/qsimd_p.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
index 62f2b84270..118a62e6ac 100644
--- a/src/corelib/global/qsimd_p.h
+++ b/src/corelib/global/qsimd_p.h
@@ -238,11 +238,7 @@
//
// 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).
-# if defined(Q_CC_CLANG)
-# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "haswell"
-# else
-# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "arch=haswell"
-# endif
+# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "arch=haswell"
# if defined(__AVX2__) && defined(__BMI__) && defined(__BMI2__) && defined(__F16C__) && \
defined(__FMA__) && defined(__LZCNT__) && defined(__RDRND__)
# define __haswell__ 1