summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2018-12-10 04:56:54 -0800
committer Yi Kong <yikong@google.com> 2018-12-10 19:27:16 +0000
commit3b015746bb77f4e4763a2023ab42e517ffa3f641 (patch)
tree02a66f17797ad13afe745d0bfd9ec18271e96e7a
parent2d17c5149bd96327e8e306986f3539429d1d98fe (diff)
Ignore expansion-to-defined warning from dlmalloc include
external/vixl/src/../../../external/dlmalloc/malloc.c:2742:5: error: macro expansion producing 'defined' has undefined behavior [-Werror,-Wexpansion-to-defined] external/vixl/src/../../../external/dlmalloc/malloc.c:589:22: note: expanded from macro 'USE_LOCKS' (defined(USE_RECURSIVE_LOCKS) && USE_RECURSIVE_LOCKS != 0)) Test: m checkbuild Bug: 29823425 Change-Id: I38d6947b151a97391b88a32a2b3187e7c4e88660
-rw-r--r--runtime/gc/allocator/dlmalloc.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc
index e508d5fddf..11ad8a84bf 100644
--- a/runtime/gc/allocator/dlmalloc.cc
+++ b/runtime/gc/allocator/dlmalloc.cc
@@ -38,6 +38,7 @@ static void art_heap_usage_error(const char* function, void* p);
#pragma GCC diagnostic ignored "-Wempty-body"
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
+#pragma GCC diagnostic ignored "-Wexpansion-to-defined"
#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.