From b6410fdacb321d0c2b0deee5f1101bd34d4b8ffc Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sat, 6 May 2017 10:00:58 +0200 Subject: [PATCH] sse2 --- qt5-qtdeclarative.spec | 2 +- ...arative-opensource-src-5.7.0-no_sse2.patch | 36 ------------------- ...arative-opensource-src-5.9.0-no_sse2.patch | 36 +++++++++++++++++++ 3 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 qtdeclarative-opensource-src-5.7.0-no_sse2.patch create mode 100644 qtdeclarative-opensource-src-5.9.0-no_sse2.patch diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 43b5e68..4fad641 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -19,7 +19,7 @@ Source0: https://download.qt.io/development_releases/qt/5.9/%{version}-beta3/sub # support no_sse2 CONFIG (fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them) # https://codereview.qt-project.org/#change,73710 -Patch1: qtdeclarative-opensource-src-5.7.0-no_sse2.patch +Patch1: qtdeclarative-opensource-src-5.9.0-no_sse2.patch # workaround for possible deadlock condition in QQuickShaderEffectSource # https://bugzilla.redhat.com/show_bug.cgi?id=1237269 diff --git a/qtdeclarative-opensource-src-5.7.0-no_sse2.patch b/qtdeclarative-opensource-src-5.7.0-no_sse2.patch deleted file mode 100644 index 0bedca0..0000000 --- a/qtdeclarative-opensource-src-5.7.0-no_sse2.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/qv4global_p.h 2016-06-11 14:05:08.000000000 +0200 -+++ qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/qv4global_p.h.new 2016-07-15 21:17:04.313953097 +0200 -@@ -91,7 +91,7 @@ - // - // NOTE: This should match the logic in qv4targetplatform_p.h! - --#if defined(Q_PROCESSOR_X86) && !defined(__ILP32__) \ -+#if defined(Q_PROCESSOR_X86) && !defined(__ILP32__) && defined(__SSE2__) \ - && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) - # define V4_ENABLE_JIT - #elif defined(Q_PROCESSOR_X86_64) && !defined(__ILP32__) \ ---- qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/jsruntime.pri 2016-06-11 14:05:08.000000000 +0200 -+++ qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/jsruntime.pri.new 2016-07-15 21:13:37.519119496 +0200 -@@ -108,6 +108,11 @@ - $$PWD/qv4string.cpp \ - $$PWD/qv4value.cpp - -+linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 { -+ QMAKE_CFLAGS += -msse2 -mfpmath=sse -+ QMAKE_CXXFLAGS += -msse2 -mfpmath=sse -+} -+ - valgrind { - DEFINES += V4_USE_VALGRIND - } ---- qtdeclarative-opensource-src-5.7.0/src/qml/qml/v8/qv8engine.cpp 2016-06-11 14:05:08.000000000 +0200 -+++ qtdeclarative-opensource-src-5.7.0/src/qml/qml/v8/qv8engine.cpp.new 2016-07-15 21:18:37.202327536 +0200 -@@ -130,7 +130,7 @@ - , m_xmlHttpRequestData(0) - , m_listModelData(0) - { --#ifdef Q_PROCESSOR_X86_32 -+#if defined(Q_PROCESSOR_X86_32) && defined(__SSE2__) - if (!qCpuHasFeature(SSE2)) { - qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); - } diff --git a/qtdeclarative-opensource-src-5.9.0-no_sse2.patch b/qtdeclarative-opensource-src-5.9.0-no_sse2.patch new file mode 100644 index 0000000..1463408 --- /dev/null +++ b/qtdeclarative-opensource-src-5.9.0-no_sse2.patch @@ -0,0 +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 +@@ -95,7 +95,7 @@ + // + // 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) \ + && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) + # define V4_ENABLE_JIT + #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 +@@ -115,11 +115,6 @@ + $$PWD/qv4value.cpp \ + $$PWD/qv4executableallocator.cpp + +-linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 { +- QMAKE_CFLAGS += -msse2 -mfpmath=sse +- QMAKE_CXXFLAGS += -msse2 -mfpmath=sse +-} +- + 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 +@@ -129,7 +129,7 @@ + , m_xmlHttpRequestData(0) + , m_listModelData(0) + { +-#if defined(Q_PROCESSOR_X86_32) && defined(__SSE2__) ++#ifdef Q_PROCESSOR_X86_32 + if (!qCpuHasFeature(SSE2)) { + qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); + }