diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-07-10 09:17:06 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-07-10 09:17:06 +0000 |
| commit | 2d4bd13eb62614ceb013ca4beae1036266934794 (patch) | |
| tree | a5f8752a3b28adbd301b44954c59efb7de8db8c8 | |
| parent | af18d52c09ea73756f274336248b1c9dee58729a (diff) | |
| download | bcm5719-llvm-2d4bd13eb62614ceb013ca4beae1036266934794.tar.gz bcm5719-llvm-2d4bd13eb62614ceb013ca4beae1036266934794.zip | |
[Sanitizer] fix CMake build
llvm-svn: 159988
| -rw-r--r-- | compiler-rt/lib/asan/asan_rtl.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_flags.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc index 4da1f24ba22..6f717081d2f 100644 --- a/compiler-rt/lib/asan/asan_rtl.cc +++ b/compiler-rt/lib/asan/asan_rtl.cc @@ -59,7 +59,7 @@ void CheckFailed(const char *file, int line, const char *cond, u64 v1, u64 v2) { namespace __asan { // -------------------------- Flags ------------------------- {{{1 -static const uptr kMallocContextSize = 30; +static const int kMallocContextSize = 30; static Flags asan_flags; diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt index a329d8245a4..d797a56dabd 100644 --- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt @@ -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 diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flags.h b/compiler-rt/lib/sanitizer_common/sanitizer_flags.h index 43afe8221a4..b7ce4524b05 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_flags.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_flags.h @@ -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 { |
