diff options
| author | Evgeniy Stepanov <eugenis@google.com> | 2012-04-04 20:23:54 +0400 |
|---|---|---|
| committer | Evgeniy Stepanov <eugenis@google.com> | 2012-04-11 16:57:03 +0400 |
| commit | 95b0899ad3412596baa600b22ea2ecd7dd1acc43 (patch) | |
| tree | af6e14b1691165d3af425ea0ba709893ce670dc7 /vm/Atomic.cpp | |
| parent | deb0790505e6b1d4dccd90fce48585d411f0f006 (diff) | |
| download | android_dalvik-95b0899ad3412596baa600b22ea2ecd7dd1acc43.tar.gz android_dalvik-95b0899ad3412596baa600b22ea2ecd7dd1acc43.tar.bz2 android_dalvik-95b0899ad3412596baa600b22ea2ecd7dd1acc43.zip | |
Support building Dalvik with AddressSanitizer.
Change-Id: I007c5080081a4a66b39fa6b539afd8f00fd8ce0f
Diffstat (limited to 'vm/Atomic.cpp')
| -rw-r--r-- | vm/Atomic.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vm/Atomic.cpp b/vm/Atomic.cpp index 98ff7d0f0..f53a7e40c 100644 --- a/vm/Atomic.cpp +++ b/vm/Atomic.cpp @@ -85,7 +85,8 @@ int64_t dvmQuasiAtomicRead64(volatile const int64_t* addr) #elif __arm__ #include <machine/cpu-features.h> -#ifdef __ARM_HAVE_LDREXD +// Clang can not process this assembly at the moment. +#if defined(__ARM_HAVE_LDREXD) && !defined(__clang__) static inline int64_t dvmQuasiAtomicSwap64Body(int64_t newvalue, volatile int64_t* addr) { |