1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
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/PlatformCPU.h
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
@@ -118,10 +118,12 @@
/* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
#if defined(__x86_64__) \
|| defined(_M_X64)
+#if !defined(__ILP32__)
#define WTF_CPU_X86_64 1
#define WTF_CPU_X86_SSE2 1
#define WTF_CPU_KNOWN 1
#endif
+#endif
/* CPU(ARM64) */
#if defined(__arm64__) || defined(__aarch64__)
Index: webkitgtk/Source/cmake/WebKitCommon.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
+++ webkitgtk/Source/cmake/WebKitCommon.cmake
@@ -107,6 +107,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WTF_CPU_MIPS64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
+ elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
+ 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
|
