projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bdfa6c2
)
[ASan] Fix Android build
author
Alexey Samsonov
<samsonov@google.com>
Tue, 1 Apr 2014 13:42:16 +0000
(13:42 +0000)
committer
Alexey Samsonov
<samsonov@google.com>
Tue, 1 Apr 2014 13:42:16 +0000
(13:42 +0000)
llvm-svn: 205311
compiler-rt/lib/asan/asan_linux.cc
patch
|
blob
|
history
diff --git
a/compiler-rt/lib/asan/asan_linux.cc
b/compiler-rt/lib/asan/asan_linux.cc
index c6085aa7b05647d1a4a5bd3a89d3b45ca3d85535..962a0abc07b213c5aec11295b9e822dbd2f830bb 100644
(file)
--- a/
compiler-rt/lib/asan/asan_linux.cc
+++ b/
compiler-rt/lib/asan/asan_linux.cc
@@
-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 dl_phdr_info *info, size_t size,
*(const char **)data = info->dlpi_name;
return 1;
}
+#endif
static bool IsDynamicRTName(const char *libname) {
return internal_strstr(libname, "libclang_rt.asan") ||