From 6db5f9e50dc95f504d33970ee553172bbf400ae7 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 7 Nov 2016 11:21:20 -0500 Subject: [PATCH] Fix build of jit gcc/ChangeLog: * asan.c (ATTR_NULL): Define. * sanitizer.def (BUILT_IN_ASAN_CLOBBER_N): Use ATTR_NULL rather than 0. (BUILT_IN_ASAN_UNCLOBBER_N): Likewise. --- gcc/asan.c | 2 ++ gcc/sanitizer.def | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/asan.c b/gcc/asan.c index 1e0ce8d..4a124cb 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -2463,6 +2463,8 @@ initialize_sanitizer_builtins (void) #define BT_FN_I16_CONST_VPTR_INT BT_FN_IX_CONST_VPTR_INT[4] #define BT_FN_I16_VPTR_I16_INT BT_FN_IX_VPTR_IX_INT[4] #define BT_FN_VOID_VPTR_I16_INT BT_FN_VOID_VPTR_IX_INT[4] +#undef ATTR_NULL +#define ATTR_NULL 0 #undef ATTR_NOTHROW_LEAF_LIST #define ATTR_NOTHROW_LEAF_LIST ECF_NOTHROW | ECF_LEAF #undef ATTR_TMPURE_NOTHROW_LEAF_LIST diff --git a/gcc/sanitizer.def b/gcc/sanitizer.def index 1c142e9..596b8b0 100644 --- a/gcc/sanitizer.def +++ b/gcc/sanitizer.def @@ -166,9 +166,9 @@ DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_AFTER_DYNAMIC_INIT, "__asan_after_dynamic_init", BT_FN_VOID, ATTR_NOTHROW_LEAF_LIST) DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_CLOBBER_N, "__asan_poison_stack_memory", - BT_FN_VOID_PTR_PTRMODE, 0) + BT_FN_VOID_PTR_PTRMODE, ATTR_NULL) DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_UNCLOBBER_N, "__asan_unpoison_stack_memory", - BT_FN_VOID_PTR_PTRMODE, 0) + BT_FN_VOID_PTR_PTRMODE, ATTR_NULL) /* Thread Sanitizer */ DEF_SANITIZER_BUILTIN(BUILT_IN_TSAN_INIT, "__tsan_init", -- 1.8.5.3