diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 10:20:19 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:34 +0000 |
| commit | d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe (patch) | |
| tree | e12362298f3ce80a2f24b9200d2ec9342d4c7f22 /recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | |
| parent | 8c7797ba5a2c2ba39a4389954b2ca72efc37e036 (diff) | |
| download | meta-qt5-d45b966b4612fe59ac3c53e0f7a3c480d29b2fbe.tar.gz | |
qtwebengine: update chromium musl patchset
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch new file mode 100644 index 00000000..11418cbe --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | |||
| @@ -0,0 +1,63 @@ | |||
| 1 | From e38a35fcad87a4c8279138d4ee6eaadac297548a 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] chromium: musl: Use _fpstate instead of _libc_fpstate on | ||
| 5 | linux | ||
| 6 | |||
| 7 | glibc defines both. musl libc only the former. | ||
| 8 | |||
| 9 | Signed-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 | |||
| 16 | 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 | ||
| 17 | index 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; | ||
| 38 | 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 | ||
| 39 | index 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); | ||
| 51 | 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 | ||
| 52 | index 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 | ||
