[compiler-rt] r205311 - [ASan] Fix Android build

Alexey Samsonov samsonov at google.com
Tue Apr 1 06:42:17 PDT 2014


Author: samsonov
Date: Tue Apr  1 08:42:16 2014
New Revision: 205311

URL: http://llvm.org/viewvc/llvm-project?rev=205311&view=rev
Log:
[ASan] Fix Android build

Modified:
    compiler-rt/trunk/lib/asan/asan_linux.cc

Modified: compiler-rt/trunk/lib/asan/asan_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_linux.cc?rev=205311&r1=205310&r2=205311&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_linux.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_linux.cc Tue Apr  1 08:42:16 2014
@@ -76,6 +76,7 @@ void *AsanDoesNotSupportStaticLinkage()
   return &_DYNAMIC;  // defined in link.h
 }
 
+#if !SANITIZER_ANDROID
 static int FindFirstDSOCallback(struct dl_phdr_info *info, size_t size,
                                 void *data) {
   // Continue until the first dynamic library is found
@@ -85,6 +86,7 @@ static int FindFirstDSOCallback(struct d
   *(const char **)data = info->dlpi_name;
   return 1;
 }
+#endif
 
 static bool IsDynamicRTName(const char *libname) {
   return internal_strstr(libname, "libclang_rt.asan") ||





More information about the llvm-commits mailing list