- rediffed x32 patch; release 2

[packages/wpe-webkit.git] / wpe-webkit-x32.patch

From: Alberto Garcia <berto@igalia.com>
Description: Use WTF_CPU_UNKNOWN when building for X32
 WebKitGTK doesn't build on X32 even with the JIT disabled.
 Treating the CPU as unknown is perhaps a bit severe, but it allows us
 to get the build done until someone steps up to maintain this
 properly.
Forwarded: no
Index: webkitgtk/Source/WTF/wtf/Platform.h
===================================================================
--- webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h.orig	2020-08-12 11:17:54.000000000 +0200
+++ webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h	2021-03-13 19:14:43.872248582 +0100
@@ -105,8 +105,8 @@
 #endif
 
 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
-#if   defined(__x86_64__) \
-    || defined(_M_X64)
+#if ( defined(__x86_64__) \
+    || defined(_M_X64) ) && !defined(__ILP32__)
 #define WTF_CPU_X86_64 1
 #define WTF_CPU_X86_SSE2 1
 #define WTF_CPU_KNOWN 1
Index: webkitgtk/CMakeLists.txt
===================================================================
--- webkitgtk.orig/CMakeLists.txt
+++ webkitgtk/CMakeLists.txt
@@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
     set(WTF_CPU_MIPS64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
     set(WTF_CPU_MIPS 1)
+elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32")
+    set(WTF_CPU_UNKNOWN 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
     # FORCE_32BIT is set in the build script when --32-bit is passed
     # on a Linux/intel 64bit host. This allows us to produce 32bit