Source: webkit2gtk
Version: 2.50.4-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: m68k sh4
X-Debbugs-Cc: [email protected],[email protected]
Hi,
on sh4, the build fails because GCC does not support the musttail property:
[2356/7836] /usr/bin/c++ -DBUILDING_GTK__=1 -DBUILDING_WEBKIT=1
-DBUILDING_WITH_CMAKE=1
(...)
In file included from
/<<PKGBUILDDIR>>/Source/ThirdParty/skia/src/core/SkOpts.cpp:16:
/<<PKGBUILDDIR>>/Source/ThirdParty/skia/src/opts/SkRasterPipeline_opts.h: In
function \
‘void portable::set_base_pointer(Params*, SkRasterPipelineStage*, F, F, F, F)’:
/<<PKGBUILDDIR>>/Source/ThirdParty/skia/src/opts/SkRasterPipeline_opts.h:1615:31:
\
error: cannot tail-call: target is not able to optimize the call into a sibling
call
1615 | MUSTTAIL return fn(params, program, r,g,b,a);
\
| ~~^~~~~~~~~~~~~~~~~~~~~~~~~~
This fixed by disabling the mustfail property in Skia, see the attached patch.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Index:
webkit2gtk-2.50.4/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h
===================================================================
---
webkit2gtk-2.50.4.orig/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h
+++ webkit2gtk-2.50.4/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h
@@ -52,6 +52,8 @@ extern "C" {
&& !defined(__arm__) \
&& !defined(__riscv) \
&& !defined(__powerpc__) \
+ && !defined(__m68k__) \
+ && !defined(__sh__) \
&& !defined(__loongarch__) \
&& !defined(_WIN32) &&
!defined(__SYMBIAN32__)
#define SKCMS_HAS_MUSTTAIL 1
Index: webkit2gtk-2.50.4/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
===================================================================
--- webkit2gtk-2.50.4.orig/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
+++ webkit2gtk-2.50.4/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
@@ -27,7 +27,7 @@ struct SkImageInfo;
struct skcms_TransferFunction;
#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) &&
!defined(SK_CPU_ARM32) && \
- !defined(SK_CPU_LOONGARCH) && !defined(SK_CPU_PPC) && \
+ !defined(SK_CPU_LOONGARCH) && !defined(SK_CPU_PPC) && !defined(__sh__)
&& !defined(__m68k__) && \
!(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK))
// [[clang::musttail]] is disabled for the Android version of Skia running
on Windows as it
// causes crashes (This is probably related to http://crbug.com/1505442).
