diff options
author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-08-27 11:15:55 +0000 |
---|---|---|
committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-08-27 11:15:55 +0000 |
commit | 3891ce634380845d337cd865e559f4abbdc8ebdb (patch) | |
tree | 6333c90d33df9d35e9fb9772a0e8f74bd550515f /lib | |
parent | 70e177e29c6f9ac987b65a79f6b4f3ebdabc75cc (diff) |
A few tweaks for building ASanRT against Android NDK.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162666 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/asan/asan_internal.h | 7 | ||||
-rw-r--r-- | lib/asan/asan_linux.cc | 4 | ||||
-rw-r--r-- | lib/asan/asan_malloc_linux.cc | 2 | ||||
-rw-r--r-- | lib/asan/asan_mapping.h | 2 | ||||
-rw-r--r-- | lib/asan/asan_new_delete.cc | 2 | ||||
-rw-r--r-- | lib/asan/asan_thread_registry.cc | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_symbolizer_linux.cc | 7 |
7 files changed, 18 insertions, 8 deletions
diff --git a/lib/asan/asan_internal.h b/lib/asan/asan_internal.h index a283c2b8e..4f34a79cc 100644 --- a/lib/asan/asan_internal.h +++ b/lib/asan/asan_internal.h @@ -48,6 +48,13 @@ extern "C" void* _ReturnAddress(void); # define ASAN_WINDOWS 0 #endif +#if defined(__ANDROID__) || defined(ANDROID) +# define ASAN_ANDROID 1 +#else +# define ASAN_ANDROID 0 +#endif + + #define ASAN_POSIX (ASAN_LINUX || ASAN_MAC) #if __has_feature(address_sanitizer) diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc index ddaefb29f..e5d1f52d3 100644 --- a/lib/asan/asan_linux.cc +++ b/lib/asan/asan_linux.cc @@ -31,7 +31,7 @@ #include <unistd.h> #include <unwind.h> -#ifndef ANDROID +#if !ASAN_ANDROID // FIXME: where to get ucontext on Android? #include <sys/ucontext.h> #endif @@ -50,7 +50,7 @@ void *AsanDoesNotSupportStaticLinkage() { } void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { -#ifdef ANDROID +#if ASAN_ANDROID *pc = *sp = *bp = 0; #elif defined(__arm__) ucontext_t *ucontext = (ucontext_t*)context; diff --git a/lib/asan/asan_malloc_linux.cc b/lib/asan/asan_malloc_linux.cc index 1fe848d68..005e37d13 100644 --- a/lib/asan/asan_malloc_linux.cc +++ b/lib/asan/asan_malloc_linux.cc @@ -20,7 +20,7 @@ #include "asan_internal.h" #include "asan_stack.h" -#ifdef ANDROID +#if ASAN_ANDROID DECLARE_REAL_AND_INTERCEPTOR(void*, malloc, uptr size); DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr); DECLARE_REAL_AND_INTERCEPTOR(void*, calloc, uptr nmemb, uptr size); diff --git a/lib/asan/asan_mapping.h b/lib/asan/asan_mapping.h index 8e0c6ec5d..40e32206d 100644 --- a/lib/asan/asan_mapping.h +++ b/lib/asan/asan_mapping.h @@ -25,7 +25,7 @@ extern __attribute__((visibility("default"))) uptr __asan_mapping_offset; # define SHADOW_SCALE (__asan_mapping_scale) # define SHADOW_OFFSET (__asan_mapping_offset) #else -# ifdef ANDROID +# if ASAN_ANDROID # define SHADOW_SCALE (3) # define SHADOW_OFFSET (0) # else diff --git a/lib/asan/asan_new_delete.cc b/lib/asan/asan_new_delete.cc index 4a7275842..0c7d97c6d 100644 --- a/lib/asan/asan_new_delete.cc +++ b/lib/asan/asan_new_delete.cc @@ -32,7 +32,7 @@ using namespace __asan; // NOLINT GET_STACK_TRACE_HERE_FOR_MALLOC;\ return asan_memalign(0, size, &stack); -#ifdef ANDROID +#if ASAN_ANDROID void *operator new(size_t size) { OPERATOR_NEW_BODY; } void *operator new[](size_t size) { OPERATOR_NEW_BODY; } #else diff --git a/lib/asan/asan_thread_registry.cc b/lib/asan/asan_thread_registry.cc index 7c9747bd7..99552f048 100644 --- a/lib/asan/asan_thread_registry.cc +++ b/lib/asan/asan_thread_registry.cc @@ -69,7 +69,7 @@ AsanThread *AsanThreadRegistry::GetMain() { AsanThread *AsanThreadRegistry::GetCurrent() { AsanThreadSummary *summary = (AsanThreadSummary *)AsanTSDGet(); if (!summary) { -#ifdef ANDROID +#if ASAN_ANDROID // On Android, libc constructor is called _after_ asan_init, and cleans up // TSD. Try to figure out if this is still the main thread by the stack // address. We are not entirely sure that we have correct main thread diff --git a/lib/sanitizer_common/sanitizer_symbolizer_linux.cc b/lib/sanitizer_common/sanitizer_symbolizer_linux.cc index 0a300007e..6a76647b0 100644 --- a/lib/sanitizer_common/sanitizer_symbolizer_linux.cc +++ b/lib/sanitizer_common/sanitizer_symbolizer_linux.cc @@ -20,12 +20,15 @@ #include <elf.h> #include <errno.h> -#include <link.h> #include <poll.h> #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> +#if !defined(__ANDROID__) && !defined(ANDROID) +#include <link.h> +#endif + namespace __sanitizer { bool StartSymbolizerSubprocess(const char *path_to_symbolizer, @@ -99,7 +102,7 @@ bool StartSymbolizerSubprocess(const char *path_to_symbolizer, return true; } -#ifdef ANDROID +#if defined(__ANDROID__) || defined(ANDROID) uptr GetListOfModules(LoadedModule *modules, uptr max_modules) { UNIMPLEMENTED(); } |