summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-01-09 20:42:22 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-01-11 12:55:06 +0000
commitd4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169 (patch)
tree6c810c8520ebcb9637578e478815bc5081dafc1f /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
parentf705a8a47e542a5819380f024c92e43eebf08f5e (diff)
parent51e07805e0cf8f53bc9609854d1afd5e51494151 (diff)
downloadmeta-qt5-d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
In addition to commits below, fixed PV value to "5.12.1" in qt5-git.inc * upstream/master: 51e0780 qtbase: replace the fix for gcc-4.8 with the one from upstream c67abd6 qtbase: Fix build with gcc 4.8 f69fc40 qtwebengine: Fix build with musl/gcc9 7cc177d qtwebkit-examples: drop recipe 1b755b2 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer 5443af9 qtwayland: revert one patch from 5.12 branch to make it compatible with 5.12.0 qtbase bd9d830 qt3d-runtime: drop patch resolved upstream 44f4fc3 qt5everywheredemo: add dependency on qtxmlpatterns 77edae5 qtconnectivity: drop patch resolved upstream d45b966 qtwebengine: update chromium musl patchset 8c7797b qtbase: add env variable for host bin suffix f1a5e8a qtwebengine: include sources in the debug package, add x11 PACKAGECONFIG 2be2731 libqofono: add dependency on qtxmlpatterns 725fc1f qtxmlpatterns: add qtdeclarative PACKAGECONFIG b7b0a78 qtdeclarative: remove qtxmlpatterns PACKAGECONFIG 57aab31 qtwayland: update PACKAGECONFIG options 299a326 qtbase: update xinput PACKAGECONFIG 6531fa7 qtbase: use v5.12.0 as base c8d5ef5 qt5: upgrade to latest revision in 5.12 c6be23d qt5: upgrade to latest revision in 5.12 201fcf2 qt5-plugin-generic-vboxtouch: fix segfault 5b35f89 qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes 808d65c qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes a55a993 libconnman-qt5: Don't harcode libdir to fix multilib build c483f15 qtbase: Fix build with gcc9 b725e6d qtbase: Consider clang when computing QMAKE_CXX.COMPILER_MACROS 7016481 qt5-creator: Enable clang plugin support when clang is used as toolchain ba03a76 qtwebkit: Fix build with clang 7223816 maliit: Disable tests 4c3d66f qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file f2d7b94 qtconnectivity: Ignore -Waddress-of-temporary when using clang b8fade9 qtbase: Fix build with clang/musl 0cdf727 qt5: upgrade to 5.11.3 9fc65c0 qtwebengine: Configure Ninja to honor PARALLEL_MAKE 010a29e qmllive: add new recipe f227502 python-pyqt5: MAKEFLAGS pass -j 1 via MAKEFLAGS during do_install fe453ec packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found 18f82a8 python-pyqt5: Disable parallel install Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ic896ea4ae0f64daaedc43a6736fc0243599f05f6
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
new file mode 100644
index 00000000..fc9eef80
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -0,0 +1,63 @@
1From 7bc63fb1e62c906db5be40acd1d10095461cd4bd 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 052ce37cb44..95b0fb44e12 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