summaryrefslogtreecommitdiff
path: root/var/spack/repos/builtin/packages/qt/qt5_12-intel-overflow.patch
diff options
context:
space:
mode:
Diffstat (limited to 'var/spack/repos/builtin/packages/qt/qt5_12-intel-overflow.patch')
-rw-r--r--var/spack/repos/builtin/packages/qt/qt5_12-intel-overflow.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/qt5_12-intel-overflow.patch b/var/spack/repos/builtin/packages/qt/qt5_12-intel-overflow.patch
new file mode 100644
index 0000000000..bfe5c8e4f3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt5_12-intel-overflow.patch
@@ -0,0 +1,11 @@
+--- a/qtbase/src/corelib/global/qnumeric_p.h 2019-08-31 03:29:31.000000000 -0500
++++ b/qtbase/src/corelib/global/qnumeric_p.h 2020-01-06 14:23:40.719851927 -0600
+@@ -231,7 +231,7 @@
+ // size_t. Implementations for 8- and 16-bit types will work but may not be as
+ // efficient. Implementations for 64-bit may be missing on 32-bit platforms.
+
+-#if (defined(Q_CC_GNU) && (Q_CC_GNU >= 500) || (defined(Q_CC_INTEL) && !defined(Q_OS_WIN))) || QT_HAS_BUILTIN(__builtin_add_overflow)
++#if (defined(Q_CC_GNU) && (Q_CC_GNU >= 500) && !defined(Q_CC_INTEL) || (defined(Q_CC_INTEL) && (Q_CC_INTEL >= 1800) && (Q_CC_GNU >= 500) && !defined(Q_OS_WIN))) || QT_HAS_BUILTIN(__builtin_add_overflow)
+ // GCC 5, ICC 18, and Clang 3.8 have builtins to detect overflows
+
+ template <typename T> inline