From 1537f743ac12bb610240cebd43abb8d721beebe9 Mon Sep 17 00:00:00 2001
From: Fady Farag <com.webkit.iidmsa@gmail.com>
Date: Mon, 19 Jan 2026 09:30:21 -0600
Subject: [PATCH] [libc++] Use correct Apple platform naming (#176290)

`macOS` is Apple's official branding since 2016. Use the correct
branding instead.
---
 libcxx/docs/Contributing.rst                                  | 4 ++--
 libcxx/lib/abi/README.TXT                                     | 2 +-
 libcxx/src/CMakeLists.txt                                     | 4 ++--
 libcxx/src/include/refstring.h                                | 2 +-
 .../fs.op.funcs/fs.op.permissions/permissions.pass.cpp        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libcxx/docs/Contributing.rst b/libcxx/docs/Contributing.rst
index 84bbe1478c51..465bf9d0542c 100644
--- a/libcxx/docs/Contributing.rst
+++ b/libcxx/docs/Contributing.rst
@@ -165,7 +165,7 @@ Look for the failed build and select the ``artifacts`` tab. There, download the
 abilist for the platform, e.g.:
 
 * C++<version>.
-* MacOS X86_64 and MacOS arm64 for the Apple platform.
+* macOS X86_64 and macOS arm64 for the Apple platform.
 
 
 Pre-commit CI
@@ -237,7 +237,7 @@ Below is a short description of the most interesting CI builds [#]_:
 * ``Santitizers`` tests libc++ using the Clang sanitizers.
 * ``Parts disabled`` tests libc++ with certain libc++ features disabled.
 * ``Windows`` tests libc++ using MinGW and clang-cl.
-* ``Apple`` tests libc++ on MacOS.
+* ``Apple`` tests libc++ on macOS.
 * ``ARM`` tests libc++ on various Linux ARM platforms.
 * ``AIX`` tests libc++ on AIX.
 
diff --git a/libcxx/lib/abi/README.TXT b/libcxx/lib/abi/README.TXT
index 32a2d337fcf5..dc979d7d8616 100644
--- a/libcxx/lib/abi/README.TXT
+++ b/libcxx/lib/abi/README.TXT
@@ -6,4 +6,4 @@ lists *MUST* be updated to reflect the changes. This can be done by using the
 `generate-cxx-abilist` CMake target.
 
 We do not keep an up-to-date ABI list for all the build configurations of libc++.
-Currently, only the default configuration on MacOS and Linux are supported.
+Currently, only the default configuration on macOS and Linux are supported.
diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
index 2c04cbd1b272..ebd6141902ef 100644
--- a/libcxx/src/CMakeLists.txt
+++ b/libcxx/src/CMakeLists.txt
@@ -151,13 +151,13 @@ if (APPLE AND LLVM_USE_SANITIZER)
   elseif("${LLVM_USE_SANITIZER}" STREQUAL "Thread")
     set(LIBFILE "libclang_rt.tsan_osx_dynamic.dylib")
   else()
-    message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on OS X")
+    message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on macOS")
   endif()
   if (LIBFILE)
     find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
     get_filename_component(LIBDIR "${LIBCXX_BUILTINS_LIBRARY}" DIRECTORY)
     if (NOT IS_DIRECTORY "${LIBDIR}")
-      message(FATAL_ERROR "Cannot find compiler-rt directory on OS X required for LLVM_USE_SANITIZER")
+      message(FATAL_ERROR "Cannot find compiler-rt directory on macOS required for LLVM_USE_SANITIZER")
     endif()
     set(LIBCXX_SANITIZER_LIBRARY "${LIBDIR}/${LIBFILE}")
     set(LIBCXX_SANITIZER_LIBRARY "${LIBCXX_SANITIZER_LIBRARY}" PARENT_SCOPE)
diff --git a/libcxx/src/include/refstring.h b/libcxx/src/include/refstring.h
index 3e0ec7a97c7b..29c561f1e4ee 100644
--- a/libcxx/src/include/refstring.h
+++ b/libcxx/src/include/refstring.h
@@ -15,7 +15,7 @@
 #include <cstring>
 #include <stdexcept>
 
-// MacOS and iOS used to ship with libstdc++, and still support old applications
+// macOS and iOS used to ship with libstdc++, and still support old applications
 // linking against libstdc++. The libc++ and libstdc++ exceptions are supposed
 // to be ABI compatible, such that they can be thrown from one library and caught
 // in the other.
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
index e0337280ee06..d32d02c312f2 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
@@ -165,7 +165,7 @@ static void test_no_resolve_symlink_on_symlink()
     };
     for (auto const& TC : cases) {
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(_AIX)
-        // On OS X symlink permissions are supported. We should get an empty
+        // On macOS symlink permissions are supported. We should get an empty
         // error code and the expected permissions.
         const auto expected_link_perms = TC.expected;
         std::error_code expected_ec;