summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-22 10:26:45 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-11-25 09:19:26 +0200
commit929b2ef266c6eb4cc1f5500f421fda449cd8900b (patch)
tree2df07f423983f7ef00c1c4c817b37416b25553ae /recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
parentfd86202d56c542011d24dc518457631bc00901c9 (diff)
parent12cc756c7948a90367473f0a52dd2fe2b519dd24 (diff)
downloadmeta-qt5-929b2ef266c6eb4cc1f5500f421fda449cd8900b.tar.gz
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* origin/5.13: 12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13 432ad2a qttools: don't install tst_qtattributionsscanner 8115617 qt5: Upgrade to Qt 5.13.2 267e646 python(3)-pyqt5: add qml support 653e12f libqofono: bump SRCREV and add a fix for voicecall cefb48e qtbase: Add PACKAGECONFIG for lttng 911b346 layer: Mark zeus as compatible release c373272 ogl-runtime: Fix build on x86_64 9172ba1 README.md: Document need for 32bit host compiler db2fd6c qtwayland: Fix build with clang/libc++ 6b5122e qtbase: Fix build when fp16 is used Conflicts: recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
new file mode 100644
index 00000000..58c869fa
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -0,0 +1,63 @@
1From c98e81a6c88d056a6e093f6fbcc985bd2d7b1ed4 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