- x32 32bit pointers with 64bit asm is too confusing to qt5 jit, disable on this...

diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 0274553ccf0217ff92a969120ce7fa39aa0c5f1f..c0e6c4d4780ed5d1cd3a92ea575b2197aff50e5e 100644 (file)
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -19,6 +19,7 @@ Source0:      http://download.qt-project.org/official_releases/qt/5.4/%{version}/subm
 # Source0-md5: 86dfe5c41e14a142c72fdaa6a64f933c
 Source1:       http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
 # Source1-md5: 0bdd1b0a83b03a04a4ebeedfa3057d21
+Patch0:                x32.patch
 URL:           http://qt-project.org/
 BuildRequires: OpenGL-devel
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
@@ -234,6 +235,9 @@ Przykłady do bibliotek Qt5 Declarative.
 
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version} %{?with_qm:-a1}
+%ifarch x32
+%patch0 -p1
+%endif
 
 %build
 qmake-qt5

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..cba9185
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- qtdeclarative-opensource-src-5.4.1/src/qml/jsruntime/qv4global_p.h~        2015-02-17 05:57:27.000000000 +0100
++++ qtdeclarative-opensource-src-5.4.1/src/qml/jsruntime/qv4global_p.h 2015-03-04 09:00:49.213556819 +0100
+@@ -69,9 +69,9 @@
+ //
+ // NOTE: This should match the logic in qv4targetplatform_p.h!
+ 
+-#if defined(Q_PROCESSOR_X86) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
++#if defined(Q_PROCESSOR_X86) && !defined(__ILP32__) && (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(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
++#elif defined(Q_PROCESSOR_X86_64) && !defined(__ILP32__) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
+ #define V4_ENABLE_JIT
+ #elif defined(Q_PROCESSOR_ARM_32)
+