diff -r 711921e5d1ed src/qt-1-win32.patch --- a/src/qt-1-win32.patch Sat Dec 18 03:16:27 2010 +1100 +++ b/src/qt-1-win32.patch Fri Dec 17 23:20:25 2010 +0300 @@ -194,3 +194,33 @@ -- 1.7.1 +From a321dab2dd992ea0b7b0c8ddddc082422a58356b Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Tue, 28 Sep 2010 10:45:43 +0200 +Subject: [PATCH] Use quint64 (long long) instead of long for the GCC assembly code. + +Windows 64-bit has sizeof(long) == 4, which doesn't match the register +size. + +Task-number: reported on IRC +Reviewed-by: Trust Me +--- + src/corelib/tools/qsimd.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp +index e727bfc..9c0502b 100644 +--- a/src/corelib/tools/qsimd.cpp ++++ b/src/corelib/tools/qsimd.cpp +@@ -286,7 +286,7 @@ static inline uint detectProcessorFeatures() + uint feature_result = 0; + + #if defined(Q_CC_GNU) +- long tmp; ++ quint64 tmp; + asm ("xchg %%rbx, %1\n" + "cpuid\n" + "xchg %%rbx, %1\n" +-- +1.7.0.4 +