<div dir="ltr">On Tue, Mar 19, 2013 at 5:54 PM, Evgeniy Stepanov <span dir="ltr"><<a href="mailto:eugeni.stepanov@gmail.com" target="_blank">eugeni.stepanov@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: eugenis<br>
Date: Tue Mar 19 08:54:41 2013<br>
New Revision: 177397<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177397&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177397&view=rev</a><br>
Log:<br>
[sanitizer] Move ASan platform macros to sanitizer_common and rename them appropriately.<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/asan_internal.h<br>
    compiler-rt/trunk/lib/asan/asan_linux.cc<br>
    compiler-rt/trunk/lib/asan/asan_mac.h<br>
    compiler-rt/trunk/lib/asan/asan_malloc_linux.cc<br>
    compiler-rt/trunk/lib/asan/asan_mapping.h<br>
    compiler-rt/trunk/lib/asan/asan_new_delete.cc<br>
    compiler-rt/trunk/lib/asan/asan_rtl.cc<br>
    compiler-rt/trunk/lib/asan/asan_thread_registry.cc<br>
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_internal.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_internal.h (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_internal.h Tue Mar 19 08:54:41 2013<br>
@@ -21,39 +21,8 @@<br>
 #include "sanitizer_common/sanitizer_stacktrace.h"<br>
 #include "sanitizer_common/sanitizer_libc.h"<br>
<br>
-#if !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32)<br>
-# error "This operating system is not supported by AddressSanitizer"<br>
-#endif<br>
-<br>
 #define ASAN_DEFAULT_FAILURE_EXITCODE 1<br>
<br>
-#if defined(__linux__)<br>
-# define ASAN_LINUX   1<br>
-#else<br>
-# define ASAN_LINUX   0<br>
-#endif<br>
-<br>
-#if defined(__APPLE__)<br>
-# define ASAN_MAC     1<br>
-#else<br>
-# define ASAN_MAC     0<br>
-#endif<br>
-<br>
-#if defined(_WIN32)<br>
-# define ASAN_WINDOWS 1<br>
-#else<br>
-# define ASAN_WINDOWS 0<br>
-#endif<br>
-<br>
-#if defined(__ANDROID__) || defined(ANDROID)<br>
-# define ASAN_ANDROID 1<br>
-#else<br>
-# define ASAN_ANDROID 0<br>
-#endif<br>
-<br>
-<br>
-#define ASAN_POSIX (ASAN_LINUX || ASAN_MAC)<br>
-<br>
 #if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)<br>
 # error "The AddressSanitizer run-time should not be"<br>
         " instrumented by AddressSanitizer"<br>
@@ -63,7 +32,7 @@<br>
<br>
 // If set, asan will install its own SEGV signal handler.<br>
 #ifndef ASAN_NEEDS_SEGV<br>
-# if ASAN_ANDROID == 1<br>
+# if SANITIZER_ANDROID == 1<br>
 #  define ASAN_NEEDS_SEGV 0<br>
 # else<br>
 #  define ASAN_NEEDS_SEGV 1<br>
@@ -92,7 +61,7 @@<br>
 #endif<br>
<br>
 #ifndef ASAN_USE_PREINIT_ARRAY<br>
-# define ASAN_USE_PREINIT_ARRAY (ASAN_LINUX && !ASAN_ANDROID)<br>
+# define ASAN_USE_PREINIT_ARRAY (SANITIZER_LINUX && !SANITIZER_ANDROID)<br>
 #endif<br>
<br>
 // All internal functions in asan reside inside the __asan namespace<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_linux.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_linux.cc?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_linux.cc?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_linux.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_linux.cc Tue Mar 19 08:54:41 2013<br>
@@ -31,7 +31,7 @@<br>
 #include <unistd.h><br>
 #include <unwind.h><br>
<br>
-#if !ASAN_ANDROID<br>
+#if !SANITIZER_ANDROID<br>
 // FIXME: where to get ucontext on Android?<br>
 #include <sys/ucontext.h><br>
 #endif<br>
@@ -50,7 +50,7 @@ void *AsanDoesNotSupportStaticLinkage()<br>
 }<br>
<br>
 void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {<br>
-#if ASAN_ANDROID<br>
+#if SANITIZER_ANDROID<br>
   *pc = *sp = *bp = 0;<br>
 #elif defined(__arm__)<br>
   ucontext_t *ucontext = (ucontext_t*)context;<br>
@@ -119,7 +119,7 @@ void GetStackTrace(StackTrace *stack, up<br>
   }<br>
 }<br>
<br>
-#if !ASAN_ANDROID<br>
+#if !SANITIZER_ANDROID<br>
 void ReadContextStack(void *context, uptr *stack, uptr *ssize) {<br>
   ucontext_t *ucp = (ucontext_t*)context;<br>
   *stack = (uptr)ucp->uc_stack.ss_sp;<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_mac.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.h?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mac.h?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_mac.h (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_mac.h Tue Mar 19 08:54:41 2013<br>
@@ -11,8 +11,8 @@<br>
 //<br>
 // Mac-specific ASan definitions.<br>
 //===----------------------------------------------------------------------===//<br>
-#ifndef ASAN_MAC_H<br>
-#define ASAN_MAC_H<br>
+#ifndef SANITIZER_MAC_H<br>
+#define SANITIZER_MAC_H<br></blockquote><div><br></div><div style>I don't think you should modify header guards.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

<br>
 // CF_RC_BITS, the layout of CFRuntimeBase and __CFStrIsConstant are internal<br>
 // and subject to change in further CoreFoundation versions. Apple does not<br>
@@ -54,4 +54,4 @@ void MaybeReplaceCFAllocator();<br>
<br>
 }  // namespace __asan<br>
<br>
-#endif  // ASAN_MAC_H<br>
+#endif  // SANITIZER_MAC_H<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_malloc_linux.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_linux.cc?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_malloc_linux.cc?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_malloc_linux.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_malloc_linux.cc Tue Mar 19 08:54:41 2013<br>
@@ -21,7 +21,7 @@<br>
 #include "asan_stack.h"<br>
 #include "asan_thread_registry.h"<br>
<br>
-#if ASAN_ANDROID<br>
+#if SANITIZER_ANDROID<br>
 DECLARE_REAL_AND_INTERCEPTOR(void*, malloc, uptr size)<br>
 DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr)<br>
 DECLARE_REAL_AND_INTERCEPTOR(void*, calloc, uptr nmemb, uptr size)<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_mapping.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mapping.h?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_mapping.h?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_mapping.h (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_mapping.h Tue Mar 19 08:54:41 2013<br>
@@ -56,7 +56,7 @@ extern SANITIZER_INTERFACE_ATTRIBUTE upt<br>
 # define SHADOW_SCALE (__asan_mapping_scale)<br>
 # define SHADOW_OFFSET (__asan_mapping_offset)<br>
 #else<br>
-# if ASAN_ANDROID<br>
+# if SANITIZER_ANDROID<br>
 #  define SHADOW_SCALE (3)<br>
 #  define SHADOW_OFFSET (0)<br>
 # else<br>
@@ -67,7 +67,7 @@ extern SANITIZER_INTERFACE_ATTRIBUTE upt<br>
 #   if defined(__powerpc64__)<br>
 #    define SHADOW_OFFSET (1ULL << 41)<br>
 #   else<br>
-#    if ASAN_MAC<br>
+#    if SANITIZER_MAC<br>
 #     define SHADOW_OFFSET (1ULL << 44)<br>
 #    else<br>
 #     define SHADOW_OFFSET 0x7fff8000ULL<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_new_delete.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_new_delete.cc?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_new_delete.cc?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_new_delete.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_new_delete.cc Tue Mar 19 08:54:41 2013<br>
@@ -29,7 +29,7 @@ using namespace __asan;  // NOLINT<br>
<br>
 // On Android new() goes through malloc interceptors.<br>
 // See also <a href="https://code.google.com/p/address-sanitizer/issues/detail?id=131.
-#if" target="_blank">https://code.google.com/p/address-sanitizer/issues/detail?id=131.<br>
-#if</a> !ASAN_ANDROID<br>
+#if !SANITIZER_ANDROID<br>
<br>
 // Fake std::nothrow_t to avoid including <new>.<br>
 namespace std {<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue Mar 19 08:54:41 2013<br>
@@ -169,7 +169,7 @@ void InitializeFlags(Flags *f, const cha<br>
   f->poison_heap = true;<br>
   // Turn off alloc/dealloc mismatch checker on Mac for now.<br>
   // TODO(glider): Fix known issues and enable this back.<br>
-  f->alloc_dealloc_mismatch = (ASAN_MAC == 0);;<br>
+  f->alloc_dealloc_mismatch = (SANITIZER_MAC == 0);;<br>
   f->use_stack_depot = true;  // Only affects allocator2.<br>
   f->strict_memcmp = true;<br>
<br>
@@ -462,7 +462,7 @@ void __asan_init() {<br>
   bool full_shadow_is_available =<br>
       MemoryRangeIsAvailable(shadow_start, shadow_end);<br>
<br>
-#if ASAN_LINUX && defined(__x86_64__) && !ASAN_FIXED_MAPPING<br>
+#if SANITIZER_LINUX && defined(__x86_64__) && !ASAN_FIXED_MAPPING<br>
   if (!full_shadow_is_available) {<br>
     kMidMemBeg = kLowMemEnd < 0x3000000000ULL ? 0x3000000000ULL : 0;<br>
     kMidMemEnd = kLowMemEnd < 0x3000000000ULL ? 0x4fffffffffULL : 0;<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_thread_registry.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_thread_registry.cc?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_thread_registry.cc?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_thread_registry.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_thread_registry.cc Tue Mar 19 08:54:41 2013<br>
@@ -70,7 +70,7 @@ AsanThread *AsanThreadRegistry::GetMain(<br>
 AsanThread *AsanThreadRegistry::GetCurrent() {<br>
   AsanThreadSummary *summary = (AsanThreadSummary *)AsanTSDGet();<br>
   if (!summary) {<br>
-#if ASAN_ANDROID<br>
+#if SANITIZER_ANDROID<br>
     // On Android, libc constructor is called _after_ asan_init, and cleans up<br>
     // TSD. Try to figure out if this is still the main thread by the stack<br>
     // address. We are not entirely sure that we have correct main thread<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h?rev=177397&r1=177396&r2=177397&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h?rev=177397&r1=177396&r2=177397&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_internal_defs.h Tue Mar 19 08:54:41 2013<br>
@@ -13,6 +13,37 @@<br>
 #ifndef SANITIZER_DEFS_H<br>
 #define SANITIZER_DEFS_H<br>
<br>
+#if !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32)<br>
+# error "This operating system is not supported"<br>
+#endif<br>
+<br>
+#if defined(__linux__)<br>
+# define SANITIZER_LINUX   1<br>
+#else<br>
+# define SANITIZER_LINUX   0<br>
+#endif<br>
+<br>
+#if defined(__APPLE__)<br>
+# define SANITIZER_MAC     1<br>
+#else<br>
+# define SANITIZER_MAC     0<br>
+#endif<br>
+<br>
+#if defined(_WIN32)<br>
+# define SANITIZER_WINDOWS 1<br>
+#else<br>
+# define SANITIZER_WINDOWS 0<br>
+#endif<br>
+<br>
+#if defined(__ANDROID__) || defined(ANDROID)<br>
+# define SANITIZER_ANDROID 1<br>
+#else<br>
+# define SANITIZER_ANDROID 0<br>
+#endif<br>
+<br>
+#define SANITIZER_POSIX (SANITIZER_LINUX || SANITIZER_MAC)<br>
+<br>
+<br>
 #if defined(_WIN32)<br>
 // FIXME find out what we need on Windows. __declspec(dllexport) ?<br>
 # define SANITIZER_INTERFACE_ATTRIBUTE<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div>
</div></div>