<table border="1" cellspacing="0" cellpadding="8">
    <tr>
        <th>Issue</th>
        <td>
            <a href=https://github.com/llvm/llvm-project/issues/80901>80901</a>
        </td>
    </tr>

    <tr>
        <th>Summary</th>
        <td>
            [libc++] Clean up `-stdlib=apple-libc++` Lit features in the test suite with short-hands
        </td>
    </tr>

    <tr>
      <th>Labels</th>
      <td>
            libc++
      </td>
    </tr>

    <tr>
      <th>Assignees</th>
      <td>
            ldionne
      </td>
    </tr>

    <tr>
      <th>Reporter</th>
      <td>
          ldionne
      </td>
    </tr>
</table>

<pre>
    There's a bunch of Apple back-deployment that we can simplify using short-hands. Also some can be removed entirely:

```
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
index 068202c6e415..5c43b5507c2d 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp
@@ -6,8 +6,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10|11|12}}
-
 // <system_error>
 
 // class error_category
diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
index 42fdd1cb3b91..70282e724765 100644
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp
@@ -12,8 +12,6 @@
 
 // const error_category& system_category();
 
-// XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10|11|12}}
-
 #include <system_error>
 #include <cassert>
 #include <string>
```

</pre>
<img width="1px" height="1px" alt="" src="http://email.email.llvm.org/o/eJzMVkuP4rgT_zTmUkpkV15wyAGaP9JfmuMe9jbyo0i8a-LIdnqab78KAbZB6tnLillUMnY9XA_XTykZo-0GopZVO4bojPXDQAyRVfuVnFLvQ3tlrpQ35_a3ngIxbCJIUNOge_BH2I6jI1BS_5kZGp0_n2hIkHqZ4AeBlgNEexqdPZ5hinboIPY-pKyXg4k5bF30EP1p0VQEgU7-nQzQkGwgd2bFlvE947e15le6HI09HiHLOptAMjw4q_THB8NDopgYHmIyDA_Gym7wMVkdZ945Ugj3TU4haJmez7lXf5BOs0FHAwWrv2uZqPPhnI8yxlyPI6iXu1yytoOhD-D1GjnqmkpR5Xmly0JVFW80GhCc12W5KGdZ9gtqc30t3C30y0rFSs5KDlnN8G0NDHfzpoaFvagAw8NMD4div1D2r_zu1z26Wt5n4cHvh-3_v7FiCzEZZxUr9nJGVjZX7VpEhjXDGpIMHaX5tmbHml0-S5s9a_bZYnGS2scPwfNFvmHNm-DzIuYFF92b889ZAyve4jkmOn2nEHxgxf8eQr2paSdjhIvKve6vw-M1whfC8SuPn9FY4tEYoVWhNiLPG45rpAbLpq5eh8afx_kCMP5DAFcsCryB8bJ7RuNjq_khpudWwxqePDFcM9ywYvdfhFZhB-0mQz-B14OOljFSSF-JYwp26O7Spy_iyrSF2RQbuaJWNLzBcsN5terbzbFEUVe14OujadalUKpZy6Y0lWyQq-PKtsix5Mhrsak457mQBoUwquAkGokVKzmdpHW5c--n3IduZWOcqF3zDRcrJxW5eJsl7pW9jhOhnY0yNXWRldzZmOLf1ySb3GUK-WRW7eHNkRxgGoHVPPvy6VjN4ZtNcCSZpkAR7ACpJ5j7GuJkE8EPm_rPY8dqCq7tUxrjPF1ceqSzqZ9Urv1pxoZ7v_1lY_BzdzM8XJKdu_yS718BAAD___lM258">