summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-14 15:06:28 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-15 10:10:47 +0300
commit63dec9bbd826a4afafa7177aaa3439467f25d80a (patch)
treeafcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
parent79791026ff20539180027de0d796f8acd55bc7bf (diff)
parent53500ade778bac6e1733db43fc41c290d7b9d16b (diff)
downloadmeta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master: qtdeclarative: Use qmlcachegen provided by OE instead of system one. qtbase-native: Always use qt provided doubleconversion library. qttools: Enable clang support when using clang qt5-creator: update to v4.9.2 maliit-framework-qt5: Fix build when ptest is enabled qtwebengine: Fix build on aarch64 qtwebengine: refresh the patches to apply qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc qt5: Upgrade to Qt 5.13.0 Allow enabling gui for native and nativesdk qt5everywheredemo: update HOMEPAGE qtconnectivity,qtsystems: Account for bluez4 from oe-core gdb_%.bbappend: Avoid PAK archive (application/x-pak) Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
new file mode 100644
index 00000000..16c958c9
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -0,0 +1,63 @@
1From 295afaa918bafc70df23c2c6740e0ef3cc3a7ba5 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