diff options
Diffstat (limited to 'meta/recipes-sato/webkit/files')
-rw-r--r-- | meta/recipes-sato/webkit/files/detect_atomics.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/detect_atomics.patch b/meta/recipes-sato/webkit/files/detect_atomics.patch new file mode 100644 index 0000000000..c4e80a7d96 --- /dev/null +++ b/meta/recipes-sato/webkit/files/detect_atomics.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Sourced from https://bugs.webkit.org/show_bug.cgi?id=161900 | ||
2 | |||
3 | on arm fixes | ||
4 | |||
5 | | /usr/src/debug/libgcc/6.2.0-r0/gcc-6.2.0/build.arm-oe-linux-gnueabi.arm-oe-linux-gnueabi/libgcc/../../../../../../../work-shared/gcc-6.2.0-r0/gcc-6.2.0/libgcc/config/arm/linux-atomic-64bit.c:117: multiple definition of `__sync_sub_and_fetch_8' | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt | ||
12 | index 867999e..ea69322 100644 | ||
13 | --- a/Source/WTF/wtf/CMakeLists.txt | ||
14 | +++ b/Source/WTF/wtf/CMakeLists.txt | ||
15 | @@ -171,7 +171,6 @@ set(WTF_HEADERS | ||
16 | |||
17 | set(WTF_SOURCES | ||
18 | Assertions.cpp | ||
19 | - Atomics.cpp | ||
20 | BitVector.cpp | ||
21 | CompilationThread.cpp | ||
22 | CrossThreadCopier.cpp | ||
23 | @@ -276,6 +275,15 @@ if (NOT USE_SYSTEM_MALLOC) | ||
24 | list(APPEND WTF_LIBRARIES bmalloc) | ||
25 | endif () | ||
26 | |||
27 | +file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp | ||
28 | + "int main(void)\n" | ||
29 | + "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") | ||
30 | +try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) | ||
31 | +if (NOT ATOMICS_BUILD_SUCCEEDED) | ||
32 | + list(APPEND WTF_SOURCES Atomics.cpp) | ||
33 | +endif () | ||
34 | +file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) | ||
35 | + | ||
36 | list(APPEND WTF_SOURCES | ||
37 | unicode/icu/CollatorICU.cpp | ||
38 | ) | ||