Title: [199366] trunk/Source/WTF
- Revision
- 199366
- Author
- [email protected]
- Date
- 2016-04-12 09:44:36 -0700 (Tue, 12 Apr 2016)
Log Message
S390X and PPC64 architectures detection is wrong
https://bugs.webkit.org/show_bug.cgi?id=156337
Patch by Tomas Popela <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (199365 => 199366)
--- trunk/Source/WTF/ChangeLog 2016-04-12 16:41:29 UTC (rev 199365)
+++ trunk/Source/WTF/ChangeLog 2016-04-12 16:44:36 UTC (rev 199366)
@@ -1,3 +1,17 @@
+2016-04-12 Tomas Popela <[email protected]>
+
+ 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 <[email protected]>
Remove compile time define for SEPARATED_HEAP
Modified: trunk/Source/WTF/wtf/Platform.h (199365 => 199366)
--- trunk/Source/WTF/wtf/Platform.h 2016-04-12 16:41:29 UTC (rev 199365)
+++ trunk/Source/WTF/wtf/Platform.h 2016-04-12 16:44:36 UTC (rev 199366)
@@ -103,20 +103,6 @@
#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
#endif /* MIPS */
-/* CPU(PPC) - PowerPC 32-bit */
-#if ( defined(__ppc__) \
- || defined(__PPC__) \
- || defined(__powerpc__) \
- || defined(__powerpc) \
- || defined(__POWERPC__) \
- || defined(_M_PPC) \
- || defined(__PPC)) \
- && defined(__BYTE_ORDER__) \
- && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-#define WTF_CPU_PPC 1
-#define WTF_CPU_BIG_ENDIAN 1
-#endif
-
/* CPU(PPC64) - PowerPC 64-bit Big Endian */
#if ( defined(__ppc64__) \
|| defined(__PPC64__)) \
@@ -136,6 +122,21 @@
#define WTF_CPU_PPC64LE 1
#endif
+/* CPU(PPC) - PowerPC 32-bit */
+#if ( defined(__ppc__) \
+ || defined(__PPC__) \
+ || defined(__powerpc__) \
+ || defined(__powerpc) \
+ || defined(__POWERPC__) \
+ || defined(_M_PPC) \
+ || defined(__PPC)) \
+ && !CPU(PPC64) \
+ && defined(__BYTE_ORDER__) \
+ && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+#define WTF_CPU_PPC 1
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
/* CPU(SH4) - SuperH SH-4 */
#if defined(__SH4__)
#define WTF_CPU_SH4 1
@@ -148,7 +149,8 @@
#endif
/* CPU(S390) - S390 32-bit */
-#if defined(__s390__)
+#if ( defined(__s390__) \
+ && !CPU(S390X))
#define WTF_CPU_S390 1
#define WTF_CPU_BIG_ENDIAN 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
