- rediffed x32 patch; release 2
[packages/wpe-webkit.git] / wpe-webkit-x32.patch
CommitLineData
8dd13544
JB
1From: Alberto Garcia <berto@igalia.com>
2Description: Use WTF_CPU_UNKNOWN when building for X32
3 WebKitGTK doesn't build on X32 even with the JIT disabled.
4 Treating the CPU as unknown is perhaps a bit severe, but it allows us
5 to get the build done until someone steps up to maintain this
6 properly.
7Forwarded: no
8Index: webkitgtk/Source/WTF/wtf/Platform.h
9===================================================================
d57fd60b
JB
10--- webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h.orig 2020-08-12 11:17:54.000000000 +0200
11+++ webkitgtk-2.30.5/Source/WTF/wtf/PlatformCPU.h 2021-03-13 19:14:43.872248582 +0100
12@@ -105,8 +105,8 @@
13 #endif
14
8dd13544 15 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
d57fd60b
JB
16-#if defined(__x86_64__) \
17- || defined(_M_X64)
18+#if ( defined(__x86_64__) \
19+ || defined(_M_X64) ) && !defined(__ILP32__)
8dd13544
JB
20 #define WTF_CPU_X86_64 1
21 #define WTF_CPU_X86_SSE2 1
22 #define WTF_CPU_KNOWN 1
8dd13544
JB
23Index: webkitgtk/CMakeLists.txt
24===================================================================
25--- webkitgtk.orig/CMakeLists.txt
26+++ webkitgtk/CMakeLists.txt
27@@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
28 set(WTF_CPU_MIPS64 1)
29 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
30 set(WTF_CPU_MIPS 1)
31+elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32")
32+ set(WTF_CPU_UNKNOWN 1)
33 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
34 # FORCE_32BIT is set in the build script when --32-bit is passed
35 # on a Linux/intel 64bit host. This allows us to produce 32bit
This page took 0.098524 seconds and 4 git commands to generate.