Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 17 May 2017 22:34:24 -0700 |
| 4 | Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 |
| 5 | |
| 6 | Taken from |
| 7 | https://bugs.webkit.org/show_bug.cgi?id=161900 |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | |
| 12 | --- |
| 13 | Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- |
| 14 | 1 file changed, 9 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt |
| 17 | index 6b5e45b9..46ee3c22 100644 |
| 18 | --- a/Source/WTF/wtf/CMakeLists.txt |
| 19 | +++ b/Source/WTF/wtf/CMakeLists.txt |
| 20 | @@ -205,7 +205,6 @@ set(WTF_HEADERS |
| 21 | |
| 22 | set(WTF_SOURCES |
| 23 | Assertions.cpp |
| 24 | - Atomics.cpp |
| 25 | AutomaticThread.cpp |
| 26 | BitVector.cpp |
| 27 | CPUTime.cpp |
| 28 | @@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) |
| 29 | list(APPEND WTF_LIBRARIES bmalloc) |
| 30 | endif () |
| 31 | |
| 32 | +file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp |
| 33 | + "int main(void)\n" |
| 34 | + "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") |
| 35 | +try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) |
| 36 | +if (NOT ATOMICS_BUILD_SUCCEEDED) |
| 37 | + list(APPEND WTF_SOURCES Atomics.cpp) |
| 38 | +endif () |
| 39 | +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) |
| 40 | + |
| 41 | list(APPEND WTF_SOURCES |
| 42 | unicode/icu/CollatorICU.cpp |
| 43 | ) |
| 44 | -- |
| 45 | 2.14.1 |
| 46 | |