diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-09-12 08:06:15 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-09-12 08:06:15 +0000 |
| commit | 3d53c4ecf6a6d451ea94ce1313c8a13794dca90a (patch) | |
| tree | eef02bc8892e15dbc294cfd392131767c5e0cba0 | |
| parent | b9e2202049f00596bf25fce71dba7588a165c669 (diff) | |
| download | bcm5719-llvm-3d53c4ecf6a6d451ea94ce1313c8a13794dca90a.tar.gz bcm5719-llvm-3d53c4ecf6a6d451ea94ce1313c8a13794dca90a.zip | |
[Sanitizer] Please Android build. Re-check the availability of -Wno-variadic-macros flag.
llvm-svn: 163688
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_linux.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index a10a83bfe5e..0b728c21a98 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -71,11 +71,11 @@ set(SANITIZER_COMMON_CFLAGS -fvisibility=hidden -O3 ) +check_cxx_compiler_flag(-Wno-variadic-macros SUPPORTS_NO_VARIADIC_MACROS_FLAG) if(SUPPORTS_NO_VARIADIC_MACROS_FLAG) list(APPEND SANITIZER_COMMON_CFLAGS -Wno-variadic-macros) endif() -check_cxx_compiler_flag(-Wno-c99-extensions - SUPPORTS_NO_C99_EXTENSIONS_FLAG) +check_cxx_compiler_flag(-Wno-c99-extensions SUPPORTS_NO_C99_EXTENSIONS_FLAG) if(SUPPORTS_NO_C99_EXTENSIONS_FLAG) list(APPEND SANITIZER_COMMON_CFLAGS -Wno-c99-extensions) endif() diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_linux.cc index 6125cda96aa..f65ed0f3702 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_linux.cc @@ -105,6 +105,7 @@ bool StartSymbolizerSubprocess(const char *path_to_symbolizer, #if defined(__ANDROID__) || defined(ANDROID) uptr GetListOfModules(LoadedModule *modules, uptr max_modules) { UNIMPLEMENTED(); + return 0; } #else // ANDROID typedef ElfW(Phdr) Elf_Phdr; |
