From 0008d4be504f864049d3efd662a68a57f7af0980 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Thu, 12 Mar 2020 19:35:21 +0000 Subject: [PATCH] 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 --- CMakeLists.txt | 2 ++ Source/WTF/wtf/PlatformCPU.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5f5b9d855..89fc21f8bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") 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 (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(x64|x86_64|amd64)") set(WTF_CPU_X86_64 1) elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(i[3-6]86|x86)") diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h index b4472e3bee..e280f5a804 100644 --- a/Source/WTF/wtf/PlatformCPU.h +++ b/Source/WTF/wtf/PlatformCPU.h @@ -117,10 +117,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) - Apple */ #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) -- 2.30.2