From 216e49142f74443421315a4624e70a2321a4741e Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Thu, 22 Nov 2018 12:59:41 +0000 Subject: [PATCH] fix-ftbfs-x32 =================================================================== Gbp-Pq: Name fix-ftbfs-x32.patch --- Source/WTF/wtf/Platform.h | 2 ++ Source/cmake/WebKitFeatures.cmake | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 4f9f1f12a3..9e10627d66 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -143,10 +143,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__) diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake index e15b6fe1e9..0f510e22c1 100644 --- a/Source/cmake/WebKitFeatures.cmake +++ b/Source/cmake/WebKitFeatures.cmake @@ -80,6 +80,10 @@ macro(WEBKIT_OPTION_BEGIN) set(USE_SYSTEM_MALLOC_DEFAULT ON) endif () + if (CMAKE_CXX_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32") + set(ENABLE_JIT_DEFAULT OFF) + endif () + WEBKIT_OPTION_DEFINE(ENABLE_3D_TRANSFORMS "Toggle 3D transforms support" PRIVATE ON) WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" PRIVATE OFF) WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING "Toggle accelerated scrolling support" PRIVATE OFF) -- 2.30.2