diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch | |
parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
download | meta-qt5-19d99b10df41b7875b3c788bc7a9d1a88734e644.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch new file mode 100644 index 00000000..edeb3272 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 3269ffba733ed7eeb7c2c36912dd19ca1ef35f8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 | ||
4 | Subject: [PATCH] chromium: musl: pread pwrite | ||
5 | |||
6 | Redefine pread/pwrite in terms of 64bit variants on musl | ||
7 | since 32bit variants don't exist and aliases are not defined in | ||
8 | libc either | ||
9 | |||
10 | Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | chromium/third_party/lss/linux_syscall_support.h | 5 +++++ | ||
14 | 1 file changed, 5 insertions(+) | ||
15 | |||
16 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | ||
17 | index fd8efdffea6..22a8863031c 100644 | ||
18 | --- a/chromium/third_party/lss/linux_syscall_support.h | ||
19 | +++ b/chromium/third_party/lss/linux_syscall_support.h | ||
20 | @@ -1244,6 +1244,11 @@ struct kernel_statfs { | ||
21 | #ifndef __NR_fallocate | ||
22 | #define __NR_fallocate 285 | ||
23 | #endif | ||
24 | +#undef __NR_pread | ||
25 | +#define __NR_pread __NR_pread64 | ||
26 | +#undef __NR_pwrite | ||
27 | +#define __NR_pwrite __NR_pwrite64 | ||
28 | + | ||
29 | /* End of x86-64 definitions */ | ||
30 | #elif defined(__mips__) | ||
31 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | ||