[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-atomic-private.hh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bb31e4497523442fbb26bbd55b194ab70205ca4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Nov 20 14:21:07 2013 -0500

    Bug 71845 - Use 64-bit cmpexch on ARM64 iOS

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index 9cc3bc5..b5d6485 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -78,7 +78,7 @@ typedef int32_t hb_atomic_int_t;
 #if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
 #define hb_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
 #else
-#if __ppc64__ || __x86_64__
+#if __ppc64__ || __x86_64__ || __arm64__
 #define hb_atomic_ptr_cmpexch(P,O,N)    OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
 #else
 #define hb_atomic_ptr_cmpexch(P,O,N)    OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P))