[llvm-commits] [compiler-rt] r159514 - in /compiler-rt/trunk/lib: asan/CMakeLists.txt asan/asan_thread_registry.h sanitizer_common/sanitizer_atomic.h

[Alexey Samsonov]

Author: samsonov
Date: Mon Jul  2 01:48:10 2012
New Revision: 159514

URL: http://llvm.org/viewvc/llvm-project?rev=159514&view=rev
Log:
[ASan] cmake cleanup: make tab/space padding in CMakeLists consistent, silence/fix some pedantic warnings

Modified:
    compiler-rt/trunk/lib/asan/CMakeLists.txt
    compiler-rt/trunk/lib/asan/asan_thread_registry.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=159514&r1=159513&r2=159514&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Mon Jul  2 01:48:10 2012
@@ -29,10 +29,13 @@
   -funwind-tables
   -fvisibility=hidden
   )
+if (SUPPORTS_NO_VARIADIC_MACROS_FLAG)
+  list(APPEND ASAN_CFLAGS -Wno-variadic-macros)
+endif ()
 
 set(ASAN_COMMON_DEFINITIONS
-	ASAN_HAS_EXCEPTIONS=1
-	ASAN_NEEDS_SEGV=1
+  ASAN_HAS_EXCEPTIONS=1
+  ASAN_NEEDS_SEGV=1
   )
 
 if(CAN_TARGET_X86_64)
@@ -42,11 +45,11 @@
     $<TARGET_OBJECTS:RTSanitizerCommon.x86_64>
     )
   set_target_compile_flags(clang_rt.asan-x86_64
-		${ASAN_CFLAGS}
+    ${ASAN_CFLAGS}
     ${TARGET_X86_64_CFLAGS}
     )
-	set_property(TARGET clang_rt.asan-x86_64 APPEND PROPERTY COMPILE_DEFINITIONS
-		${ASAN_COMMON_DEFINITIONS})
+  set_property(TARGET clang_rt.asan-x86_64 APPEND PROPERTY COMPILE_DEFINITIONS
+    ${ASAN_COMMON_DEFINITIONS})
 endif()
 if(CAN_TARGET_I386)
   add_library(clang_rt.asan-i386 STATIC
@@ -55,11 +58,11 @@
     $<TARGET_OBJECTS:RTSanitizerCommon.i386>
     )
   set_target_compile_flags(clang_rt.asan-i386
-		${ASAN_CFLAGS}
+    ${ASAN_CFLAGS}
     ${TARGET_I386_CFLAGS}
     )
-	set_property(TARGET clang_rt.asan-x86_64 APPEND PROPERTY COMPILE_DEFINITIONS
-		${ASAN_COMMON_DEFINITIONS})
+  set_property(TARGET clang_rt.asan-x86_64 APPEND PROPERTY COMPILE_DEFINITIONS
+    ${ASAN_COMMON_DEFINITIONS})
 endif()
 
 if(LLVM_INCLUDE_TESTS)

Modified: compiler-rt/trunk/lib/asan/asan_thread_registry.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_thread_registry.h?rev=159514&r1=159513&r2=159514&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_thread_registry.h (original)
+++ compiler-rt/trunk/lib/asan/asan_thread_registry.h Mon Jul  2 01:48:10 2012
@@ -63,7 +63,7 @@
   // and fills "stats" with zeroes.
   void FlushToAccumulatedStatsUnlocked(AsanStats *stats);
 
-  static const int kMaxNumberOfThreads = (1 << 22);  // 4M
+  static const u32 kMaxNumberOfThreads = (1 << 22);  // 4M
   AsanThreadSummary *thread_summaries_[kMaxNumberOfThreads];
   AsanThread main_thread_;
   AsanThreadSummary main_thread_summary_;

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h?rev=159514&r1=159513&r2=159514&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h Mon Jul  2 01:48:10 2012
@@ -24,7 +24,7 @@
   memory_order_acquire = 1 << 2,
   memory_order_release = 1 << 3,
   memory_order_acq_rel = 1 << 4,
-  memory_order_seq_cst = 1 << 5,
+  memory_order_seq_cst = 1 << 5
 };
 
 struct atomic_uint8_t {