diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch new file mode 100644 index 00000000..1acfd7be --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
| @@ -0,0 +1,62 @@ | |||
| 1 | From 36d8ce0f390678080a670d1c48340c341d33bfad 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 | .../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 2f6116fa45c..7486a05a272 100755 | ||
| 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 | @@ -60,7 +60,7 @@ | ||
| 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 | return sys_mmap(start, length, prot, flags, fd, offset); | ||
| 25 | } | ||
| 26 | |||
| 27 | @@ -71,7 +71,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 | @@ -142,7 +142,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 | @@ -157,7 +157,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 | @@ -168,7 +168,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 { | ||
