From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 16 Dec 2011 14:07:30 +0000 (+0400)
Subject: Fix __ARM_ARCH_5__ macro handling for Android NDK (ARMv7)
X-Git-Tag: libatomic_ops-7_3alpha2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9851f7728056ab6d0adf473ec0351523df51822;p=platform%2Fupstream%2Flibatomic_ops.git

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.
---

diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h
index 4496d9a..19bef67 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"