summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-01-27 09:21:29 +0200
committerJani Suonpera <jani.suonpera@qt.io>2021-02-05 14:56:55 +0200
commita73de388e628a67490cdd7734779d405740b7fa3 (patch)
treec6410cd0062df9dde1fd02b56232027b7f865815 /recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
parent7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff)
downloadmeta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based. - PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations has been removed from src/buildtools/configure.json - DEPENDS nodejs-native added. This mandatory for chromium build. Task-number: QTBUG-90623 Change-Id: Ic933c88399422941114915afe5baa202850928f4 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
new file mode 100644
index 00000000..9ce9edce
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -0,0 +1,69 @@
1From 46283c0005cfb5d882b76df89a5c4fd880c0de42 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 .../client/linux/dump_writer_common/ucontext_reader.cc | 8 ++++----
12 .../src/client/linux/dump_writer_common/ucontext_reader.h | 4 ++--
13 .../src/client/linux/minidump_writer/minidump_writer.h | 2 +-
14 3 files changed, 7 insertions(+), 7 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 6eec1be2465..57d91943e83 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@@ -48,8 +48,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
21 return uc->uc_mcontext.gregs[REG_EIP];
22 }
23
24-void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
25- const fpstate_t* fp) {
26+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
27+ const struct _fpstate* fp) {
28 const greg_t* regs = uc->uc_mcontext.gregs;
29
30 out->context_flags = MD_CONTEXT_X86_FULL |
31@@ -96,8 +96,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
32 return uc->uc_mcontext.gregs[REG_RIP];
33 }
34
35-void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
36- const fpstate_t* fpregs) {
37+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
38+ const struct _fpstate* fpregs) {
39 const greg_t* regs = uc->uc_mcontext.gregs;
40
41 out->context_flags = MD_CONTEXT_AMD64_FULL;
42diff --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
43index 7d41008815f..6cacabe4369 100644
44--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
45+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
46@@ -50,8 +50,8 @@ struct UContextReader {
47 // out: the minidump structure
48 // info: the collection of register structures.
49 #if defined(__i386__) || defined(__x86_64)
50- static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
51- const fpstate_t* fp);
52+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
53+ const struct _fpstate* fp);
54 #elif defined(__aarch64__)
55 static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
56 const struct fpsimd_context* fpregs);
57diff --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
58index e3b0b16daea..5d144dcd27c 100644
59--- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
60+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
61@@ -49,7 +49,7 @@ class ExceptionHandler;
62 #if defined(__aarch64__)
63 typedef struct fpsimd_context fpstate_t;
64 #elif !defined(__ARM_EABI__) && !defined(__mips__)
65-typedef std::remove_pointer<fpregset_t>::type fpstate_t;
66+typedef struct _fpstate fpstate_t;
67 #endif
68
69 // These entries store a list of memory regions that the client wants included