summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-15 10:19:24 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-15 10:20:17 +0200
commitf29e5bf1d15372a21e3e79a23afbc2be9fbaa004 (patch)
treeb2256fc1ebc713c8d51897eb46116b35d28551e9 /recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
parent07393133a7c0c27c71a24da5ec09834281fd0f13 (diff)
parentf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (diff)
downloadmeta-qt5-f29e5bf1d15372a21e3e79a23afbc2be9fbaa004.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14 1b8e5570 qtbase: Use pcre packages by default fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples 1a7c8fa4 qtlocation: use geoclue 2 ddbf8dd0 qtbase: use offscreen platform plugin for tools 4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk 56b2c13d qtbase-native: disable vulkan support 6b34fd17 maliit-framework-qt5: fix test installations aa50163c qtenginio: remove obsolete module 32edd746 ogl-runtime: update to v2.5.0 release f7dcc706 qtquick3d: add recipe b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance 1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance ca649e3f qt5: Update to Qt 5.14.0 ede15adc qtbase: Fix patch fuzz detected with devtool e8221c2c qtbase: Backport the patch from upstream gerrit ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo 6e7cc682 qtwebengine: Move CharAllocator definition to header 33a86256 qt5-creator: Add missing dep on libz.so 3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions d8f0db7f qtwebengine: Include cstddef for size_t definition b6bd407e qmllive: Fix build with multilib settings 69e1fd33 quazip: Fix multilib builds a4db065b qtwebkit: Fix linking errors on clang/mips/ppc f756a065 ogl-runtime: Only compile for supported architectures 710d995b qttools: Add option to disable qdoc a02e01ca qttools: Use CONFIG+=disable_external_rpath 0d88f448 packagegroup-qt5-toolchain-target: Make machine specific 2a2055fa recipes: Disable clang dependent recipes for riscv64/32 Conflicts: recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
new file mode 100644
index 00000000..7ed278b0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -0,0 +1,63 @@
1From 1f839bf6ac48d81a8acbf3def4f57a555a05fa18 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:35:07 -0700
4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on
5 linux
6
7glibc defines both. musl libc only the former.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 .../src/client/linux/dump_writer_common/ucontext_reader.cc | 4 ++--
12 .../src/client/linux/dump_writer_common/ucontext_reader.h | 2 +-
13 .../src/client/linux/minidump_writer/minidump_writer.h | 2 +-
14 3 files changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
17index 6ee6cc1e4cd..a8f9ccc72ac 100644
18--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
19+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
20@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
21 }
22
23 void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
24- const struct _libc_fpstate* fp) {
25+ const struct _fpstate* fp) {
26 const greg_t* regs = uc->uc_mcontext.gregs;
27
28 out->context_flags = MD_CONTEXT_X86_FULL |
29@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
30 }
31
32 void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
33- const struct _libc_fpstate* fpregs) {
34+ const struct _fpstate* fpregs) {
35 const greg_t* regs = uc->uc_mcontext.gregs;
36
37 out->context_flags = MD_CONTEXT_AMD64_FULL;
38diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
39index f830618f240..f3dde1f4dff 100644
40--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
41+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
42@@ -50,7 +50,7 @@ struct UContextReader {
43 // info: the collection of register structures.
44 #if defined(__i386__) || defined(__x86_64)
45 static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
46- const struct _libc_fpstate* fp);
47+ const struct _fpstate* fp);
48 #elif defined(__aarch64__)
49 static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
50 const struct fpsimd_context* fpregs);
51diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
52index d1dc331215a..d1cc5624cd4 100644
53--- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
54+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
55@@ -48,7 +48,7 @@ class ExceptionHandler;
56 #if defined(__aarch64__)
57 typedef struct fpsimd_context fpstate_t;
58 #elif !defined(__ARM_EABI__) && !defined(__mips__)
59-typedef struct _libc_fpstate fpstate_t;
60+typedef struct _fpstate fpstate_t;
61 #endif
62
63 // These entries store a list of memory regions that the client wants included