diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-20 15:35:01 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-20 15:35:01 +0000 |
| commit | 75a00b772e5e035a420eb9639eba1dacf191f7d4 (patch) | |
| tree | 39de222f836119b15454355b962cfc8e408aa1b9 /lib/builtins/clear_cache.c | |
| parent | d97858de5d17a669dcdf6c0b3c0eaf9d6e4fef75 (diff) | |
Fix checks for Android.
__ANDROID__ is a define that comes from the toolchain when building
for Android targets. ANDROID has a different meaning. ANDROID is
defined for _every_ Android build, including those done for host
modules. For host modules, we want to build the regular Linux
sanitizers and builtins, not the one for Android devices. This hasn't
been a problem until now because we only just started building the
sanitizers for the host.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220203 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/builtins/clear_cache.c')
| -rw-r--r-- | lib/builtins/clear_cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/builtins/clear_cache.c b/lib/builtins/clear_cache.c index e0bd8b045..86e68afad 100644 --- a/lib/builtins/clear_cache.c +++ b/lib/builtins/clear_cache.c @@ -17,11 +17,11 @@ #include <machine/sysarch.h> #endif -#if defined(ANDROID) && defined(__mips__) +#if defined(__ANDROID__) && defined(__mips__) #include <sys/cachectl.h> #endif -#if defined(ANDROID) && defined(__arm__) +#if defined(__ANDROID__) && defined(__arm__) #include <asm/unistd.h> #endif @@ -46,7 +46,7 @@ void __clear_cache(void *start, void *end) { arg.len = (uintptr_t)end - (uintptr_t)start; sysarch(ARM_SYNC_ICACHE, &arg); - #elif defined(ANDROID) + #elif defined(__ANDROID__) const register int start_reg __asm("r0") = (int) (intptr_t) start; const register int end_reg __asm("r1") = (int) (intptr_t) end; const register int flags __asm("r2") = 0; @@ -59,7 +59,7 @@ void __clear_cache(void *start, void *end) { #else compilerrt_abort(); #endif -#elif defined(ANDROID) && defined(__mips__) +#elif defined(__ANDROID__) && defined(__mips__) const uintptr_t start_int = (uintptr_t) start; const uintptr_t end_int = (uintptr_t) end; _flush_cache(start, (end_int - start_int), BCACHE); |