3 files changed, 9 insertions, 11 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index c64bbe2821..c611087043 100644
--- a/src/corelib/arch/arch.pri
+++ b/src/corelib/arch/arch.pri
@@ -12,7 +12,7 @@ HEADERS += \
     arch/qatomic_i386.h \
     arch/qatomic_ia64.h \
     arch/qatomic_mips.h \
-    arch/qatomic_powerpc.h \
+    arch/qatomic_power.h \
     arch/qatomic_s390.h \
     arch/qatomic_sh4a.h \
     arch/qatomic_sparc.h \
diff --git a/src/corelib/arch/qatomic_powerpc.h b/src/corelib/arch/qatomic_power.h
index 10f6e4c488..a531dfedc8 100644
--- a/src/corelib/arch/qatomic_powerpc.h
+++ b/src/corelib/arch/qatomic_power.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QATOMIC_POWERPC_H
-#define QATOMIC_POWERPC_H
+#ifndef QATOMIC_POWER_H
+#define QATOMIC_POWER_H
 
 #include <QtCore/qoldbasicatomic.h>
 
@@ -105,13 +105,11 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
 
 #if defined(Q_CC_GNU)
 
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) \
-    || (!defined(__64BIT__) && !defined(__powerpc64__) && !defined(__ppc64__))
+#ifdef Q_PROCESSOR_POWER_32
 #  define _Q_VALUE "0, %[_q_value]"
 #  define _Q_VALUE_MEMORY_OPERAND "+m" (_q_value)
 #  define _Q_VALUE_REGISTER_OPERAND [_q_value] "r" (&_q_value),
-#else
-// On 64-bit with gcc >= 4.2
+#else // Q_PROCESSOR_POWER_64
 #  define _Q_VALUE "%y[_q_value]"
 #  define _Q_VALUE_MEMORY_OPERAND [_q_value] "+Z" (_q_value)
 #  define _Q_VALUE_REGISTER_OPERAND
@@ -301,7 +299,7 @@ inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
     return originalValue;
 }
 
-#if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__)
+#ifdef Q_PROCESSOR_POWER_64
 #  define LPARX "ldarx"
 #  define STPCX "stdcx."
 #else
@@ -475,7 +473,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo
 #undef _Q_VALUE_REGISTER_OPERAND
 
 #else
-#  error "This compiler for PowerPC is not supported"
+#  error "This compiler for Power/PowerPC is not supported"
 #endif
 
 inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
@@ -515,4 +513,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QATOMIC_POWERPC_H
+#endif // QATOMIC_POWER_H
diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h
index dbec16a540..564a07f3ea 100644
--- a/src/corelib/arch/qatomic_vxworks.h
+++ b/src/corelib/arch/qatomic_vxworks.h
@@ -45,7 +45,7 @@
 QT_BEGIN_HEADER
 
 #if defined(__ppc)
-#  include <QtCore/qatomic_powerpc.h>
+#  include <QtCore/qatomic_power.h>
 #else // generic implementation with taskLock()
 
 #include <QtCore/qoldbasicatomic.h>