From f723794da81d102ecbe6505898ea4d001b1f7e30 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 9 Jul 2014 23:59:40 +0000 Subject: [PATCH] [Sanitizer] Remove SANITIZER_NEEDS_SEGV from shared sanitizer_common headers. Otherwise, it can be accidentally redefined when we build specific sanitizer runtime. This definition should be provided only once - when we build sanitizer_common library. llvm-svn: 212663 --- compiler-rt/lib/sanitizer_common/sanitizer_flags.cc | 5 +++++ compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc b/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc index 91c0f23..0a70e16 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_flags.cc @@ -29,6 +29,11 @@ struct FlagDescription { IntrusiveList flag_descriptions; +// If set, the tool will install its own SEGV signal handler by default. +#ifndef SANITIZER_NEEDS_SEGV +# define SANITIZER_NEEDS_SEGV 1 +#endif + void SetCommonFlagsDefaults(CommonFlags *f) { f->symbolize = true; f->external_symbolizer_path = 0; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h index 9db5f8f..c8985b49 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h @@ -34,11 +34,6 @@ # define SANITIZER_SUPPORTS_WEAK_HOOKS 0 #endif -// If set, the tool will install its own SEGV signal handler. -#ifndef SANITIZER_NEEDS_SEGV -# define SANITIZER_NEEDS_SEGV 1 -#endif - // GCC does not understand __has_feature #if !defined(__has_feature) # define __has_feature(x) 0 -- 2.7.4