[llvm-commits] [compiler-rt] r159988 - in /compiler-rt/trunk/lib: asan/asan_rtl.cc sanitizer_common/CMakeLists.txt sanitizer_common/sanitizer_flags.h

[Alexey Samsonov]

Author: samsonov
Date: Tue Jul 10 04:17:06 2012
New Revision: 159988

URL: http://llvm.org/viewvc/llvm-project?rev=159988&view=rev
Log:
[Sanitizer] fix CMake build

Modified:
    compiler-rt/trunk/lib/asan/asan_rtl.cc
    compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=159988&r1=159987&r2=159988&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue Jul 10 04:17:06 2012
@@ -59,7 +59,7 @@
 namespace __asan {
 
 // -------------------------- Flags ------------------------- {{{1
-static const uptr kMallocContextSize = 30;
+static const int kMallocContextSize = 30;
 
 static Flags asan_flags;
 

Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=159988&r1=159987&r2=159988&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Tue Jul 10 04:17:06 2012
@@ -4,6 +4,7 @@
 set(SANITIZER_SOURCES
   sanitizer_allocator.cc
   sanitizer_common.cc
+  sanitizer_flags.cc
   sanitizer_libc.cc
   sanitizer_linux.cc
   sanitizer_mac.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h?rev=159988&r1=159987&r2=159988&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_flags.h Tue Jul 10 04:17:06 2012
@@ -14,7 +14,7 @@
 #ifndef SANITIZER_FLAGS_H
 #define SANITIZER_FLAGS_H
 
-#include "sanitizer_common/sanitizer_internal_defs.h"
+#include "sanitizer_internal_defs.h"
 
 namespace __sanitizer {