diff options
| author | Ian Rogers <irogers@google.com> | 2014-09-26 22:26:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 22:26:23 +0000 |
| commit | eaab20484de47a3ac8f69636496c371c0ec09fb3 (patch) | |
| tree | e5d848d5cb143287dd1c618e9013c8735e5ce503 /services/audioflinger | |
| parent | d061bcd3f4bd99a909933937a72d6db926e3496e (diff) | |
| parent | c53b98f3773299ca26acbe5c4a56450a76c2ecf9 (diff) | |
| download | frameworks_av-eaab20484de47a3ac8f69636496c371c0ec09fb3.zip frameworks_av-eaab20484de47a3ac8f69636496c371c0ec09fb3.tar.gz frameworks_av-eaab20484de47a3ac8f69636496c371c0ec09fb3.tar.bz2 | |
am c53b98f3: am 6cd6792a: Merge "Allow building on clang without __builtin_assume_aligned"
* commit 'c53b98f3773299ca26acbe5c4a56450a76c2ecf9':
Allow building on clang without __builtin_assume_aligned
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioResamplerSinc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/audioflinger/AudioResamplerSinc.cpp b/services/audioflinger/AudioResamplerSinc.cpp index d03e578..e6fb76c 100644 --- a/services/audioflinger/AudioResamplerSinc.cpp +++ b/services/audioflinger/AudioResamplerSinc.cpp @@ -31,7 +31,10 @@ #include "AudioResamplerSinc.h" - +#if defined(__clang__) && !__has_builtin(__builtin_assume_aligned) +#define __builtin_assume_aligned(p, a) \ + (((uintptr_t(p) % (a)) == 0) ? (p) : (__builtin_unreachable(), (p))) +#endif #if defined(__arm__) && !defined(__thumb__) #define USE_INLINE_ASSEMBLY (true) |