commit 923a6943cbefb3effab3f739c154ed35c5870df4
author Yi Kong <yikong@google.com> Wed Dec 20 17:06:02 2017 -0800
committer Yi Kong <yikong@google.com> Fri Jan 05 15:24:13 2018 -0800
tree 65d44769248ec34255bb66bdbf8ddbe56210b997
parent b496af808eaf3af5ebac50aef4fbec33323b5016

Ignore null-pointer-arithmetic warnings in external/dlmalloc

Suppress new null-pointer-arithmetic warning introduced in next compiler
update.

Test: m checkbuild
Change-Id: I3fe71ea24813a4759881a0a443c6d24025f73b25

runtime/gc/allocator/dlmalloc.cc

diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc
index 6506220..4570e9c 100644
--- a/runtime/gc/allocator/dlmalloc.cc
+++ b/runtime/gc/allocator/dlmalloc.cc
@@ -37,6 +37,7 @@
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #pragma GCC diagnostic ignored "-Wempty-body"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
 #include "../../../external/dlmalloc/malloc.c"
 // Note: malloc.c uses a DEBUG define to drive debug code. This interferes with the DEBUG severity
 //       of libbase, so undefine it now.

runtime/gc/allocator/dlmalloc.h

diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h
index 29b96ee..b12691a 100644
--- a/runtime/gc/allocator/dlmalloc.h
+++ b/runtime/gc/allocator/dlmalloc.h
@@ -32,6 +32,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
 #include "../../external/dlmalloc/malloc.h"
 #pragma GCC diagnostic pop