| commit | 9682e24bae0539babbcd3f33b8e310e6a6427a44 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 30 13:29:43 2010 -0700 |
| committer | Android Code Review <code-review@android.com> | Mon Aug 30 13:29:43 2010 -0700 |
| tree | 54b946fb63e4ec15b59b2950258a065bd37eb734 | |
| parent | 705ab8db827b0f7f3389463af67d173c8a94fc8a [diff] | |
| parent | fddc33858c857fe54d8c7f6527a3713580642252 [diff] |
Merge "libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic"
diff --git a/libcutils/atomic-android-arm.S b/libcutils/atomic-android-arm.S index 1dd2363..4d98451 100644 --- a/libcutils/atomic-android-arm.S +++ b/libcutils/atomic-android-arm.S
@@ -237,7 +237,7 @@ /* replaced swp instruction with ldrex/strex for ARMv6 & ARMv7 */ android_atomic_swap: -#if defined (_ARM_HAVE_LDREX_STREX) +#if defined (__ARM_HAVE_LDREX_STREX) 1: ldrex r2, [r1] strex r3, r0, [r1] teq r3, #0