summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-10-23 15:55:46 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-10-30 08:11:51 +0000
commitbfddeb7f34db5b1d1b73a787246ca28f8ad3575b (patch)
treead8d7e0e85bbf25772fe0a3d35e8c0045e23f336 /recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
parent11b63656bad9db24950d05901a8b1917bc5cb7f8 (diff)
downloadmeta-qt5-bfddeb7f34db5b1d1b73a787246ca28f8ad3575b.tar.gz
qtwebengine: update chromium musl patchset
Change-Id: I792a600e354531f234a3ff641c030c119921f200 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index ec1a5676..e98074d9 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From ac37250356e2923572e33491198f27117d4afa6a Mon Sep 17 00:00:00 2001 1From 52ba569d06e28de9fec463481411792661d66d9e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:38:37 -0700 3Date: Fri, 7 Jul 2017 14:38:37 -0700
4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t 4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
@@ -12,19 +12,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 5 insertions(+), 5 deletions(-) 12 1 file changed, 5 insertions(+), 5 deletions(-)
13 13
14diff --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 14diff --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
15index 715c045f66..edc8cf2db7 100644 15index 2f6116fa45..7486a05a27 100755
16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 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 17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -77,7 +77,7 @@ typedef off64_t __off64_t; 18@@ -60,7 +60,7 @@
19 19
20 static inline void* do_mmap64(void *start, size_t length, 20 static inline void* do_mmap64(void *start, size_t length,
21 int prot, int flags, 21 int prot, int flags,
22- int fd, __off64_t offset) __THROW { 22- int fd, __off64_t offset) __THROW {
23+ 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 24 return sys_mmap(start, length, prot, flags, fd, offset);
25 // Chromium's sandbox. 25 }
26 return (void *)syscall(SYS_mmap, start, length, prot, flags, fd, offset); 26
27@@ -90,7 +90,7 @@ static inline void* do_mmap64(void *start, size_t length, 27@@ -71,7 +71,7 @@ static inline void* do_mmap64(void *start, size_t length,
28 28
29 static inline void* do_mmap64(void *start, size_t length, 29 static inline void* do_mmap64(void *start, size_t length,
30 int prot, int flags, 30 int prot, int flags,
@@ -33,7 +33,7 @@ index 715c045f66..edc8cf2db7 100644
33 void *result; 33 void *result;
34 34
35 // Try mmap2() unless it's not supported 35 // Try mmap2() unless it's not supported
36@@ -161,7 +161,7 @@ static inline void* do_mmap64(void *start, size_t length, 36@@ -142,7 +142,7 @@ static inline void* do_mmap64(void *start, size_t length,
37 37
38 extern "C" { 38 extern "C" {
39 void* mmap64(void *start, size_t length, int prot, int flags, 39 void* mmap64(void *start, size_t length, int prot, int flags,
@@ -42,7 +42,7 @@ index 715c045f66..edc8cf2db7 100644
42 ATTRIBUTE_SECTION(malloc_hook); 42 ATTRIBUTE_SECTION(malloc_hook);
43 void* mmap(void *start, size_t length,int prot, int flags, 43 void* mmap(void *start, size_t length,int prot, int flags,
44 int fd, off_t offset) __THROW 44 int fd, off_t offset) __THROW
45@@ -178,7 +178,7 @@ extern "C" { 45@@ -157,7 +157,7 @@ extern "C" {
46 } 46 }
47 47
48 extern "C" void* mmap64(void *start, size_t length, int prot, int flags, 48 extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
@@ -51,7 +51,7 @@ index 715c045f66..edc8cf2db7 100644
51 MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset); 51 MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset);
52 void *result; 52 void *result;
53 if (!MallocHook::InvokeMmapReplacement( 53 if (!MallocHook::InvokeMmapReplacement(
54@@ -189,7 +189,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, 54@@ -168,7 +168,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
55 return result; 55 return result;
56 } 56 }
57 57