projects / packages / wpe-webkit.git / blame
| Commit | Line | Data |
|---|---|---|
| 8dd13544 JB |
1 | From: Alberto Garcia <berto@igalia.com> |
| 2 | Description: 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. | |
| 7 | Forwarded: no | |
| 8 | Index: webkitgtk/Source/WTF/wtf/Platform.h | |
| 9 | =================================================================== | |
| 10 | --- webkitgtk.orig/Source/WTF/wtf/Platform.h | |
| 11 | +++ webkitgtk/Source/WTF/wtf/Platform.h | |
| 12 | @@ -142,10 +142,12 @@ | |
| 13 | /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ | |
| 14 | #if defined(__x86_64__) \ | |
| 15 | || defined(_M_X64) | |
| 16 | +#if !defined(__ILP32__) | |
| 17 | #define WTF_CPU_X86_64 1 | |
| 18 | #define WTF_CPU_X86_SSE2 1 | |
| 19 | #define WTF_CPU_KNOWN 1 | |
| 20 | #endif | |
| 21 | +#endif | |
| 22 | ||
| 23 | /* CPU(ARM64) - Apple */ | |
| 24 | #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) | |
| 25 | Index: webkitgtk/CMakeLists.txt | |
| 26 | =================================================================== | |
| 27 | --- webkitgtk.orig/CMakeLists.txt | |
| 28 | +++ webkitgtk/CMakeLists.txt | |
| 29 | @@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR | |
| 30 | set(WTF_CPU_MIPS64 1) | |
| 31 | elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") | |
| 32 | set(WTF_CPU_MIPS 1) | |
| 33 | +elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32") | |
| 34 | + set(WTF_CPU_UNKNOWN 1) | |
| 35 | elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)") | |
| 36 | # FORCE_32BIT is set in the build script when --32-bit is passed | |
| 37 | # on a Linux/intel 64bit host. This allows us to produce 32bit |