diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-27 04:02:42 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-27 04:02:42 -0600 |
commit | 47d18b13213ccd7c51894796760f97571c3eb424 (patch) | |
tree | 6e31cc5d066c199564a5c8f34a40d313a08c44aa /user/qt5-qtdeclarative/pmmx.patch | |
parent | 9b07de55dfe6d50baeda3a8feda7f9fcade9c647 (diff) | |
download | packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.gz packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.bz2 packages-47d18b13213ccd7c51894796760f97571c3eb424.tar.xz packages-47d18b13213ccd7c51894796760f97571c3eb424.zip |
user/qt5: Bump to 5.12.6 LTS
This updates Qt 5 to the latest LTS release available. Notable changes:
* The infamous clipboard bug (upstream QTBUG-65145; Gerrit 254187) is fixed!
* Qt Declarative's "V4 JIT" is disabled globally on pmmx. It is no longer
(easily) possible to turn off the JIT selectively based on CPU capability.
* Qt Script builds correctly on GCC 8 now.
This does not include:
* Build testing of Qt Multimedia (yet); this depends on the time64-isation
of the alsa-lib package (at least).
* Build testing of Qt Speech (yet); speech-dispatcher also deps on alsa-lib
indirectly.
* Qt WebKit 5.212. This will be committed later.
Diffstat (limited to 'user/qt5-qtdeclarative/pmmx.patch')
-rw-r--r-- | user/qt5-qtdeclarative/pmmx.patch | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/user/qt5-qtdeclarative/pmmx.patch b/user/qt5-qtdeclarative/pmmx.patch deleted file mode 100644 index a4ce84650..000000000 --- a/user/qt5-qtdeclarative/pmmx.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 4950c366b12265f1ea390a6feb8dbbd0d850d206 Mon Sep 17 00:00:00 2001 -From: Guillem Jover <guillem@hadrons.org> -Date: Mon, 12 Oct 2015 01:45:37 +0200 -Subject: [PATCH v2] Do not make lack of SSE2 support on x86-32 fatal - -When an x86-32 CPU does not have SSE2 support (which is the case for -all AMD CPUs, and older Intel CPUs), fallback to use the interpreter, -otherwise use the JIT engine. - -Even then, make the lack of SSE2 support on x86-32 fatal when trying -to instantiate a JIT engine, which does require it. - -Refactor the required CPU support check into a new pair of privately -exported functions to avoid duplicating the logic, and do so in -functions instead of class members to avoid changing the class -signatures. - -Version: 5.7.x -Bug-Debian: https://bugs.debian.org/792594 ---- - src/qml/jit/qv4isel_masm.cpp | 2 ++ - src/qml/jit/qv4isel_masm_p.h | 18 ++++++++++++++++++ - src/qml/jsruntime/qv4engine.cpp | 1 + - src/qml/qml/v8/qv8engine.cpp | 7 ------- - tools/qmljs/qmljs.cpp | 7 +++---- - 5 files changed, 24 insertions(+), 11 deletions(-) - ---- a/src/qml/jit/qv4isel_masm.cpp -+++ b/src/qml/jit/qv4isel_masm.cpp -@@ -72,6 +72,8 @@ InstructionSelection<JITAssembler>::Inst - , compilationUnit(new CompilationUnit) - , qmlEngine(qmlEngine) - { -+ checkRequiredCpuSupport(); -+ - compilationUnit->codeRefs.resize(module->functions.size()); - module->unitFlags |= QV4::CompiledData::Unit::ContainsMachineCode; - } ---- a/src/qml/jit/qv4isel_masm_p.h -+++ b/src/qml/jit/qv4isel_masm_p.h -@@ -60,6 +60,7 @@ - - #include <QtCore/QHash> - #include <QtCore/QStack> -+#include <private/qsimd_p.h> - #include <config.h> - #include <wtf/Vector.h> - -@@ -72,6 +73,23 @@ QT_BEGIN_NAMESPACE - namespace QV4 { - namespace JIT { - -+Q_QML_PRIVATE_EXPORT inline bool hasRequiredCpuSupport() -+{ -+#ifdef Q_PROCESSOR_X86_32 -+ return qCpuHasFeature(SSE2); -+#else -+ return true; -+#endif -+} -+ -+Q_QML_PRIVATE_EXPORT inline void checkRequiredCpuSupport() -+{ -+#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"); -+#endif -+} -+ - template <typename JITAssembler = Assembler<DefaultAssemblerTargetConfiguration>> - class Q_QML_EXPORT InstructionSelection: - protected IR::IRDecoder, ---- a/src/qml/jsruntime/qv4engine.cpp -+++ b/src/qml/jsruntime/qv4engine.cpp -@@ -159,6 +159,7 @@ - - #ifdef V4_ENABLE_JIT - static const bool forceMoth = !qEnvironmentVariableIsEmpty("QV4_FORCE_INTERPRETER") || -+ !JIT::hasRequiredCpuSupport() || - !OSAllocator::canAllocateExecutableMemory(); - if (forceMoth) { - factory = new Moth::ISelFactory; ---- a/src/qml/qml/v8/qv8engine.cpp -+++ b/src/qml/qml/v8/qv8engine.cpp -@@ -64,7 +64,6 @@ - #include <QtCore/qjsonvalue.h> - #include <QtCore/qdatetime.h> - #include <QtCore/qdatastream.h> --#include <private/qsimd_p.h> - - #include <private/qv4value_p.h> - #include <private/qv4dateobject_p.h> -@@ -129,12 +128,6 @@ QV8Engine::QV8Engine(QJSEngine* qq) - , m_xmlHttpRequestData(0) - , m_listModelData(0) - { --#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"); -- } --#endif -- - QML_MEMORY_SCOPE_STRING("QV8Engine::QV8Engine"); - qMetaTypeId<QJSValue>(); - qMetaTypeId<QList<int> >(); ---- a/tools/qmljs/qmljs.cpp -+++ b/tools/qmljs/qmljs.cpp -@@ -92,11 +92,10 @@ int main(int argc, char *argv[]) - enum { - use_masm, - use_moth -- } mode; -+ } mode = use_moth; - #ifdef V4_ENABLE_JIT -- mode = use_masm; --#else -- mode = use_moth; -+ if (QV4::JIT::hasRequiredCpuSupport()) -+ mode = use_masm; - #endif - - bool runAsQml = false; |