Skip to content

Commit 4d7fa5b

Browse files
committed
chromium: Fix patch fuzz
Fixes musl patches after recemnt chromium updates no code chanhes per se Fixes Applying patch musl_no_mallinfo.patch patching file base/process/process_metrics_posix.cc patching file base/trace_event/malloc_dump_provider.cc Hunk OSSystems#1 succeeded at 132 with fuzz 2. patching file third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h patching file third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h patching file third_party/tcmalloc/chromium/src/config_linux.h Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 65f8d37 commit 4d7fa5b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

recipes-browser/chromium/files/musl/musl_no_mallinfo.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2222
-#else
2323
+#elif defined(__GLIBC__)
2424
struct mallinfo info = mallinfo();
25-
DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
26-
25+
#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
26+
// Sanitizers override mallinfo.
2727
--- a/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
2828
+++ b/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
2929
@@ -122,8 +122,9 @@

0 commit comments

Comments
 (0)