summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-09-12 08:06:15 +0000
committerAlexey Samsonov <samsonov@google.com>2012-09-12 08:06:15 +0000
commit721460bdcbc29605381ee7658e6d0c233da0da8d (patch)
tree4d3758fbeabc05539584d02e26949a3ec25bce04
parentb43d6a8ca10b9af8a903e8726003ae7767f9e823 (diff)
downloadcompiler-rt-721460bdcbc29605381ee7658e6d0c233da0da8d.tar.gz
compiler-rt-721460bdcbc29605381ee7658e6d0c233da0da8d.tar.bz2
compiler-rt-721460bdcbc29605381ee7658e6d0c233da0da8d.tar.xz
[Sanitizer] Please Android build. Re-check the availability of -Wno-variadic-macros flag.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163688 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt4
-rw-r--r--lib/sanitizer_common/sanitizer_symbolizer_linux.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a10a83bf..0b728c21 100644
--- a/CMakeLists.txt
+++ b/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/lib/sanitizer_common/sanitizer_symbolizer_linux.cc b/lib/sanitizer_common/sanitizer_symbolizer_linux.cc
index 6125cda9..f65ed0f3 100644
--- a/lib/sanitizer_common/sanitizer_symbolizer_linux.cc
+++ b/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;