diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
| commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
| tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |
| parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) | |
| download | meta-qt5-ce766374432309b85fdcfe8ef287dbb2ef11b337.tar.gz | |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch deleted file mode 100644 index 65f709d5..00000000 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From 90ebe616e563ab1224234281ea7b1a478f42ca92 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | ||
| 4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t | ||
| 5 | |||
| 6 | - only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl | ||
| 7 | does not support the 32-bit ABI. | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- | ||
| 12 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
| 15 | index 715c045f66..edc8cf2db7 100644 | ||
| 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
| 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | ||
| 18 | @@ -77,7 +77,7 @@ typedef off64_t __off64_t; | ||
| 19 | |||
| 20 | static inline void* do_mmap64(void *start, size_t length, | ||
| 21 | int prot, int flags, | ||
| 22 | - int fd, __off64_t offset) __THROW { | ||
| 23 | + int fd, off64_t offset) __THROW { | ||
| 24 | // The original gperftools uses sys_mmap() here. But, it is not allowed by | ||
| 25 | // Chromium's sandbox. | ||
| 26 | return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); | ||
| 27 | @@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, | ||
| 28 | |||
| 29 | static inline void* do_mmap64(void *start, size_t length, | ||
| 30 | int prot, int flags, | ||
| 31 | - int fd, __off64_t offset) __THROW { | ||
| 32 | + int fd, off64_t offset) __THROW { | ||
| 33 | void *result; | ||
| 34 | |||
| 35 | // Try mmap2() unless it's not supported | ||
| 36 | @@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, | ||
| 37 | |||
| 38 | extern "C" { | ||
| 39 | void* mmap64(void *start, size_t length, int prot, int flags, | ||
| 40 | - int fd, __off64_t offset ) __THROW | ||
| 41 | + int fd, off64_t offset ) __THROW | ||
| 42 | ATTRIBUTE_SECTION(malloc_hook); | ||
| 43 | void* mmap(void *start, size_t length,int prot, int flags, | ||
| 44 | int fd, off_t offset) __THROW | ||
| 45 | @@ -178,7 +178,7 @@ extern "C" { | ||
| 46 | } | ||
| 47 | |||
| 48 | extern "C" void* mmap64(void *start, size_t length, int prot, int flags, | ||
| 49 | - int fd, __off64_t offset) __THROW { | ||
| 50 | + int fd, off64_t offset) __THROW { | ||
| 51 | MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); | ||
| 52 | void *result; | ||
| 53 | if (!MallocHook::InvokeMmapReplacement( | ||
| 54 | @@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, | ||
| 55 | return result; | ||
| 56 | } | ||
| 57 | |||
| 58 | -# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) | ||
| 59 | +# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) | ||
| 60 | |||
| 61 | extern "C" void* mmap(void *start, size_t length, int prot, int flags, | ||
| 62 | int fd, off_t offset) __THROW { | ||
