Changeset 199366 in webkit

Timestamp:

Apr 12, 2016 9:44:36 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

S390X and PPC64 architectures detection is wrong
​https://bugs.webkit.org/show_bug.cgi?id=156337

Patch by Tomas Popela <​tpopela@redhat.com> on 2016-04-12
Reviewed by Carlos Garcia Campos.

After the ​http://trac.webkit.org/changeset/198919 was committed
it showed that the PPC64 detection is wrong as the CPU(PPC) path was
activated even for PPC64. The thing is that GCC defines ppc
even on PPC64 and not just on PPC(32). The same applies for S390X.

• wtf/Platform.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (4 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-04-12  Tomas Popela  <tpopela@redhat.com>
+
+        S390X and PPC64 architectures detection is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=156337
+
+        Reviewed by Carlos Garcia Campos.
+
+        After the http://trac.webkit.org/changeset/198919 was committed
+        it showed that the PPC64 detection is wrong as the CPU(PPC) path was
+        activated even for PPC64. The thing is that GCC defines __ppc__
+        even on PPC64 and not just on PPC(32). The same applies for S390X.
+
+        * wtf/Platform.h:
+
 2016-04-05  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -104 +104 @@
 #endif /* MIPS */
 
+/* CPU(PPC64) - PowerPC 64-bit Big Endian */
+#if (  defined(__ppc64__)      \
+    || defined(__PPC64__))     \
+    && defined(__BYTE_ORDER__) \
+    && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#define WTF_CPU_PPC64 1
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
+/* CPU(PPC64) - PowerPC 64-bit Little Endian */
+#if (   defined(__ppc64__)     \
+    || defined(__PPC64__)      \
+    || defined(__ppc64le__)    \
+    || defined(__PPC64LE__))   \
+    && defined(__BYTE_ORDER__) \
+    && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#define WTF_CPU_PPC64LE 1
+#endif
+
 /* CPU(PPC) - PowerPC 32-bit */
 #if (  defined(__ppc__)        \
@@ -112 +131 @@
     || defined(_M_PPC)         \
     || defined(__PPC))         \
+    && !CPU(PPC64)             \
     && defined(__BYTE_ORDER__) \
     && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
@@ -118 +138 @@
 #endif
 
-/* CPU(PPC64) - PowerPC 64-bit Big Endian */
-#if (  defined(__ppc64__)      \
-    || defined(__PPC64__))     \
-    && defined(__BYTE_ORDER__) \
-    && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#define WTF_CPU_PPC64 1
-#define WTF_CPU_BIG_ENDIAN 1
-#endif
-
-/* CPU(PPC64) - PowerPC 64-bit Little Endian */
-#if (   defined(__ppc64__)     \
-    || defined(__PPC64__)      \
-    || defined(__ppc64le__)    \
-    || defined(__PPC64LE__))   \
-    && defined(__BYTE_ORDER__) \
-    && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define WTF_CPU_PPC64LE 1
-#endif
-
 /* CPU(SH4) - SuperH SH-4 */
 #if defined(__SH4__)
@@ -149 +150 @@
 
 /* CPU(S390) - S390 32-bit */
-#if defined(__s390__)
+#if (  defined(__s390__)        \
+    && !CPU(S390X))
 #define WTF_CPU_S390 1
 #define WTF_CPU_BIG_ENDIAN 1