diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-01-12 09:21:39 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-15 21:42:15 +0000 |
| commit | 4564d8f3762fdd8e802255b174b45060efef1606 (patch) | |
| tree | 2c801cfb97f42ed18342de2cbd187e77adbd64fe | |
| parent | 90ea98a24c3df4f36f51b6411ba8963af98a0e19 (diff) | |
| download | poky-4564d8f3762fdd8e802255b174b45060efef1606.tar.gz | |
webkitgtk: Workaround for clang compiler segfault
This is a compiler crash which is under works upstream, until its fixed
lets disable musttail calls on clang+arm
(From OE-Core rev: a61205f364c2e9f40736c081bbae0b045e317093)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.42.2.bb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch new file mode 100644 index 0000000000..a6d67c1d70 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/no-musttail-arm.patch | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | clang/arm: Do not use MUST_TAIL_CALL | ||
| 2 | |||
| 3 | This causes clang-17 to crash see [1] | ||
| 4 | this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit | ||
| 5 | |||
| 6 | [1] https://github.com/llvm/llvm-project/issues/67767 | ||
| 7 | [2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [work around to avoid clang compiler crash] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- a/Source/WTF/wtf/Compiler.h | ||
| 12 | +++ b/Source/WTF/wtf/Compiler.h | ||
| 13 | @@ -284,7 +284,7 @@ | ||
| 14 | /* MUST_TAIL_CALL */ | ||
| 15 | |||
| 16 | #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) | ||
| 17 | -#if __has_cpp_attribute(clang::musttail) | ||
| 18 | +#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) | ||
| 19 | #define MUST_TAIL_CALL [[clang::musttail]] | ||
| 20 | #endif | ||
| 21 | #endif | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb index 2ba60eb65b..997aa5575b 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.42.2.bb | |||
| @@ -14,6 +14,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
| 14 | file://reproducibility.patch \ | 14 | file://reproducibility.patch \ |
| 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ | 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ |
| 16 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ | 16 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ |
| 17 | file://no-musttail-arm.patch \ | ||
| 17 | " | 18 | " |
| 18 | SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118" | 19 | SRC_URI[sha256sum] = "5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118" |
| 19 | 20 | ||
