Back-patch HEAD's fixes to recognize __ppc64__ as equivalent to __powerpc64__.

Per confirmation from Brian Wipf that this is correct and necessary for
Darwin 64-bit.

diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index d8c6c836896d05fa54da190e781cd59351b8471c..ea917c393c2c6d230cd52716f5f084c6a76267fc 100644 (file)
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -323,10 +323,11 @@ tas(volatile slock_t *lock)
 #endif  /* __sparc__ */
 
 
-#if defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
+/* PowerPC */
+#if defined(__ppc__) || defined(__powerpc__) || defined(__ppc64__) || defined(__powerpc64__)
 #define HAS_TEST_AND_SET
 
-#if defined(__powerpc64__)
+#if defined(__ppc64__) || defined(__powerpc64__)
 typedef unsigned long slock_t;
 #else
 typedef unsigned int slock_t;
@@ -366,7 +367,7 @@ tas(volatile slock_t *lock)
 /* PowerPC S_UNLOCK is almost standard but requires a "sync" instruction */
 #define S_UNLOCK(lock) \
 do \
-{\
+{ \
        __asm__ __volatile__ (" sync \n"); \
        *((volatile slock_t *) (lock)) = 0; \
 } while (0)