Use WTF_CPU_UNKNOWN when building for X32

Forwarded: no

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.
===================================================================

Gbp-Pq: Name fix-ftbfs-x32.patch

diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index df130b525ac8c9cea404ae7b3db83129c310e053..add276275e1eda7dcbc781ff0dd5f29d89a6fc1f 100644 (file)
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -123,10 +123,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__)

diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
index cd78c8cf1b357d1ea8d530acafd12a28c399b806..d2a41792da5864d132455476781fd971e7538396 100644 (file)
--- a/Source/cmake/WebKitCommon.cmake
+++ b/Source/cmake/WebKitCommon.cmake
@@ -99,6 +99,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