[libcxx-commits] [PATCH] D137513: [libc++] Replace __ppc64__ with __powerpc64__

[Fangrui Song via Phabricator via libcxx-commits]

MaskRay created this revision.
MaskRay added reviewers: libc++, q66, thesamesam.
Herald added subscribers: StephenFan, steven.zhang, shchenz, nemanjai.
Herald added a project: All.
MaskRay requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added 1 blocking reviewer(s): libc++.

The lowercase `__ppc64__` is not defined by non-darwin powerpc64 GCC, therefore
it lures users to write code which is not portable to GCC. Migrate to
`__powerpc64__` in preparation for undefining `__ppc64__`. `__powerpc64__` is
much more common than `__PPC64__`.

Update alignment_of.pass.cpp to use 1 unconditionally:
on powerpc-unknown-linux-gnu `alignof(bool) = _Alignof(bool) = __alignof(bool) = 1`.
The value 4 might be derived from an ancient Clang.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D137513

Files:
  libcxx/include/limits
  libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
  libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp


Index: libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
===================================================================
--- libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
+++ libcxx/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
@@ -47,15 +47,8 @@
     test_alignment_of<const int*, sizeof(intptr_t)>();
     test_alignment_of<char[3], 1>();
     test_alignment_of<int, 4>();
-    // The test case below is a hack. It's hard to detect what golden value
-    // we should expect. In most cases it should be 8. But in i386 builds
-    // with Clang >= 8 or GCC >= 8 the value is '4'.
     test_alignment_of<double, TEST_ALIGNOF(double)>();
-#if (defined(__ppc__) && !defined(__ppc64__) && !defined(_AIX))
-    test_alignment_of<bool, 4>();   // 32-bit PPC has four byte bool, except on AIX.
-#else
     test_alignment_of<bool, 1>();
-#endif
     test_alignment_of<unsigned, 4>();
 
   return 0;
Index: libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
===================================================================
--- libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
+++ libcxx/test/std/language.support/support.limits/limits/numeric.limits.members/is_iec559.pass.cpp
@@ -50,7 +50,7 @@
 #endif
     test<float, true>();
     test<double, true>();
-#if (defined(__ppc__) || defined(__ppc64__))
+#ifdef __powerpc__
     test<long double, false>();
 #else
     test<long double, true>();
Index: libcxx/include/limits
===================================================================
--- libcxx/include/limits
+++ libcxx/include/limits
@@ -428,7 +428,7 @@
     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
     _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
 
-#if (defined(__ppc__) || defined(__ppc64__))
+#ifdef __powerpc__
     static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
 #else
     static _LIBCPP_CONSTEXPR const bool is_iec559 = true;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137513.473521.patch
Type: text/x-patch
Size: 2157 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20221107/dccbad1c/attachment.bin>