fix patch for sse

This commit is contained in:
Helio Chissini de Castro 2017-05-06 12:07:38 +02:00
parent b6410fdacb
commit 6e9a7fc738

View File

@ -1,36 +1,36 @@
--- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/qv4global_p.h.new 2017-05-06 09:23:00.894049064 +0200 --- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/qv4global_p.h 2017-04-21 20:34:05.000000000 +0200
+++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/qv4global_p.h 2017-04-21 20:34:05.000000000 +0200 +++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/qv4global_p.h.new 2017-05-06 09:23:00.894049064 +0200
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
// //
// NOTE: This should match the logic in qv4targetplatform_p.h! // NOTE: This should match the logic in qv4targetplatform_p.h!
-#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) && defined(__SSE2__) \ -#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) \
+#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) \ +#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) && defined(__SSE2__) \
&& (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
# define V4_ENABLE_JIT # define V4_ENABLE_JIT
#elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ #elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \
--- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/jsruntime.pri.new 2017-05-06 09:25:12.698437577 +0200 --- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/jsruntime.pri 2017-04-21 20:34:05.000000000 +0200
+++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/jsruntime.pri 2017-04-21 20:34:05.000000000 +0200 +++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jsruntime/jsruntime.pri.new 2017-05-06 09:25:12.698437577 +0200
@@ -115,11 +115,6 @@ @@ -115,6 +115,11 @@
$$PWD/qv4value.cpp \ $$PWD/qv4value.cpp \
$$PWD/qv4executableallocator.cpp $$PWD/qv4executableallocator.cpp
-linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 { +linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 {
- QMAKE_CFLAGS += -msse2 -mfpmath=sse + QMAKE_CFLAGS += -msse2 -mfpmath=sse
- QMAKE_CXXFLAGS += -msse2 -mfpmath=sse + QMAKE_CXXFLAGS += -msse2 -mfpmath=sse
-} +}
- +
valgrind { valgrind {
DEFINES += V4_USE_VALGRIND DEFINES += V4_USE_VALGRIND
} }
--- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/qml/v8/qv8engine.cpp.new 2017-05-06 09:27:19.373810971 +0200 --- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/qml/v8/qv8engine.cpp 2017-04-21 20:34:05.000000000 +0200
+++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/qml/v8/qv8engine.cpp 2017-04-21 20:34:05.000000000 +0200 +++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/qml/v8/qv8engine.cpp.new 2017-05-06 09:27:19.373810971 +0200
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
, m_xmlHttpRequestData(0) , m_xmlHttpRequestData(0)
, m_listModelData(0) , m_listModelData(0)
{ {
-#if defined(Q_PROCESSOR_X86_32) && defined(__SSE2__) -#ifdef Q_PROCESSOR_X86_32
+#ifdef Q_PROCESSOR_X86_32 +#if defined(Q_PROCESSOR_X86_32) && defined(__SSE2__)
if (!qCpuHasFeature(SSE2)) { if (!qCpuHasFeature(SSE2)) {
qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer");
} }