aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-21 08:09:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-12 08:49:29 +0100
commitbfbdd1a2069f199be9ba0909dd512469ff17b65e (patch)
treef06897fc6a99838ad53301e6a25d205532466e0d /meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
parent9ba71dc40dd782d192504b0827ca91f0fe180abe (diff)
downloadopenembedded-core-contrib-bfbdd1a2069f199be9ba0909dd512469ff17b65e.tar.gz
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7 Move all patches to webkit folder Drop patches that were backports or have been upstreamed Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
new file mode 100644
index 0000000000..5f58e4953e
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/ppc-musl-fix.patch
@@ -0,0 +1,26 @@
+ucontext structure is different between musl and glibc for ppc
+therefore its not enough just to check for arch alone, we also
+need to check for libc type.
+
+Fixes errors like
+
+Source/JavaScriptCore/heap/MachineStackMarker.cpp:90:65: error: 'struct mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'?
+ thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+===================================================================
+--- webkitgtk-2.12.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ webkitgtk-2.12.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendR
+ }
+
+ ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
+-#if CPU(PPC)
++#if CPU(PPC) && defined(__GLIBC__)
+ thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
+ #else
+ thread->suspendedMachineContext = userContext->uc_mcontext;