From 15553d3ea7b994680b0dfea8973aa4b1900aecad Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 15 Jun 2018 12:07:13 -0700
Subject: [PATCH] Fix build with SSE 4.1 but not AVX2

Failed on my Sandybridge Mac with -march=native:

qstring.cpp:363:19: error: redefinition of 'mask' with a different type: 'const __m128i'

Change-Id: I6efb28c3145047559ec0fffd15386aeb8d36d681
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/corelib/tools/qstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index df95938c41..712e058c9c 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -294,7 +294,7 @@ static bool simdTestMask(const char *&ptr, const char *end, quint32 maskval)
 #    else
     // SSE 4.1 implementation: test 32 bytes at a time (two 16-byte
     // comparisons, unrolled)
-    const __m128i mask = _mm_set1_epi32(maskval);
+    mask = _mm_set1_epi32(maskval);
     while (ptr + 32 <= end) {
         __m128i data1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(ptr));
         __m128i data2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(ptr + 16));