diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-16 12:08:06 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-16 14:01:27 +0300 |
commit | 21f10e47108ed83d92da2c80574b884bdbc83cf1 (patch) | |
tree | 3455f0e0ee109c60f505cffc3c54c3bf0cf1f06b /recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch | |
parent | 6aa1a8026b65c85a2ea35361939b6401f950cc2e (diff) | |
parent | e863df2be9e966811a80f0e3717af911478fd748 (diff) | |
download | meta-qt5-21f10e47108ed83d92da2c80574b884bdbc83cf1.tar.gz |
Merge remote-tracking branch 'qtyocto/5.11' into 5.12
* qtyocto/5.11:
e863df2 nativesdk-qtbase: fix packaging QA issue
a6d8420 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
8e485a2 qtbase: default to internal harfbuzz-ng
0c7eb25 layer.conf: Add thud to LAYERSERIES_COMPAT
4e6c472 qt5-creator: Check before editing translation Makefile
15a8c25 qt5-creator: Pick native tools from native sysroot e.g. lrelease etc.
f11e942 qt5-creator: fix build with QMAKE_AR
0cf5966 qt5-creator: upgrade to 4.7.1+
4fb1e60 qt: package all files in ${PN}-examples
2109ff6 qt: use single -dev and -staticdev package
5c5b7e8 qt5-creator: refresh .patch files and push them to meta-qt5 fork
333437c qt5-creator: Fix build due to missing lrelease
3ad2acb qtchooser: Update to latest git
1ed9bcb qtwebengine: Add patches to fix breakpad in new webengine release on musl
24d6fc2 qtbase: Do not use cross_compile check
d0cd7a7 qtbase: Fix errors due to -isystem
8123922 qtbase: Fix build error for armv8BE multilib.
f9e80ed qt5: update to latest revision in 5.11 branch
3e7da25 qt5: update to Qt 5.11.2
cd0da4e libqofono: include /qt5/mkspecs in ${PN}-dev
db45ea6 qtwebkit-examples: Fix build with QT 5.11
d498eb6 qtwebkit: Use relative paths for pri files when cross compile
b716195 qmake5_paths: change the default QT_DIR_NAME to be empty
3224b02 nativesdk-qtbase: use default PACKAGES
66c49f8 qt5-creator: strip few more useless rpaths
03b4c7b qt: remove unnecessary FILES.*-dbg variables for packaging .debug files
5164f84 qt3d-runtime: Fix compile errors as seen with mips/musl
08aaba0 qt3d-runtime: upgrade to latest revision in 2.0 branch
a8832a7 qtwebkit: Make qtwebkit support arm32 BE.
215e81d qtscript: add patches to meta-qt5 fork
66a9704 qtscript: Fix build on musl
edf1e43 qtwebkit: add patches to meta-qt5 fork
a307eb0 qtwebkit: Fix conflicts with -I and -isystem
3e4141c qtwebkit: Fix build with musl
c977d68 qt5-creator: Strip out redundant RPATH
189dd8a qt5-creator: Fix building botan for all non-x86 arches
85e665b qtwebengine: use nasm-native instead of yasm-native
75bc440 qtbase: fix install locations used in static builds
823fa38 qtwebengine: enable debug info for webengine
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d-runtime_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwebengine/0004-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
Change-Id: Id38a2f68bd27b1fe8ffc7bbf2c74bad1fb2b92d0
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch new file mode 100644 index 00000000..2be0cb07 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From cd92f771ac37ae41d7a1abfd6fcc9d50aa7529d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 | ||
4 | Subject: [PATCH] Use _fpstate instead of _libc_fpstate on linux | ||
5 | |||
6 | glibc defines both. musl libc only the former. | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | .../src/client/linux/dump_writer_common/ucontext_reader.cc | 4 ++-- | ||
11 | .../src/client/linux/dump_writer_common/ucontext_reader.h | 2 +- | ||
12 | .../src/client/linux/minidump_writer/minidump_writer.h | 2 +- | ||
13 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --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 | ||
16 | index 052ce37cb4..95b0fb44e1 100644 | ||
17 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | ||
18 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | ||
19 | @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { | ||
20 | } | ||
21 | |||
22 | void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
23 | - const struct _libc_fpstate* fp) { | ||
24 | + const struct _fpstate* fp) { | ||
25 | const greg_t* regs = uc->uc_mcontext.gregs; | ||
26 | |||
27 | out->context_flags = MD_CONTEXT_X86_FULL | | ||
28 | @@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { | ||
29 | } | ||
30 | |||
31 | void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
32 | - const struct _libc_fpstate* fpregs) { | ||
33 | + const struct _fpstate* fpregs) { | ||
34 | const greg_t* regs = uc->uc_mcontext.gregs; | ||
35 | |||
36 | out->context_flags = MD_CONTEXT_AMD64_FULL; | ||
37 | diff --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 | ||
38 | index f830618f24..f3dde1f4df 100644 | ||
39 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | ||
40 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | ||
41 | @@ -50,7 +50,7 @@ struct UContextReader { | ||
42 | // info: the collection of register structures. | ||
43 | #if defined(__i386__) || defined(__x86_64) | ||
44 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
45 | - const struct _libc_fpstate* fp); | ||
46 | + const struct _fpstate* fp); | ||
47 | #elif defined(__aarch64__) | ||
48 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
49 | const struct fpsimd_context* fpregs); | ||
50 | diff --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 | ||
51 | index d1dc331215..d1cc5624cd 100644 | ||
52 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | ||
53 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | ||
54 | @@ -48,7 +48,7 @@ class ExceptionHandler; | ||
55 | #if defined(__aarch64__) | ||
56 | typedef struct fpsimd_context fpstate_t; | ||
57 | #elif !defined(__ARM_EABI__) && !defined(__mips__) | ||
58 | -typedef struct _libc_fpstate fpstate_t; | ||
59 | +typedef struct _fpstate fpstate_t; | ||
60 | #endif | ||
61 | |||
62 | // These entries store a list of memory regions that the client wants included | ||
63 | -- | ||
64 | 2.19.0 | ||
65 | |||