diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2011-12-16 18:07:30 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-12-16 18:10:09 +0400 |
| commit | aa6117c59c31284d66c31256dbe672d007073cfc (patch) | |
| tree | 1852c248da6654fbbf4621cc9f3325e82da00931 | |
| parent | 760f85f04e4e607026720ce6a99a1e465fbafc86 (diff) | |
| download | libatomic_ops-aa6117c59c31284d66c31256dbe672d007073cfc.tar.gz | |
Fix __ARM_ARCH_5__ macro handling for Android NDK (ARMv7)
* src/atomic_ops/sysdeps/gcc/arm.h (__ARM_ARCH_7__, __ARM_ARCH_7A__):
Recognize to override __ARM_ARCH_5xx__ macros (since Android NDK GCC
defines both for armv7); update comment.
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/arm.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h index 3e5fd02..2a4520c 100644 --- a/src/atomic_ops/sysdeps/gcc/arm.h +++ b/src/atomic_ops/sysdeps/gcc/arm.h @@ -53,13 +53,14 @@ #endif /* !__thumb__ */ /* NEC LE-IT: gcc has no way to easily check the arm architecture */ -/* but it defines only one of __ARM_ARCH_x__ to be true. */ +/* but it defines only one (or several) of __ARM_ARCH_x__ to be true. */ #if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__) \ && !defined(__ARM_ARCH_3M__) && !defined(__ARM_ARCH_4__) \ - && !defined(__ARM_ARCH_4T__) && !defined(__ARM_ARCH_5__) \ - && !defined(__ARM_ARCH_5E__) && !defined(__ARM_ARCH_5T__) \ - && !defined(__ARM_ARCH_5TE__) && !defined(__ARM_ARCH_5TEJ__) \ - && !defined(__ARM_ARCH_6M__) + && !defined(__ARM_ARCH_4T__) \ + && ((!defined(__ARM_ARCH_5__) && !defined(__ARM_ARCH_5E__) \ + && !defined(__ARM_ARCH_5T__) && !defined(__ARM_ARCH_5TE__) \ + && !defined(__ARM_ARCH_5TEJ__) && !defined(__ARM_ARCH_6M__)) \ + || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)) #include "../standard_ao_double_t.h" |