diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-26 16:03:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:28 +0000 |
commit | 68da3901c9a778c30c174e85f029d27fc1c7b4ed (patch) | |
tree | 9231ac71eee1f3dd6bf8a7945651d63292c4f123 /meta/recipes-sato/webkit/webkitgtk/clang.patch | |
parent | da8163504d70de66381db50e5078794a1b61dad4 (diff) | |
download | poky-68da3901c9a778c30c174e85f029d27fc1c7b4ed.tar.gz |
webkitgtk: Fix build with clang/musl
backtrace is glibc only feature on linux so check for glibc before using
it
Clangs clear_cache has different signature than gcc provided builtin
make it compatible for both
(From OE-Core rev: c3dc346d44c8c5485b3eb1a97f32ba2ed2e76ece)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/clang.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/clang.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/clang.patch b/meta/recipes-sato/webkit/webkitgtk/clang.patch new file mode 100644 index 0000000000..e5267138bf --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/clang.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Clang's builtin for clear_cache accepts char* and errors out when using void*, | ||
2 | using char* work on both gcc and clang since char* is auto-converted to void* in gcc case | ||
3 | |||
4 | Source/JavaScriptCore/assembler/ARM64Assembler.h:2857:33: error: cannot initialize a parameter of type 'char *' with an rvalue of type 'void *' | ||
5 | __builtin___clear_cache(reinterpret_cast<void*>(begin), reinterpret_cast<void*>(end)); | ||
6 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
7 | 1 error generated. | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Accepted | ||
12 | |||
13 | Index: webkitgtk-2.8.5/Source/JavaScriptCore/assembler/ARM64Assembler.h | ||
14 | =================================================================== | ||
15 | --- webkitgtk-2.8.5.orig/Source/JavaScriptCore/assembler/ARM64Assembler.h | ||
16 | +++ webkitgtk-2.8.5/Source/JavaScriptCore/assembler/ARM64Assembler.h | ||
17 | @@ -2854,7 +2854,7 @@ public: | ||
18 | #if OS(LINUX) && COMPILER(GCC) | ||
19 | static inline void linuxPageFlush(uintptr_t begin, uintptr_t end) | ||
20 | { | ||
21 | - __builtin___clear_cache(reinterpret_cast<void*>(begin), reinterpret_cast<void*>(end)); | ||
22 | + __builtin___clear_cache(reinterpret_cast<char*>(begin), reinterpret_cast<char*>(end)); | ||
23 | } | ||
24 | #endif | ||
25 | |||