diff options
| author | Jim Huang <jserv@0xlab.org> | 2010-08-09 05:35:11 +0800 |
|---|---|---|
| committer | Jim Huang <jserv@0xlab.org> | 2010-08-09 05:35:11 +0800 |
| commit | a1727092595a65e4dd9d9a6bae3778ad8c31d77f (patch) | |
| tree | 0d6c090d407e9975a8c6682615bc17a50caa05e9 | |
| parent | 4f086aeb4aa06e13079b7fec71a8178ceeacf318 (diff) | |
| download | bionic-a1727092595a65e4dd9d9a6bae3778ad8c31d77f.tar.gz | |
bionic: Rename _ARM_HAVE_LDREX_STREX to __ARM_HAVE_LDREX_STREX for consistency
The patch follows the naming manner in existing macros with prefix
__ARM_HAVE.
Change-Id: I6763ce2bf3ee85fd1da112c719543061d8d19bf4
| -rw-r--r-- | libc/arch-arm/bionic/atomics_arm.S | 2 | ||||
| -rw-r--r-- | libc/arch-arm/include/machine/cpu-features.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/arch-arm/bionic/atomics_arm.S b/libc/arch-arm/bionic/atomics_arm.S index 047541fc2..f2e369d0b 100644 --- a/libc/arch-arm/bionic/atomics_arm.S +++ b/libc/arch-arm/bionic/atomics_arm.S @@ -142,7 +142,7 @@ __atomic_inc: /* r0(new) r1(addr) -> r0(old) */ /* replaced swp instruction with ldrex/strex for ARMv6 & ARMv7 */ __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 diff --git a/libc/arch-arm/include/machine/cpu-features.h b/libc/arch-arm/include/machine/cpu-features.h index ecf6ff6f3..5af325bb2 100644 --- a/libc/arch-arm/include/machine/cpu-features.h +++ b/libc/arch-arm/include/machine/cpu-features.h @@ -149,11 +149,11 @@ # define __ARM_HAVE_PC_INTERWORK #endif -/* define _ARM_HAVE_LDREX_STREX for ARMv6 and ARMv7 architecure to be +/* define __ARM_HAVE_LDREX_STREX for ARMv6 and ARMv7 architecure to be * used in replacement of depricated swp instruction */ #if __ARM_ARCH__ >= 6 -# define _ARM_HAVE_LDREX_STREX +# define __ARM_HAVE_LDREX_STREX #endif |