Skip to content

Commit ef6f8d0

Browse files
committed
chromium: Add missing mallifo fix for musl
This is found when compiling for aarch64/musl Signed-off-by: Khem Raj <[email protected]>
1 parent 9e4204e commit ef6f8d0

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

meta-chromium/recipes-browser/chromium/files/musl/0001-mallinfo-implementation-is-glibc-specific.patch

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <[email protected]>
99
--- a/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
1010
+++ b/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
1111
@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
12-
12+
1313
MemoryUsage GetMemoryUsage() {
1414
MemoryUsage result;
1515
-#ifdef __linux__
@@ -20,21 +20,21 @@ Signed-off-by: Khem Raj <[email protected]>
2020
--- a/base/process/process_metrics_posix.cc
2121
+++ b/base/process/process_metrics_posix.cc
2222
@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
23-
23+
2424
#endif // !defined(OS_FUCHSIA)
25-
25+
2626
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
2727
+#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
2828
namespace {
29-
29+
3030
size_t GetMallocUsageMallinfo() {
3131
@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
3232
}
33-
33+
3434
} // namespace
3535
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
3636
+#endif // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
37-
37+
3838
size_t ProcessMetrics::GetMallocUsage() {
3939
#if defined(OS_APPLE)
4040
malloc_statistics_t stats = {0};
@@ -63,10 +63,21 @@ Signed-off-by: Khem Raj <[email protected]>
6363
+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
6464
@@ -130,7 +130,7 @@
6565
/* #undef HAVE_MALLCTL */
66-
66+
6767
/* Define to 1 if you have the `mallinfo' function. */
6868
-#define HAVE_MALLINFO 1
6969
+/* #undef HAVE_MALLINFO */
70-
70+
7171
/* Define to 1 if you have the <malloc.h> header file. */
7272
#define HAVE_MALLOC_H 1
73+
--- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
74+
+++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
75+
@@ -125,7 +125,7 @@
76+
/* #undef HAVE_MALLCTL */
77+
78+
/* Define to 1 if you have the `mallinfo' function. */
79+
-#define HAVE_MALLINFO 1
80+
+/* #undef HAVE_MALLINFO */
81+
82+
/* Define to 1 if you have the <malloc/malloc.h> header file. */
83+
/* #undef HAVE_MALLOC_MALLOC_H */

0 commit comments

Comments
 (0)