ppc patch

This commit is contained in:
Helio Chissini de Castro 2017-05-06 15:23:30 +02:00
parent c1e0ebd424
commit ca515bcde5
1 changed files with 20 additions and 14 deletions

View File

@ -1,18 +1,24 @@
--- qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jit/qv4isel_masm.cpp.new 2017-05-06 13:39:31.943980330 +0200
+++ qtdeclarative-opensource-src-5.9.0-beta3/src/qml/jit/qv4isel_masm.cpp 2017-05-06 13:39:54.982089422 +0200
@@ -1635,7 +1635,6 @@
--- qtdeclarative-opensource-src-5.9.0-beta3/tools/qmlcachegen/qmlcachegen.cpp 2017-04-21 20:34:05.000000000 +0200
+++ qtdeclarative-opensource-src-5.9.0-beta3/tools/qmlcachegen/qmlcachegen.cpp.new 2017-05-06 15:20:22.055698824 +0200
@@ -41,9 +41,11 @@
QT_BEGIN_NAMESPACE
+#if defined(V4_BOOTSTRAP)
namespace QV4 { namespace JIT {
template class Q_QML_EXPORT InstructionSelection<>;
template class Q_QML_EXPORT ISelFactory<>;
-#if defined(V4_BOOTSTRAP)
Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture)
{
@@ -1663,7 +1662,6 @@
return nullptr;
}
-#endif
Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture);
} }
+#endif
QT_END_NAMESPACE
@@ -327,7 +329,9 @@
QScopedPointer<QV4::EvalISelFactory> isel;
const QString targetArchitecture = parser.value(targetArchitectureOption);
+#if defined(V4_BOOTSTRAP)
isel.reset(QV4::JIT::createISelForArchitecture(targetArchitecture));
+#endif
if (parser.isSet(checkIfSupportedOption)) {
if (isel.isNull())