List of changes:

 - Move clang's case to the top.
 - Extract char8_t part of the tests into its own files.
 - Remove test that has little use.
 - Undo the creation of a feature just for the AIX platform.

Author: vhscampos

libcxx/include/__config

@@ -1021,14 +1021,14 @@ typedef __char32_t char32_t;
 // the latter depends on internal GNU libc details that are not appropriate
 // to depend on here, so any declarations present when __cpp_char8_t is not
 // defined are ignored.
-#  if defined(_LIBCPP_GLIBC_PREREQ)
+#  if defined(__clang__)
+#    define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
+#  elif defined(_LIBCPP_GLIBC_PREREQ)
 #    if _LIBCPP_GLIBC_PREREQ(2, 36) && defined(__cpp_char8_t)
 #      define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
 #    else
 #      define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
 #    endif
-#  elif defined(__clang__)
-#    define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
 #  else
 #    define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
 #  endif

libcxx/test/std/depr/depr.c.headers/uchar_h.compile.pass.cpp

@@ -11,11 +11,6 @@
 // Apple platforms don't provide <uchar.h> yet, so these tests fail.
 // XFAIL: target={{.+}}-apple-{{.+}}
 
-// The following platforms do not provide mbrtoc8 and c8rtomb so the tests fail
-// XFAIL: aix
-// XFAIL: freebsd
-// XFAIL: windows
-
 // mbrtoc16 not defined.
 // XFAIL: LIBCXX-PICOLIBC-FIXME
 
@@ -28,11 +23,6 @@
 // __STDC_UTF_16__ may or may not be defined by the C standard library
 // __STDC_UTF_32__ may or may not be defined by the C standard library
 
-#if !defined(TEST_HAS_NO_C8RTOMB_MBRTOC8)
-ASSERT_SAME_TYPE(size_t, decltype(mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
-ASSERT_SAME_TYPE(size_t, decltype(c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
-#endif
-
 ASSERT_SAME_TYPE(size_t, decltype(mbrtoc16((char16_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
 ASSERT_SAME_TYPE(size_t, decltype(c16rtomb((char*)0, (char16_t)0, (mbstate_t*)0)));
 

libcxx/test/std/depr/depr.c.headers/uchar_h_char8_t.compile.pass.cpp

@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03
+
+// The following platforms do not provide mbrtoc8 and c8rtomb so the tests fail
+// XFAIL: target={{.+}}-aix{{.*}}
+// XFAIL: darwin
+// XFAIL: freebsd
+// XFAIL: windows
+// XFAIL: LIBCXX-PICOLIBC-FIXME
+
+// <uchar.h>
+
+#include <uchar.h>
+
+#include "test_macros.h"
+
+#if !defined(TEST_HAS_NO_C8RTOMB_MBRTOC8)
+ASSERT_SAME_TYPE(size_t, decltype(mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
+ASSERT_SAME_TYPE(size_t, decltype(c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
+#endif

libcxx/test/std/strings/c.strings/cuchar.compile.pass.cpp

@@ -11,11 +11,6 @@
 // Apple platforms don't provide <uchar.h> yet, so these tests fail.
 // XFAIL: target={{.+}}-apple-{{.+}}
 
-// The following platforms do not provide mbrtoc8 and c8rtomb so the tests fail
-// XFAIL: aix
-// XFAIL: freebsd
-// XFAIL: windows
-
 // mbrtoc16 not defined.
 // XFAIL: LIBCXX-PICOLIBC-FIXME
 
@@ -28,11 +23,6 @@
 // __STDC_UTF_16__ may or may not be defined by the C standard library
 // __STDC_UTF_32__ may or may not be defined by the C standard library
 
-#if !defined(TEST_HAS_NO_C8RTOMB_MBRTOC8)
-ASSERT_SAME_TYPE(std::size_t, decltype(std::mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
-ASSERT_SAME_TYPE(std::size_t, decltype(std::c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
-#endif
-
 ASSERT_SAME_TYPE(std::size_t, decltype(std::mbrtoc16((char16_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
 ASSERT_SAME_TYPE(std::size_t, decltype(std::c16rtomb((char*)0, (char16_t)0, (mbstate_t*)0)));
 

libcxx/test/std/strings/c.strings/cuchar_char8_t.compile.pass.cpp

@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03
+
+// The following platforms do not provide mbrtoc8 and c8rtomb so the tests fail
+// XFAIL: target={{.+}}-aix{{.*}}
+// XFAIL: darwin
+// XFAIL: freebsd
+// XFAIL: windows
+// XFAIL: LIBCXX-PICOLIBC-FIXME
+
+// <cuchar>
+
+#include <cuchar>
+
+#include "test_macros.h"
+
+#if !defined(TEST_HAS_NO_C8RTOMB_MBRTOC8)
+ASSERT_SAME_TYPE(std::size_t, decltype(std::mbrtoc8((char8_t*)0, (const char*)0, (size_t)0, (mbstate_t*)0)));
+ASSERT_SAME_TYPE(std::size_t, decltype(std::c8rtomb((char*)0, (char8_t)0, (mbstate_t*)0)));
+#endif

libcxx/test/std/strings/c.strings/no_c8rtomb_mbrtoc8.verify.cpp

@@ -669,7 +669,6 @@ def _getLocaleFlagsAction(cfg, locale, alts, members):
             """,
         ),
     ),
-    Feature(name="aix", when=lambda cfg: "_AIX" in compilerMacros(cfg)),
 ]
 
 # Add features representing the build host platform name.