@@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
12
third_party/tcmalloc/chromium/src/config_linux.h | 2 +-
13
13
4 files changed, 4 insertions(+), 4 deletions(-)
14
14
15
- diff --git a/base/process/process_metrics_posix.cc b/base/process/process_metrics_posix.cc
16
- index 9d12c427bb..7984c733c8 100644
17
15
--- a/base/process/process_metrics_posix.cc
18
16
+++ b/base/process/process_metrics_posix.cc
19
- @@ -119,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage() {
17
+ @@ -119,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage()
20
18
malloc_statistics_t stats = {0};
21
19
malloc_zone_statistics(nullptr, &stats);
22
20
return stats.size_in_use;
@@ -25,11 +23,9 @@ index 9d12c427bb..7984c733c8 100644
25
23
struct mallinfo minfo = mallinfo();
26
24
#if BUILDFLAG(USE_TCMALLOC)
27
25
return minfo.uordblks;
28
- diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc
29
- index 9bf8376988..e6cb89ebed 100644
30
26
--- a/base/trace_event/malloc_dump_provider.cc
31
27
+++ b/base/trace_event/malloc_dump_provider.cc
32
- @@ -184,7 +184,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
28
+ @@ -184,7 +184,7 @@ bool MallocDumpProvider::OnMemoryDump(co
33
29
}
34
30
#elif defined(OS_FUCHSIA)
35
31
// TODO(fuchsia): Port, see https://crbug.com/706592.
@@ -38,21 +34,17 @@ index 9bf8376988..e6cb89ebed 100644
38
34
struct mallinfo info = mallinfo();
39
35
// In case of Android's jemalloc |arena| is 0 and the outer pages size is
40
36
// reported by |hblkhd|. In case of dlmalloc the total is given by
41
- diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
42
- index 2f860e1286..d99a22ad1b 100644
43
37
--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
44
38
+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
45
39
@@ -130,7 +130,7 @@
46
40
/* #undef HAVE_MALLCTL */
47
41
48
42
/* Define to 1 if you have the `mallinfo' function. */
49
43
- #define HAVE_MALLINFO 1
50
- + /* #define HAVE_MALLINFO 1 */
44
+ + /* #undef HAVE_MALLINFO */
51
45
52
46
/* Define to 1 if you have the <malloc.h> header file. */
53
47
#define HAVE_MALLOC_H 1
54
- diff --git a/third_party/tcmalloc/chromium/src/config_linux.h b/third_party/tcmalloc/chromium/src/config_linux.h
55
- index 4e8e3989eb..93a62a2d82 100644
56
48
--- a/third_party/tcmalloc/chromium/src/config_linux.h
57
49
+++ b/third_party/tcmalloc/chromium/src/config_linux.h
58
50
@@ -152,7 +152,7 @@
@@ -64,3 +56,14 @@ index 4e8e3989eb..93a62a2d82 100644
64
56
65
57
/* Define to 1 if you have the <sys/cdefs.h> header file. */
66
58
#define HAVE_SYS_CDEFS_H 1
59
+ --- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
60
+ +++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
61
+ @@ -125,7 +125,7 @@
62
+ /* #undef HAVE_MALLCTL */
63
+
64
+ /* Define to 1 if you have the `mallinfo' function. */
65
+ - #define HAVE_MALLINFO 1
66
+ + /* #undef HAVE_MALLINFO */
67
+
68
+ /* Define to 1 if you have the <malloc/malloc.h> header file. */
69
+ /* #undef HAVE_MALLOC_MALLOC_H */
0 commit comments