an attempt at x32 patch

no idea whether code should behave like CPU(X86) or like CPU(X86_64)
but assumed the latter with additional condition on pointer size

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 4cbbef9521ef9035d8b37b39194b605afd46d0f2..837c8e10329c185d928a4baf5626b846cd075331 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -50,6 +50,7 @@ Patch104:     0016-cmake-Import-ECMEnableSanitizers.patch
 Patch105:      0031-Disable-ES6-Proxy-object.patch
 Patch106:      0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch
 Patch107:      0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch
+Patch108:      x32.patch
 URL:           https://github.com/annulen/webkit
 BuildRequires: OpenGL-devel
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
@@ -198,6 +199,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 %patch105 -p1
 %patch106 -p1
 %patch107 -p1
+%patch108 -p1
 
 %build
 CXXFLAGS="%{rpmcxxflags} -fpermissive"; export CXXFLAGS

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..f9911c3
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,15 @@
+--- webkit-qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/assembler/MacroAssembler.h.orig       2018-11-22 19:45:23.473588054 +0100
++++ webkit-qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/assembler/MacroAssembler.h    2018-11-22 19:45:05.290379269 +0100
+@@ -1152,10 +1152,12 @@
+         case 0xffff:
+         case 0xffffff:
+         case 0xffffffffL:
++#ifndef __ILP32__
+         case 0xffffffffffL:
+         case 0xffffffffffffL:
+         case 0xffffffffffffffL:
+         case 0xffffffffffffffffL:
++#endif
+             return false;
+         default: {
+             if (value <= 0xff)