[llvm] b517568 - [libc++] Rename include/support to include/__support
Louis Dionne via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 4 07:16:48 PST 2021
Author: Louis Dionne
Date: 2021-02-04T10:16:33-05:00
New Revision: b51756819a85563ae063e98eeb3d6af8e44c8f64
URL: https://github.com/llvm/llvm-project/commit/b51756819a85563ae063e98eeb3d6af8e44c8f64
DIFF: https://github.com/llvm/llvm-project/commit/b51756819a85563ae063e98eeb3d6af8e44c8f64.diff
LOG: [libc++] Rename include/support to include/__support
We do ship those headers, so the directory name should not be something
that can potentially conflict with user-defined directories.
Differential Revision: https://reviews.llvm.org/D95956
Added:
libcxx/include/__support/android/locale_bionic.h
libcxx/include/__support/fuchsia/xlocale.h
libcxx/include/__support/ibm/limits.h
libcxx/include/__support/ibm/locale_mgmt_aix.h
libcxx/include/__support/ibm/nanosleep.h
libcxx/include/__support/ibm/support.h
libcxx/include/__support/ibm/xlocale.h
libcxx/include/__support/musl/xlocale.h
libcxx/include/__support/newlib/xlocale.h
libcxx/include/__support/nuttx/xlocale.h
libcxx/include/__support/openbsd/xlocale.h
libcxx/include/__support/solaris/floatingpoint.h
libcxx/include/__support/solaris/wchar.h
libcxx/include/__support/solaris/xlocale.h
libcxx/include/__support/win32/limits_msvc_win32.h
libcxx/include/__support/win32/locale_win32.h
libcxx/include/__support/xlocale/__nop_locale_mgmt.h
libcxx/include/__support/xlocale/__posix_l_fallback.h
libcxx/include/__support/xlocale/__strtonum_fallback.h
Modified:
libcxx/include/CMakeLists.txt
libcxx/include/__locale
libcxx/include/__threading_support
libcxx/include/bit
libcxx/include/limits
libcxx/src/CMakeLists.txt
libcxx/src/locale.cpp
libcxx/src/support/solaris/xlocale.cpp
libcxx/src/support/win32/locale_win32.cpp
libcxx/src/support/win32/support.cpp
libcxx/src/support/win32/thread_win32.cpp
llvm/utils/gn/secondary/libcxx/include/BUILD.gn
Removed:
libcxx/include/support/android/locale_bionic.h
libcxx/include/support/fuchsia/xlocale.h
libcxx/include/support/ibm/limits.h
libcxx/include/support/ibm/locale_mgmt_aix.h
libcxx/include/support/ibm/nanosleep.h
libcxx/include/support/ibm/support.h
libcxx/include/support/ibm/xlocale.h
libcxx/include/support/musl/xlocale.h
libcxx/include/support/newlib/xlocale.h
libcxx/include/support/nuttx/xlocale.h
libcxx/include/support/openbsd/xlocale.h
libcxx/include/support/solaris/floatingpoint.h
libcxx/include/support/solaris/wchar.h
libcxx/include/support/solaris/xlocale.h
libcxx/include/support/win32/limits_msvc_win32.h
libcxx/include/support/win32/locale_win32.h
libcxx/include/support/xlocale/__nop_locale_mgmt.h
libcxx/include/support/xlocale/__posix_l_fallback.h
libcxx/include/support/xlocale/__strtonum_fallback.h
################################################################################
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 9226d982307f..ec172f587c5d 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -151,25 +151,25 @@ set(files
string.h
string_view
strstream
- support/android/locale_bionic.h
- support/fuchsia/xlocale.h
- support/ibm/limits.h
- support/ibm/locale_mgmt_aix.h
- support/ibm/nanosleep.h
- support/ibm/support.h
- support/ibm/xlocale.h
- support/musl/xlocale.h
- support/newlib/xlocale.h
- support/nuttx/xlocale.h
- support/openbsd/xlocale.h
- support/solaris/floatingpoint.h
- support/solaris/wchar.h
- support/solaris/xlocale.h
- support/win32/limits_msvc_win32.h
- support/win32/locale_win32.h
- support/xlocale/__nop_locale_mgmt.h
- support/xlocale/__posix_l_fallback.h
- support/xlocale/__strtonum_fallback.h
+ __support/android/locale_bionic.h
+ __support/fuchsia/xlocale.h
+ __support/ibm/limits.h
+ __support/ibm/locale_mgmt_aix.h
+ __support/ibm/nanosleep.h
+ __support/ibm/support.h
+ __support/ibm/xlocale.h
+ __support/musl/xlocale.h
+ __support/newlib/xlocale.h
+ __support/nuttx/xlocale.h
+ __support/openbsd/xlocale.h
+ __support/solaris/floatingpoint.h
+ __support/solaris/wchar.h
+ __support/solaris/xlocale.h
+ __support/win32/limits_msvc_win32.h
+ __support/win32/locale_win32.h
+ __support/xlocale/__nop_locale_mgmt.h
+ __support/xlocale/__posix_l_fallback.h
+ __support/xlocale/__strtonum_fallback.h
system_error
tgmath.h
thread
diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index a2da7d78049f..77e5faab2676 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -21,30 +21,30 @@
#include <locale.h>
#if defined(_LIBCPP_MSVCRT_LIKE)
# include <cstring>
-# include <support/win32/locale_win32.h>
+# include <__support/win32/locale_win32.h>
#elif defined(__NuttX__)
-# include <support/nuttx/xlocale.h>
+# include <__support/nuttx/xlocale.h>
#elif defined(_AIX) || defined(__MVS__)
-# include <support/ibm/xlocale.h>
+# include <__support/ibm/xlocale.h>
#elif defined(__ANDROID__)
-# include <support/android/locale_bionic.h>
+# include <__support/android/locale_bionic.h>
#elif defined(__sun__)
# include <xlocale.h>
-# include <support/solaris/xlocale.h>
+# include <__support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION)
-# include <support/newlib/xlocale.h>
+# include <__support/newlib/xlocale.h>
#elif defined(__OpenBSD__)
-# include <support/openbsd/xlocale.h>
+# include <__support/openbsd/xlocale.h>
#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
#elif defined(__Fuchsia__)
-# include <support/fuchsia/xlocale.h>
+# include <__support/fuchsia/xlocale.h>
#elif defined(__wasi__)
// WASI libc uses musl's locales support.
-# include <support/musl/xlocale.h>
+# include <__support/musl/xlocale.h>
#elif defined(_LIBCPP_HAS_MUSL_LIBC)
-# include <support/musl/xlocale.h>
+# include <__support/musl/xlocale.h>
#endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/support/android/locale_bionic.h b/libcxx/include/__support/android/locale_bionic.h
similarity index 90%
rename from libcxx/include/support/android/locale_bionic.h
rename to libcxx/include/__support/android/locale_bionic.h
index f05a6a0522ca..8c6d4bd0dc32 100644
--- a/libcxx/include/support/android/locale_bionic.h
+++ b/libcxx/include/__support/android/locale_bionic.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===------------------- support/android/locale_bionic.h ------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -28,13 +28,13 @@ extern "C" {
#include <android/api-level.h>
#include <android/ndk-version.h>
#if __ANDROID_API__ < 21
-#include <support/xlocale/__posix_l_fallback.h>
+#include <__support/xlocale/__posix_l_fallback.h>
#endif
// In NDK versions later than 16, locale-aware functions are provided by
// legacy_stdlib_inlines.h
#if __NDK_MAJOR__ <= 16
#if __ANDROID_API__ < 21
-#include <support/xlocale/__strtonum_fallback.h>
+#include <__support/xlocale/__strtonum_fallback.h>
#elif __ANDROID_API__ < 26
#if defined(__cplusplus)
diff --git a/libcxx/include/support/fuchsia/xlocale.h b/libcxx/include/__support/fuchsia/xlocale.h
similarity index 74%
rename from libcxx/include/support/fuchsia/xlocale.h
rename to libcxx/include/__support/fuchsia/xlocale.h
index b86ce9efbd11..e8def81480ea 100644
--- a/libcxx/include/support/fuchsia/xlocale.h
+++ b/libcxx/include/__support/fuchsia/xlocale.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===------------------- support/fuchsia/xlocale.h ------------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -14,8 +14,8 @@
#include <cstdlib>
#include <cwchar>
-#include <support/xlocale/__posix_l_fallback.h>
-#include <support/xlocale/__strtonum_fallback.h>
+#include <__support/xlocale/__posix_l_fallback.h>
+#include <__support/xlocale/__strtonum_fallback.h>
#endif // defined(__Fuchsia__)
diff --git a/libcxx/include/support/ibm/limits.h b/libcxx/include/__support/ibm/limits.h
similarity index 97%
rename from libcxx/include/support/ibm/limits.h
rename to libcxx/include/__support/ibm/limits.h
index d1c59f066a87..45f1f1e3684c 100644
--- a/libcxx/include/support/ibm/limits.h
+++ b/libcxx/include/__support/ibm/limits.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===--------------------- support/ibm/limits.h ---------------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/ibm/locale_mgmt_aix.h b/libcxx/include/__support/ibm/locale_mgmt_aix.h
similarity index 96%
rename from libcxx/include/support/ibm/locale_mgmt_aix.h
rename to libcxx/include/__support/ibm/locale_mgmt_aix.h
index e452dc32529d..4f658c3eee30 100644
--- a/libcxx/include/support/ibm/locale_mgmt_aix.h
+++ b/libcxx/include/__support/ibm/locale_mgmt_aix.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===------------------- support/ibm/locale_mgmt_aix.h --------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/ibm/nanosleep.h b/libcxx/include/__support/ibm/nanosleep.h
similarity index 100%
rename from libcxx/include/support/ibm/nanosleep.h
rename to libcxx/include/__support/ibm/nanosleep.h
diff --git a/libcxx/include/support/ibm/support.h b/libcxx/include/__support/ibm/support.h
similarity index 95%
rename from libcxx/include/support/ibm/support.h
rename to libcxx/include/__support/ibm/support.h
index 0569cbe7460d..a7751b017666 100644
--- a/libcxx/include/support/ibm/support.h
+++ b/libcxx/include/__support/ibm/support.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===----------------------- support/ibm/support.h ----------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/ibm/xlocale.h b/libcxx/include/__support/ibm/xlocale.h
similarity index 97%
rename from libcxx/include/support/ibm/xlocale.h
rename to libcxx/include/__support/ibm/xlocale.h
index fde137cde260..ad07a255fc95 100644
--- a/libcxx/include/support/ibm/xlocale.h
+++ b/libcxx/include/__support/ibm/xlocale.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===--------------------- support/ibm/xlocale.h -------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,8 @@
#ifndef _LIBCPP_SUPPORT_IBM_XLOCALE_H
#define _LIBCPP_SUPPORT_IBM_XLOCALE_H
-#include <support/ibm/locale_mgmt_aix.h>
+
+#include <__support/ibm/locale_mgmt_aix.h>
#include "cstdlib"
@@ -218,7 +219,7 @@ size_t strftime_l(char *__s, size_t __size, const char *__fmt,
#elif defined(__MVS__)
#include <wctype.h>
// POSIX routines
-#include <support/xlocale/__posix_l_fallback.h>
+#include <__support/xlocale/__posix_l_fallback.h>
#endif // defined(__MVS__)
// The following are not POSIX routines. These are quick-and-dirty hacks
diff --git a/libcxx/include/support/musl/xlocale.h b/libcxx/include/__support/musl/xlocale.h
similarity index 95%
rename from libcxx/include/support/musl/xlocale.h
rename to libcxx/include/__support/musl/xlocale.h
index 722d13fa1d66..2508a8e8e0ca 100644
--- a/libcxx/include/support/musl/xlocale.h
+++ b/libcxx/include/__support/musl/xlocale.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===------------------- support/musl/xlocale.h ------------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/newlib/xlocale.h b/libcxx/include/__support/newlib/xlocale.h
similarity index 82%
rename from libcxx/include/support/newlib/xlocale.h
rename to libcxx/include/__support/newlib/xlocale.h
index 25fa798b6d02..b75f9263a4c4 100644
--- a/libcxx/include/support/newlib/xlocale.h
+++ b/libcxx/include/__support/newlib/xlocale.h
@@ -17,9 +17,9 @@
#include <ctype.h>
#if !defined(__NEWLIB__) || __NEWLIB__ < 2 || \
__NEWLIB__ == 2 && __NEWLIB_MINOR__ < 5
-#include <support/xlocale/__nop_locale_mgmt.h>
-#include <support/xlocale/__posix_l_fallback.h>
-#include <support/xlocale/__strtonum_fallback.h>
+#include <__support/xlocale/__nop_locale_mgmt.h>
+#include <__support/xlocale/__posix_l_fallback.h>
+#include <__support/xlocale/__strtonum_fallback.h>
#endif
#endif // _NEWLIB_VERSION
diff --git a/libcxx/include/support/nuttx/xlocale.h b/libcxx/include/__support/nuttx/xlocale.h
similarity index 70%
rename from libcxx/include/support/nuttx/xlocale.h
rename to libcxx/include/__support/nuttx/xlocale.h
index b70d62005046..be738e3b64e4 100644
--- a/libcxx/include/support/nuttx/xlocale.h
+++ b/libcxx/include/__support/nuttx/xlocale.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===-------------------- support/nuttx/xlocale.h -------------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -11,8 +11,8 @@
#define _LIBCPP_SUPPORT_NUTTX_XLOCALE_H
#if defined(__NuttX__)
-#include <support/xlocale/__posix_l_fallback.h>
-#include <support/xlocale/__strtonum_fallback.h>
+#include <__support/xlocale/__posix_l_fallback.h>
+#include <__support/xlocale/__strtonum_fallback.h>
#endif // __NuttX__
#endif
diff --git a/libcxx/include/support/openbsd/xlocale.h b/libcxx/include/__support/openbsd/xlocale.h
similarity index 78%
rename from libcxx/include/support/openbsd/xlocale.h
rename to libcxx/include/__support/openbsd/xlocale.h
index fbfaedd127c6..1136fa327fac 100644
--- a/libcxx/include/support/openbsd/xlocale.h
+++ b/libcxx/include/__support/openbsd/xlocale.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===-------------------- support/openbsd/xlocale.h -----------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -14,6 +14,6 @@
#include <clocale>
#include <cwctype>
#include <ctype.h>
-#include <support/xlocale/__strtonum_fallback.h>
+#include <__support/xlocale/__strtonum_fallback.h>
#endif
diff --git a/libcxx/include/support/solaris/floatingpoint.h b/libcxx/include/__support/solaris/floatingpoint.h
similarity index 100%
rename from libcxx/include/support/solaris/floatingpoint.h
rename to libcxx/include/__support/solaris/floatingpoint.h
diff --git a/libcxx/include/support/solaris/wchar.h b/libcxx/include/__support/solaris/wchar.h
similarity index 100%
rename from libcxx/include/support/solaris/wchar.h
rename to libcxx/include/__support/solaris/wchar.h
diff --git a/libcxx/include/support/solaris/xlocale.h b/libcxx/include/__support/solaris/xlocale.h
similarity index 100%
rename from libcxx/include/support/solaris/xlocale.h
rename to libcxx/include/__support/solaris/xlocale.h
diff --git a/libcxx/include/support/win32/limits_msvc_win32.h b/libcxx/include/__support/win32/limits_msvc_win32.h
similarity index 96%
rename from libcxx/include/support/win32/limits_msvc_win32.h
rename to libcxx/include/__support/win32/limits_msvc_win32.h
index 7bb835559a3b..758d24647b1b 100644
--- a/libcxx/include/support/win32/limits_msvc_win32.h
+++ b/libcxx/include/__support/win32/limits_msvc_win32.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===------------------ support/win32/limits_msvc_win32.h -----------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/win32/locale_win32.h b/libcxx/include/__support/win32/locale_win32.h
similarity index 99%
rename from libcxx/include/support/win32/locale_win32.h
rename to libcxx/include/__support/win32/locale_win32.h
index 897c36be70c6..d32a7a8ad304 100644
--- a/libcxx/include/support/win32/locale_win32.h
+++ b/libcxx/include/__support/win32/locale_win32.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===--------------------- support/win32/locale_win32.h -------------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/xlocale/__nop_locale_mgmt.h b/libcxx/include/__support/xlocale/__nop_locale_mgmt.h
similarity index 94%
rename from libcxx/include/support/xlocale/__nop_locale_mgmt.h
rename to libcxx/include/__support/xlocale/__nop_locale_mgmt.h
index f33d3894c3a9..57b18842ff45 100644
--- a/libcxx/include/support/xlocale/__nop_locale_mgmt.h
+++ b/libcxx/include/__support/xlocale/__nop_locale_mgmt.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===------------ support/xlocale/__nop_locale_mgmt.h -----------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/xlocale/__posix_l_fallback.h b/libcxx/include/__support/xlocale/__posix_l_fallback.h
similarity index 98%
rename from libcxx/include/support/xlocale/__posix_l_fallback.h
rename to libcxx/include/__support/xlocale/__posix_l_fallback.h
index f3df6c46fbab..00d69d19e8c8 100644
--- a/libcxx/include/support/xlocale/__posix_l_fallback.h
+++ b/libcxx/include/__support/xlocale/__posix_l_fallback.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===--------------- support/xlocale/__posix_l_fallback.h -----------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/support/xlocale/__strtonum_fallback.h b/libcxx/include/__support/xlocale/__strtonum_fallback.h
similarity index 96%
rename from libcxx/include/support/xlocale/__strtonum_fallback.h
rename to libcxx/include/__support/xlocale/__strtonum_fallback.h
index df38598056a6..1172a5d57236 100644
--- a/libcxx/include/support/xlocale/__strtonum_fallback.h
+++ b/libcxx/include/__support/xlocale/__strtonum_fallback.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===-------------- support/xlocale/__strtonum_fallback.h -----------------===//
+//===-----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index 473c9c3bbe49..de572f3ff84d 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -17,7 +17,7 @@
#include <errno.h>
#ifdef __MVS__
-# include <support/ibm/nanosleep.h>
+# include <__support/ibm/nanosleep.h>
#endif
#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
diff --git a/libcxx/include/bit b/libcxx/include/bit
index fe360179c5ca..f8c37c3d6bbf 100644
--- a/libcxx/include/bit
+++ b/libcxx/include/bit
@@ -62,7 +62,7 @@ namespace std {
#include <__debug>
#if defined(__IBMCPP__)
-#include "support/ibm/support.h"
+#include "__support/ibm/support.h"
#endif
#if defined(_LIBCPP_COMPILER_MSVC)
#include <intrin.h>
diff --git a/libcxx/include/limits b/libcxx/include/limits
index 6d5d1e1aca75..8f97cd10a8b1 100644
--- a/libcxx/include/limits
+++ b/libcxx/include/limits
@@ -105,11 +105,11 @@ template<> class numeric_limits<cv long double>;
#include <type_traits>
#if defined(_LIBCPP_COMPILER_MSVC)
-#include "support/win32/limits_msvc_win32.h"
+#include "__support/win32/limits_msvc_win32.h"
#endif // _LIBCPP_MSVCRT
#if defined(__IBMCPP__)
-#include "support/ibm/limits.h"
+#include "__support/ibm/limits.h"
#endif // __IBMCPP__
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
index 224299b05234..76227d39af50 100644
--- a/libcxx/src/CMakeLists.txt
+++ b/libcxx/src/CMakeLists.txt
@@ -109,7 +109,7 @@ endif()
if (LIBCXX_CONFIGURE_IDE)
file(GLOB_RECURSE LIBCXX_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/*)
if(WIN32)
- file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/support/win32/*.h)
+ file( GLOB LIBCXX_WIN32_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../include/__support/win32/*.h)
list(APPEND LIBCXX_HEADERS ${LIBCXX_WIN32_HEADERS})
endif()
# Force them all into the headers dir on MSVC, otherwise they end up at
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index f109389f68f3..a0209d0ce8cf 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -29,7 +29,7 @@
#include "cwctype"
#include "__sso_allocator"
#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include "support/win32/locale_win32.h"
+#include "__support/win32/locale_win32.h"
#elif !defined(__BIONIC__) && !defined(__NuttX__)
#include <langinfo.h>
#endif
diff --git a/libcxx/src/support/solaris/xlocale.cpp b/libcxx/src/support/solaris/xlocale.cpp
index d68a39f4dfe5..d25adcd21d30 100644
--- a/libcxx/src/support/solaris/xlocale.cpp
+++ b/libcxx/src/support/solaris/xlocale.cpp
@@ -8,7 +8,7 @@
#ifdef __sun__
-#include "support/solaris/xlocale.h"
+#include "__support/solaris/xlocale.h"
#include <stdarg.h>
#include <stdio.h>
#include <sys/localedef.h>
diff --git a/libcxx/src/support/win32/locale_win32.cpp b/libcxx/src/support/win32/locale_win32.cpp
index b7062db352ad..e7c6005fc1a3 100644
--- a/libcxx/src/support/win32/locale_win32.cpp
+++ b/libcxx/src/support/win32/locale_win32.cpp
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===-------------------- support/win32/locale_win32.cpp ------------------===//
+//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/src/support/win32/support.cpp b/libcxx/src/support/win32/support.cpp
index d156e02e3e84..52453f547926 100644
--- a/libcxx/src/support/win32/support.cpp
+++ b/libcxx/src/support/win32/support.cpp
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===----------------------- support/win32/support.h ----------------------===//
+//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/libcxx/src/support/win32/thread_win32.cpp b/libcxx/src/support/win32/thread_win32.cpp
index 83e7e9f6ce5b..35c4c871457d 100644
--- a/libcxx/src/support/win32/thread_win32.cpp
+++ b/libcxx/src/support/win32/thread_win32.cpp
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===-------------------- support/win32/thread_win32.cpp ------------------===//
+//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index 0ce7e887c5a6..5ad30ebeabd1 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -218,25 +218,25 @@ copy("include") {
"string.h",
"string_view",
"strstream",
- "support/android/locale_bionic.h",
- "support/fuchsia/xlocale.h",
- "support/ibm/limits.h",
- "support/ibm/locale_mgmt_aix.h",
- "support/ibm/nanosleep.h",
- "support/ibm/support.h",
- "support/ibm/xlocale.h",
- "support/musl/xlocale.h",
- "support/newlib/xlocale.h",
- "support/nuttx/xlocale.h",
- "support/openbsd/xlocale.h",
- "support/solaris/floatingpoint.h",
- "support/solaris/wchar.h",
- "support/solaris/xlocale.h",
- "support/win32/limits_msvc_win32.h",
- "support/win32/locale_win32.h",
- "support/xlocale/__nop_locale_mgmt.h",
- "support/xlocale/__posix_l_fallback.h",
- "support/xlocale/__strtonum_fallback.h",
+ "__support/android/locale_bionic.h",
+ "__support/fuchsia/xlocale.h",
+ "__support/ibm/limits.h",
+ "__support/ibm/locale_mgmt_aix.h",
+ "__support/ibm/nanosleep.h",
+ "__support/ibm/support.h",
+ "__support/ibm/xlocale.h",
+ "__support/musl/xlocale.h",
+ "__support/newlib/xlocale.h",
+ "__support/nuttx/xlocale.h",
+ "__support/openbsd/xlocale.h",
+ "__support/solaris/floatingpoint.h",
+ "__support/solaris/wchar.h",
+ "__support/solaris/xlocale.h",
+ "__support/win32/limits_msvc_win32.h",
+ "__support/win32/locale_win32.h",
+ "__support/xlocale/__nop_locale_mgmt.h",
+ "__support/xlocale/__posix_l_fallback.h",
+ "__support/xlocale/__strtonum_fallback.h",
"system_error",
"tgmath.h",
"thread",
More information about the llvm-commits
mailing list