<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8cebbb3b6ca2aee2e76119aa59bc3a7b9b0d786d">https://github.com/macports/macports-ports/commit/8cebbb3b6ca2aee2e76119aa59bc3a7b9b0d786d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8cebbb3b6ca qt5*-qtbase: fix build for Xcode 11.4 and later
</span>8cebbb3b6ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8cebbb3b6ca2aee2e76119aa59bc3a7b9b0d786d
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Jun 28 21:33:26 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtbase: fix build for Xcode 11.4 and later
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Outdated Xcode-LLVM clang version mapping in qcompilerdetection.h
</span><span style='display:block; white-space:pre;color:#404040;'> defines Q_CC_CLANG too low; check for _bit_scan_reverse() macro instead.
</span><span style='display:block; white-space:pre;color:#404040;'> Due to lack of testing on older macOS versions, apply alternative patch
</span><span style='display:block; white-space:pre;color:#404040;'> only on affected macOS versions (10.15 and later).
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revise comment and reference to upstream clang commit to better reflect
</span><span style='display:block; white-space:pre;color:#404040;'> why this problem appeared with clang 9.0 and not sooner.
</span>---
aqua/phantomjs-qt/Portfile | 16 +++++++++++++---
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 11 +++++++++++
aqua/qt53/Portfile | 6 +++---
aqua/qt55/Portfile | 16 +++++++++++++---
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 11 +++++++++++
aqua/qt56/Portfile | 16 +++++++++++++---
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 11 +++++++++++
aqua/qt57/Portfile | 16 +++++++++++++---
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 20 ++++++++++++++++++++
9 files changed, 108 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/Portfile b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dae6c94020..75e9ddc3544 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,11 +267,21 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for Clang 9.0 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8335979ad1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,7 +329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6137ced2007..42e0f9cb797 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -742,9 +742,9 @@ foreach {module module_info} [array get modules] {
</span> # so we instead have to disable adding the SDK tool prefix in configure to allow MacPorts-installed compilers to be used
patchfiles-append patch-qt53-disable-macsdkify.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for Clang 9.0 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da570a54798..ead09be084a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -762,11 +762,21 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for Clang 9.0 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/qt55/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8335979ad1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,7 +329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c57bc0ec7a1..953e9e27d51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -806,11 +806,21 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for Clang 9.0 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/qt56/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9c5b25cc92a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,7 +452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf5236987f6..e21d191d3c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -877,11 +877,21 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for Clang 9.0 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
</span> # see https://trac.macports.org/ticket/59364
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/qt57/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8ae7d2d9bb8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,7 +465,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define qCpuHasFeature(feature) ((qCompilerCpuFeatures & (Q_UINT64_C(1) << CpuFeature ## feature)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (qCpuFeatures() & (Q_UINT64_C(1) << CpuFeature ## feature)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && (defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Q_ALWAYS_INLINE unsigned _bit_scan_reverse(unsigned val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT(val != 0); // if val==0, the result is undefined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,7 +503,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span></pre><pre style='margin:0'>
</pre>