[llvm-commits] [compiler-rt] r163688 - in /compiler-rt/trunk: CMakeLists.txt lib/sanitizer_common/sanitizer_symbolizer_linux.cc

[Alexey Samsonov]

Author: samsonov
Date: Wed Sep 12 03:06:15 2012
New Revision: 163688

URL: http://llvm.org/viewvc/llvm-project?rev=163688&view=rev
Log:
[Sanitizer] Please Android build. Re-check the availability of -Wno-variadic-macros flag.

Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=163688&r1=163687&r2=163688&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Wed Sep 12 03:06:15 2012
@@ -71,11 +71,11 @@
   -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()

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc?rev=163688&r1=163687&r2=163688&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_linux.cc Wed Sep 12 03:06:15 2012
@@ -105,6 +105,7 @@
 #if defined(__ANDROID__) || defined(ANDROID)
 uptr GetListOfModules(LoadedModule *modules, uptr max_modules) {
   UNIMPLEMENTED();
+  return 0;
 }
 #else  // ANDROID
 typedef ElfW(Phdr) Elf_Phdr;