[libc-commits] [libc] f362aea - [libc][NFC] Move utils/CPP to src/__support/CPP.
Siva Chandra Reddy via libc-commits
libc-commits at lists.llvm.org
Thu Oct 28 08:50:22 PDT 2021
Author: Siva Chandra Reddy
Date: 2021-10-28T15:50:00Z
New Revision: f362aea42d29da2c8620c6eb8902f31d01613edc
URL: https://github.com/llvm/llvm-project/commit/f362aea42d29da2c8620c6eb8902f31d01613edc
DIFF: https://github.com/llvm/llvm-project/commit/f362aea42d29da2c8620c6eb8902f31d01613edc.diff
LOG: [libc][NFC] Move utils/CPP to src/__support/CPP.
The idea is to move all pieces related to the actual libc sources to the
"src" directory. This allows downstream users to ship and build just the
"src" directory.
Reviewed By: michaelrj
Differential Revision: https://reviews.llvm.org/D112653
Added:
libc/src/__support/CPP/Array.h
libc/src/__support/CPP/ArrayRef.h
libc/src/__support/CPP/Bitset.h
libc/src/__support/CPP/CMakeLists.txt
libc/src/__support/CPP/Functional.h
libc/src/__support/CPP/Limits.h
libc/src/__support/CPP/README.md
libc/src/__support/CPP/StringView.h
libc/src/__support/CPP/TypeTraits.h
Modified:
libc/fuzzing/math/CMakeLists.txt
libc/fuzzing/math/Compare.h
libc/src/__support/CMakeLists.txt
libc/src/__support/FPUtil/BasicOperations.h
libc/src/__support/FPUtil/CMakeLists.txt
libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
libc/src/__support/FPUtil/FMA.h
libc/src/__support/FPUtil/FPBits.h
libc/src/__support/FPUtil/Hypot.h
libc/src/__support/FPUtil/ManipulationFunctions.h
libc/src/__support/FPUtil/NearestIntegerOperations.h
libc/src/__support/FPUtil/NormalFloat.h
libc/src/__support/FPUtil/PolyEval.h
libc/src/__support/FPUtil/Sqrt.h
libc/src/__support/FPUtil/SqrtLongDoubleX86.h
libc/src/__support/FPUtil/aarch64/FMA.h
libc/src/__support/FPUtil/generic/FMA.h
libc/src/__support/FPUtil/x86_64/FMA.h
libc/src/__support/integer_operations.h
libc/src/__support/str_conv_utils.h
libc/src/__support/str_to_float.h
libc/src/math/generic/math_utils.h
libc/src/string/CMakeLists.txt
libc/src/string/string_utils.h
libc/src/string/strspn.cpp
libc/test/config/linux/x86_64/syscall_test.cpp
libc/test/src/CMakeLists.txt
libc/test/src/math/CMakeLists.txt
libc/test/src/math/NextAfterTest.h
libc/test/src/math/cosf_test.cpp
libc/test/src/math/sdcomp26094.h
libc/test/src/math/sincosf_test.cpp
libc/test/src/math/sinf_test.cpp
libc/test/src/stdio/fwrite_test.cpp
libc/test/src/string/bzero_test.cpp
libc/test/src/string/memccpy_test.cpp
libc/test/src/string/memcpy_test.cpp
libc/test/src/string/memmove_test.cpp
libc/test/src/string/memory_utils/CMakeLists.txt
libc/test/src/string/memory_utils/elements_test.cpp
libc/test/src/string/memory_utils/memory_access_test.cpp
libc/test/src/string/memory_utils/utils_test.cpp
libc/test/src/string/memset_test.cpp
libc/test/src/string/strncpy_test.cpp
libc/test/utils/CPP/CMakeLists.txt
libc/test/utils/CPP/arrayref_test.cpp
libc/test/utils/CPP/bitset_test.cpp
libc/test/utils/CPP/limits_test.cpp
libc/test/utils/CPP/stringview_test.cpp
libc/test/utils/UnitTest/CMakeLists.txt
libc/utils/CMakeLists.txt
libc/utils/MPFRWrapper/CMakeLists.txt
libc/utils/MPFRWrapper/MPFRUtils.cpp
libc/utils/MPFRWrapper/MPFRUtils.h
libc/utils/UnitTest/CMakeLists.txt
libc/utils/UnitTest/LibcTest.h
Removed:
libc/utils/CPP/Array.h
libc/utils/CPP/ArrayRef.h
libc/utils/CPP/Bitset.h
libc/utils/CPP/CMakeLists.txt
libc/utils/CPP/Functional.h
libc/utils/CPP/Limits.h
libc/utils/CPP/README.md
libc/utils/CPP/StringView.h
libc/utils/CPP/TypeTraits.h
################################################################################
diff --git a/libc/fuzzing/math/CMakeLists.txt b/libc/fuzzing/math/CMakeLists.txt
index a3d308151b877..b1e130eca73ab 100644
--- a/libc/fuzzing/math/CMakeLists.txt
+++ b/libc/fuzzing/math/CMakeLists.txt
@@ -46,7 +46,7 @@ add_libc_fuzzer(
libc.src.math.truncf
libc.src.math.truncl
libc.src.__support.FPUtil.fputil
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_libc_fuzzer(
diff --git a/libc/fuzzing/math/Compare.h b/libc/fuzzing/math/Compare.h
index 28ca9047737e4..8a794c4cabbcc 100644
--- a/libc/fuzzing/math/Compare.h
+++ b/libc/fuzzing/math/Compare.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_FUZZING_MATH_COMPARE_H
#define LLVM_LIBC_FUZZING_MATH_COMPARE_H
+#include "src/__support/CPP/TypeTraits.h"
#include "src/__support/FPUtil/FPBits.h"
-#include "utils/CPP/TypeTraits.h"
template <typename T>
__llvm_libc::cpp::EnableIfType<__llvm_libc::cpp::IsFloatingPointType<T>::Value,
diff --git a/libc/src/__support/CMakeLists.txt b/libc/src/__support/CMakeLists.txt
index 1d452067f93d1..871c3a447b80a 100644
--- a/libc/src/__support/CMakeLists.txt
+++ b/libc/src/__support/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(CPP)
+
add_header_library(
common
HDRS
@@ -29,7 +31,7 @@ add_header_library(
.high_precision_decimal
libc.include.errno
libc.src.errno.__errno_location
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
libc.src.__support.FPUtil.fputil
)
diff --git a/libc/utils/CPP/Array.h b/libc/src/__support/CPP/Array.h
similarity index 91%
rename from libc/utils/CPP/Array.h
rename to libc/src/__support/CPP/Array.h
index c774a9f793d8c..e1989433b27e9 100644
--- a/libc/utils/CPP/Array.h
+++ b/libc/src/__support/CPP/Array.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_ARRAY_H
-#define LLVM_LIBC_UTILS_CPP_ARRAY_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_ARRAY_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_ARRAY_H
#include <stddef.h> // For size_t.
@@ -49,4 +49,4 @@ template <class T, size_t N> struct Array {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_ARRAY_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_ARRAY_H
diff --git a/libc/utils/CPP/ArrayRef.h b/libc/src/__support/CPP/ArrayRef.h
similarity index 96%
rename from libc/utils/CPP/ArrayRef.h
rename to libc/src/__support/CPP/ArrayRef.h
index cad7db9d3b663..a9a09101a6a80 100644
--- a/libc/utils/CPP/ArrayRef.h
+++ b/libc/src/__support/CPP/ArrayRef.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_ARRAYREF_H
-#define LLVM_LIBC_UTILS_CPP_ARRAYREF_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_ARRAYREF_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_ARRAYREF_H
#include "Array.h"
#include "TypeTraits.h" //RemoveCVType
@@ -136,4 +136,4 @@ struct MutableArrayRef : public internal::ArrayRefBase<T> {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_ARRAYREF_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_ARRAYREF_H
diff --git a/libc/utils/CPP/Bitset.h b/libc/src/__support/CPP/Bitset.h
similarity index 89%
rename from libc/utils/CPP/Bitset.h
rename to libc/src/__support/CPP/Bitset.h
index 304a6fecc54a7..e6f5ace9d6857 100644
--- a/libc/utils/CPP/Bitset.h
+++ b/libc/src/__support/CPP/Bitset.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_BITSET_H
-#define LLVM_LIBC_UTILS_CPP_BITSET_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_BITSET_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_BITSET_H
#include <stddef.h> // For size_t.
#include <stdint.h> // For uintptr_t.
@@ -36,4 +36,4 @@ template <size_t NumberOfBits> struct Bitset {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_BITSET_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_BITSET_H
diff --git a/libc/utils/CPP/CMakeLists.txt b/libc/src/__support/CPP/CMakeLists.txt
similarity index 100%
rename from libc/utils/CPP/CMakeLists.txt
rename to libc/src/__support/CPP/CMakeLists.txt
diff --git a/libc/utils/CPP/Functional.h b/libc/src/__support/CPP/Functional.h
similarity index 84%
rename from libc/utils/CPP/Functional.h
rename to libc/src/__support/CPP/Functional.h
index da73e4cb19802..51f63314af14b 100644
--- a/libc/utils/CPP/Functional.h
+++ b/libc/src/__support/CPP/Functional.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_FUNCTIONAL_H
-#define LLVM_LIBC_UTILS_CPP_FUNCTIONAL_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_FUNCTIONAL_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_FUNCTIONAL_H
namespace __llvm_libc {
namespace cpp {
@@ -27,4 +27,4 @@ template <typename Ret, typename... Params> class Function<Ret(Params...)> {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_FUNCTIONAL_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_FUNCTIONAL_H
diff --git a/libc/utils/CPP/Limits.h b/libc/src/__support/CPP/Limits.h
similarity index 93%
rename from libc/utils/CPP/Limits.h
rename to libc/src/__support/CPP/Limits.h
index 393c3b6a031a1..7e5de101c5b84 100644
--- a/libc/utils/CPP/Limits.h
+++ b/libc/src/__support/CPP/Limits.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_LIMITS_H
-#define LLVM_LIBC_UTILS_CPP_LIMITS_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_LIMITS_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_LIMITS_H
#include <limits.h>
@@ -66,4 +66,4 @@ template <> class NumericLimits<__int128_t> {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_LIMITS_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_LIMITS_H
diff --git a/libc/utils/CPP/README.md b/libc/src/__support/CPP/README.md
similarity index 100%
rename from libc/utils/CPP/README.md
rename to libc/src/__support/CPP/README.md
diff --git a/libc/utils/CPP/StringView.h b/libc/src/__support/CPP/StringView.h
similarity index 94%
rename from libc/utils/CPP/StringView.h
rename to libc/src/__support/CPP/StringView.h
index 52f61a03e3bc1..31efc5ac07645 100644
--- a/libc/utils/CPP/StringView.h
+++ b/libc/src/__support/CPP/StringView.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_STRINGVIEW_H
-#define LLVM_LIBC_UTILS_CPP_STRINGVIEW_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_STRINGVIEW_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_STRINGVIEW_H
#include <stddef.h>
@@ -96,4 +96,4 @@ class StringView {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_STRINGVIEW_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_STRINGVIEW_H
diff --git a/libc/utils/CPP/TypeTraits.h b/libc/src/__support/CPP/TypeTraits.h
similarity index 95%
rename from libc/utils/CPP/TypeTraits.h
rename to libc/src/__support/CPP/TypeTraits.h
index 060d36e4e00e8..0c542f1a79fd7 100644
--- a/libc/utils/CPP/TypeTraits.h
+++ b/libc/src/__support/CPP/TypeTraits.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
-#define LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+#ifndef LLVM_LIBC_SRC_SUPPORT_CPP_TYPETRAITS_H
+#define LLVM_LIBC_SRC_SUPPORT_CPP_TYPETRAITS_H
namespace __llvm_libc {
namespace cpp {
@@ -74,4 +74,4 @@ template <typename Type> struct IsArithmetic {
} // namespace cpp
} // namespace __llvm_libc
-#endif // LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+#endif // LLVM_LIBC_SRC_SUPPORT_CPP_TYPETRAITS_H
diff --git a/libc/src/__support/FPUtil/BasicOperations.h b/libc/src/__support/FPUtil/BasicOperations.h
index 95debe736c9e1..08d722268780e 100644
--- a/libc/src/__support/FPUtil/BasicOperations.h
+++ b/libc/src/__support/FPUtil/BasicOperations.h
@@ -11,7 +11,7 @@
#include "FPBits.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/CMakeLists.txt b/libc/src/__support/FPUtil/CMakeLists.txt
index 589b9b597f813..f47b545181a87 100644
--- a/libc/src/__support/FPUtil/CMakeLists.txt
+++ b/libc/src/__support/FPUtil/CMakeLists.txt
@@ -33,7 +33,7 @@ add_header_library(
libc.include.errno
libc.include.fenv
libc.src.__support.common
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_library(
@@ -48,6 +48,6 @@ target_link_libraries(LibcFPTestHelpers LibcUnitTest)
add_dependencies(
LibcFPTestHelpers
LibcUnitTest
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
libc.src.__support.FPUtil.fputil
)
diff --git a/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h b/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
index abdc388ca1d4e..412ea96aa5519 100644
--- a/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
+++ b/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
@@ -13,7 +13,7 @@
#include "ManipulationFunctions.h"
#include "NormalFloat.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/FMA.h b/libc/src/__support/FPUtil/FMA.h
index 4161554ab0422..c109b3470bd3e 100644
--- a/libc/src/__support/FPUtil/FMA.h
+++ b/libc/src/__support/FPUtil/FMA.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_FMA_H
#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_FMA_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#ifdef __x86_64__
#include "x86_64/FMA.h"
diff --git a/libc/src/__support/FPUtil/FPBits.h b/libc/src/__support/FPUtil/FPBits.h
index 7361bba5fab31..b761dd7f98285 100644
--- a/libc/src/__support/FPUtil/FPBits.h
+++ b/libc/src/__support/FPUtil/FPBits.h
@@ -11,7 +11,7 @@
#include "PlatformDefs.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#include "FloatProperties.h"
#include <stdint.h>
diff --git a/libc/src/__support/FPUtil/Hypot.h b/libc/src/__support/FPUtil/Hypot.h
index 425a42c335d83..448dc1c36ea6d 100644
--- a/libc/src/__support/FPUtil/Hypot.h
+++ b/libc/src/__support/FPUtil/Hypot.h
@@ -11,7 +11,7 @@
#include "BasicOperations.h"
#include "FPBits.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/ManipulationFunctions.h b/libc/src/__support/FPUtil/ManipulationFunctions.h
index c2504aa5267c1..053eae311fbaf 100644
--- a/libc/src/__support/FPUtil/ManipulationFunctions.h
+++ b/libc/src/__support/FPUtil/ManipulationFunctions.h
@@ -14,7 +14,7 @@
#include "NormalFloat.h"
#include "PlatformDefs.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#include <limits.h>
#include <math.h>
diff --git a/libc/src/__support/FPUtil/NearestIntegerOperations.h b/libc/src/__support/FPUtil/NearestIntegerOperations.h
index a7c67c996fce5..99e2ba7150377 100644
--- a/libc/src/__support/FPUtil/NearestIntegerOperations.h
+++ b/libc/src/__support/FPUtil/NearestIntegerOperations.h
@@ -12,7 +12,7 @@
#include "FEnvUtils.h"
#include "FPBits.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#include <math.h>
#if math_errhandling & MATH_ERRNO
diff --git a/libc/src/__support/FPUtil/NormalFloat.h b/libc/src/__support/FPUtil/NormalFloat.h
index 0445403112ae3..2c83b81e9a4fe 100644
--- a/libc/src/__support/FPUtil/NormalFloat.h
+++ b/libc/src/__support/FPUtil/NormalFloat.h
@@ -11,7 +11,7 @@
#include "FPBits.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#include <stdint.h>
diff --git a/libc/src/__support/FPUtil/PolyEval.h b/libc/src/__support/FPUtil/PolyEval.h
index 95311ed55a1b4..ccf4d60c1043a 100644
--- a/libc/src/__support/FPUtil/PolyEval.h
+++ b/libc/src/__support/FPUtil/PolyEval.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_POLYEVAL_H
#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_POLYEVAL_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
// Evaluate polynomial using Horner's Scheme:
// With polyeval(x, a_0, a_1, ..., a_n) = a_n * x^n + ... + a_1 * x + a_0, we
diff --git a/libc/src/__support/FPUtil/Sqrt.h b/libc/src/__support/FPUtil/Sqrt.h
index 041031faa3a8c..b6c7cc4f7e785 100644
--- a/libc/src/__support/FPUtil/Sqrt.h
+++ b/libc/src/__support/FPUtil/Sqrt.h
@@ -12,7 +12,7 @@
#include "FPBits.h"
#include "PlatformDefs.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/SqrtLongDoubleX86.h b/libc/src/__support/FPUtil/SqrtLongDoubleX86.h
index f4d89b504b0f5..98875ba4f2333 100644
--- a/libc/src/__support/FPUtil/SqrtLongDoubleX86.h
+++ b/libc/src/__support/FPUtil/SqrtLongDoubleX86.h
@@ -12,7 +12,7 @@
#include "FPBits.h"
#include "Sqrt.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/aarch64/FMA.h b/libc/src/__support/FPUtil/aarch64/FMA.h
index 7e4c72621037d..bb9214468c245 100644
--- a/libc/src/__support/FPUtil/aarch64/FMA.h
+++ b/libc/src/__support/FPUtil/aarch64/FMA.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_AARCH64_FMA_H
#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_AARCH64_FMA_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/generic/FMA.h b/libc/src/__support/FPUtil/generic/FMA.h
index 6d19ba96aaf76..c543a490a94bc 100644
--- a/libc/src/__support/FPUtil/generic/FMA.h
+++ b/libc/src/__support/FPUtil/generic/FMA.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_GENERIC_FMA_H
#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_GENERIC_FMA_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/FPUtil/x86_64/FMA.h b/libc/src/__support/FPUtil/x86_64/FMA.h
index 3229b2178841a..59f55a2c5d192 100644
--- a/libc/src/__support/FPUtil/x86_64/FMA.h
+++ b/libc/src/__support/FPUtil/x86_64/FMA.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_SUPPORT_FPUTIL_X86_64_FMA_H
#define LLVM_LIBC_SRC_SUPPORT_FPUTIL_X86_64_FMA_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
namespace fputil {
diff --git a/libc/src/__support/integer_operations.h b/libc/src/__support/integer_operations.h
index c27a2632964bf..e7588f5ef2cc9 100644
--- a/libc/src/__support/integer_operations.h
+++ b/libc/src/__support/integer_operations.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_STDLIB_ABS_UTILS_H
#define LLVM_LIBC_SRC_STDLIB_ABS_UTILS_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
namespace __llvm_libc {
diff --git a/libc/src/__support/str_conv_utils.h b/libc/src/__support/str_conv_utils.h
index 649e3ee9b846b..13c800aac6578 100644
--- a/libc/src/__support/str_conv_utils.h
+++ b/libc/src/__support/str_conv_utils.h
@@ -9,8 +9,8 @@
#ifndef LIBC_SRC_STDLIB_STDLIB_UTILS_H
#define LIBC_SRC_STDLIB_STDLIB_UTILS_H
+#include "src/__support/CPP/Limits.h"
#include "src/__support/ctype_utils.h"
-#include "utils/CPP/Limits.h"
#include <errno.h>
#include <limits.h>
diff --git a/libc/src/__support/str_to_float.h b/libc/src/__support/str_to_float.h
index 67ebf3e769fef..5574858ad5e31 100644
--- a/libc/src/__support/str_to_float.h
+++ b/libc/src/__support/str_to_float.h
@@ -9,12 +9,12 @@
#ifndef LIBC_SRC_SUPPORT_STR_TO_FLOAT_H
#define LIBC_SRC_SUPPORT_STR_TO_FLOAT_H
+#include "src/__support/CPP/Limits.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/ctype_utils.h"
#include "src/__support/detailed_powers_of_ten.h"
#include "src/__support/high_precision_decimal.h"
#include "src/__support/str_conv_utils.h"
-#include "utils/CPP/Limits.h"
#include <errno.h>
namespace __llvm_libc {
diff --git a/libc/src/math/generic/math_utils.h b/libc/src/math/generic/math_utils.h
index 4afddb04d6e43..ef86e88a361a0 100644
--- a/libc/src/math/generic/math_utils.h
+++ b/libc/src/math/generic/math_utils.h
@@ -9,8 +9,8 @@
#ifndef LLVM_LIBC_SRC_MATH_MATH_UTILS_H
#define LLVM_LIBC_SRC_MATH_MATH_UTILS_H
+#include "src/__support/CPP/TypeTraits.h"
#include "src/__support/common.h"
-#include "utils/CPP/TypeTraits.h"
#include <errno.h>
#include <math.h>
diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt
index 86c8f0f02cfe8..923ba09f3c64a 100644
--- a/libc/src/string/CMakeLists.txt
+++ b/libc/src/string/CMakeLists.txt
@@ -5,7 +5,7 @@ add_header_library(
HDRS
string_utils.h
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_entrypoint_object(
@@ -188,7 +188,7 @@ add_entrypoint_object(
HDRS
strspn.h
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_entrypoint_object(
diff --git a/libc/src/string/string_utils.h b/libc/src/string/string_utils.h
index 4f179bb628d6c..699f65f0a9b19 100644
--- a/libc/src/string/string_utils.h
+++ b/libc/src/string/string_utils.h
@@ -9,8 +9,8 @@
#ifndef LIBC_SRC_STRING_STRING_UTILS_H
#define LIBC_SRC_STRING_STRING_UTILS_H
+#include "src/__support/CPP/Bitset.h"
#include "src/__support/common.h"
-#include "utils/CPP/Bitset.h"
#include <stddef.h> // size_t
namespace __llvm_libc {
diff --git a/libc/src/string/strspn.cpp b/libc/src/string/strspn.cpp
index 893b2c988a398..879850500d34a 100644
--- a/libc/src/string/strspn.cpp
+++ b/libc/src/string/strspn.cpp
@@ -8,8 +8,8 @@
#include "src/string/strspn.h"
+#include "src/__support/CPP/Bitset.h"
#include "src/__support/common.h"
-#include "utils/CPP/Bitset.h"
#include <stddef.h>
namespace __llvm_libc {
diff --git a/libc/test/config/linux/x86_64/syscall_test.cpp b/libc/test/config/linux/x86_64/syscall_test.cpp
index a6746a4f235b5..971b571fce4d7 100644
--- a/libc/test/config/linux/x86_64/syscall_test.cpp
+++ b/libc/test/config/linux/x86_64/syscall_test.cpp
@@ -9,7 +9,7 @@
#include "config/linux/syscall.h"
#include "utils/UnitTest/Test.h"
-#include "utils/CPP/Functional.h"
+#include "src/__support/CPP/Functional.h"
TEST(LlvmLibcX86_64_SyscallTest, APITest) {
// We only do a signature test here. Actual functionality tests are
diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt
index 790bb857a4e61..e4f9e49f701f6 100644
--- a/libc/test/src/CMakeLists.txt
+++ b/libc/test/src/CMakeLists.txt
@@ -90,7 +90,7 @@ set_target_properties(
target_include_directories(
libc-integration-test BEFORE
PRIVATE
- "${LIBC_SOURCE_DIR}/utils/CPP"
+ "${LIBC_SOURCE_DIR}/src/__support/CPP"
"${LIBC_BUILD_DIR}/include"
)
target_compile_options(
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index 5a7a145dfd2c1..8b1c1467f0e25 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -12,7 +12,7 @@ add_fp_unittest(
DEPENDS
libc.include.errno
libc.src.math.cosf
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
libc.src.__support.FPUtil.fputil
)
@@ -40,7 +40,7 @@ add_fp_unittest(
DEPENDS
libc.include.errno
libc.src.math.sinf
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
libc.src.__support.FPUtil.fputil
)
@@ -68,7 +68,7 @@ add_fp_unittest(
DEPENDS
libc.include.errno
libc.src.math.sincosf
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
libc.src.__support.FPUtil.fputil
)
diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h
index b101e7fdd3f86..262fcb88adb27 100644
--- a/libc/test/src/math/NextAfterTest.h
+++ b/libc/test/src/math/NextAfterTest.h
@@ -9,10 +9,10 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
+#include "src/__support/CPP/TypeTraits.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/TestHelpers.h"
-#include "utils/CPP/TypeTraits.h"
#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/cosf_test.cpp b/libc/test/src/math/cosf_test.cpp
index ea34f319d6b8e..de7d5db4d0fcb 100644
--- a/libc/test/src/math/cosf_test.cpp
+++ b/libc/test/src/math/cosf_test.cpp
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/Array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/TestHelpers.h"
#include "src/math/cosf.h"
#include "test/src/math/sdcomp26094.h"
-#include "utils/CPP/Array.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/sdcomp26094.h b/libc/test/src/math/sdcomp26094.h
index 9c7d464e5d2bc..c42c12c237aff 100644
--- a/libc/test/src/math/sdcomp26094.h
+++ b/libc/test/src/math/sdcomp26094.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_SDCOMP26094_H
#define LLVM_LIBC_TEST_SRC_MATH_SDCOMP26094_H
-#include "utils/CPP/Array.h"
+#include "src/__support/CPP/Array.h"
#include <stdint.h>
diff --git a/libc/test/src/math/sincosf_test.cpp b/libc/test/src/math/sincosf_test.cpp
index 4e626e85c294b..77fe3778eec51 100644
--- a/libc/test/src/math/sincosf_test.cpp
+++ b/libc/test/src/math/sincosf_test.cpp
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/Array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/TestHelpers.h"
#include "src/math/sincosf.h"
#include "test/src/math/sdcomp26094.h"
-#include "utils/CPP/Array.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/math/sinf_test.cpp b/libc/test/src/math/sinf_test.cpp
index 344766f3c9635..a3620eff98440 100644
--- a/libc/test/src/math/sinf_test.cpp
+++ b/libc/test/src/math/sinf_test.cpp
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/Array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/TestHelpers.h"
#include "src/math/sinf.h"
#include "test/src/math/sdcomp26094.h"
-#include "utils/CPP/Array.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
#include "utils/UnitTest/Test.h"
#include <math.h>
diff --git a/libc/test/src/stdio/fwrite_test.cpp b/libc/test/src/stdio/fwrite_test.cpp
index a65555d19842a..9d38d84f160ba 100644
--- a/libc/test/src/stdio/fwrite_test.cpp
+++ b/libc/test/src/stdio/fwrite_test.cpp
@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/Array.h"
#include "src/stdio/FILE.h"
#include "src/stdio/fwrite.h"
-#include "utils/CPP/Array.h"
#include "utils/UnitTest/Test.h"
TEST(LlvmLibcStdio, FWriteBasic) {
diff --git a/libc/test/src/string/bzero_test.cpp b/libc/test/src/string/bzero_test.cpp
index d56af889a250a..a997cbc43f46f 100644
--- a/libc/test/src/string/bzero_test.cpp
+++ b/libc/test/src/string/bzero_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/bzero.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
using __llvm_libc::cpp::Array;
diff --git a/libc/test/src/string/memccpy_test.cpp b/libc/test/src/string/memccpy_test.cpp
index 980c3a0ae5f35..ac11e33a3d63c 100644
--- a/libc/test/src/string/memccpy_test.cpp
+++ b/libc/test/src/string/memccpy_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/memccpy.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
#include <stddef.h> // For size_t.
diff --git a/libc/test/src/string/memcpy_test.cpp b/libc/test/src/string/memcpy_test.cpp
index fc9b8f3ea7961..9a7c9ba7f7a04 100644
--- a/libc/test/src/string/memcpy_test.cpp
+++ b/libc/test/src/string/memcpy_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/memcpy.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
using __llvm_libc::cpp::Array;
diff --git a/libc/test/src/string/memmove_test.cpp b/libc/test/src/string/memmove_test.cpp
index 22e0b3b753ec4..b922fb4d5dd44 100644
--- a/libc/test/src/string/memmove_test.cpp
+++ b/libc/test/src/string/memmove_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/memmove.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
class LlvmLibcMemmoveTest : public __llvm_libc::testing::Test {
diff --git a/libc/test/src/string/memory_utils/CMakeLists.txt b/libc/test/src/string/memory_utils/CMakeLists.txt
index 9f2950dc56582..31276f128b14b 100644
--- a/libc/test/src/string/memory_utils/CMakeLists.txt
+++ b/libc/test/src/string/memory_utils/CMakeLists.txt
@@ -8,7 +8,7 @@ add_libc_unittest(
utils_test.cpp
DEPENDS
libc.src.string.memory_utils.memory_utils
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
COMPILE_OPTIONS
${LIBC_COMPILE_OPTIONS_NATIVE}
-ffreestanding
diff --git a/libc/test/src/string/memory_utils/elements_test.cpp b/libc/test/src/string/memory_utils/elements_test.cpp
index 120cd6ff8761e..0f5f460cb849c 100644
--- a/libc/test/src/string/memory_utils/elements_test.cpp
+++ b/libc/test/src/string/memory_utils/elements_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/Array.h"
#include "src/string/memory_utils/elements.h"
-#include "utils/CPP/Array.h"
#include "utils/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/memory_utils/memory_access_test.cpp b/libc/test/src/string/memory_utils/memory_access_test.cpp
index 4a0bff27cd5f9..966863d724b56 100644
--- a/libc/test/src/string/memory_utils/memory_access_test.cpp
+++ b/libc/test/src/string/memory_utils/memory_access_test.cpp
@@ -8,9 +8,9 @@
#define LLVM_LIBC_UNITTEST_OBSERVE 1
+#include "src/__support/CPP/Array.h"
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/memory_utils/elements.h"
-#include "utils/CPP/Array.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
#include <stdio.h>
diff --git a/libc/test/src/string/memory_utils/utils_test.cpp b/libc/test/src/string/memory_utils/utils_test.cpp
index bb830d3306741..6b9ece4d6c6a5 100644
--- a/libc/test/src/string/memory_utils/utils_test.cpp
+++ b/libc/test/src/string/memory_utils/utils_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/Array.h"
#include "src/string/memory_utils/utils.h"
-#include "utils/CPP/Array.h"
#include "utils/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/src/string/memset_test.cpp b/libc/test/src/string/memset_test.cpp
index 147ab1f086114..c3f65cf6fd6c9 100644
--- a/libc/test/src/string/memset_test.cpp
+++ b/libc/test/src/string/memset_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/memset.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
using __llvm_libc::cpp::Array;
diff --git a/libc/test/src/string/strncpy_test.cpp b/libc/test/src/string/strncpy_test.cpp
index 83f24d5c5ae8b..7bb70e9865a3e 100644
--- a/libc/test/src/string/strncpy_test.cpp
+++ b/libc/test/src/string/strncpy_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "src/__support/CPP/ArrayRef.h"
#include "src/string/strncpy.h"
-#include "utils/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
#include <stddef.h> // For size_t.
diff --git a/libc/test/utils/CPP/CMakeLists.txt b/libc/test/utils/CPP/CMakeLists.txt
index 09c43d64ce938..a4a0eed0c9c74 100644
--- a/libc/test/utils/CPP/CMakeLists.txt
+++ b/libc/test/utils/CPP/CMakeLists.txt
@@ -7,7 +7,7 @@ add_libc_unittest(
SRCS
bitset_test.cpp
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_libc_unittest(
@@ -17,7 +17,7 @@ add_libc_unittest(
SRCS
stringview_test.cpp
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_libc_unittest(
@@ -27,7 +27,7 @@ add_libc_unittest(
SRCS
limits_test.cpp
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
add_libc_unittest(
@@ -37,5 +37,5 @@ add_libc_unittest(
SRCS
arrayref_test.cpp
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
diff --git a/libc/test/utils/CPP/arrayref_test.cpp b/libc/test/utils/CPP/arrayref_test.cpp
index 83dda9675c7be..79466c7d23626 100644
--- a/libc/test/utils/CPP/arrayref_test.cpp
+++ b/libc/test/utils/CPP/arrayref_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/CPP/ArrayRef.h"
+#include "src/__support/CPP/ArrayRef.h"
#include "utils/UnitTest/Test.h"
namespace __llvm_libc {
diff --git a/libc/test/utils/CPP/bitset_test.cpp b/libc/test/utils/CPP/bitset_test.cpp
index 66e608cec932d..4bcddad5715cc 100644
--- a/libc/test/utils/CPP/bitset_test.cpp
+++ b/libc/test/utils/CPP/bitset_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/CPP/Bitset.h"
+#include "src/__support/CPP/Bitset.h"
#include "utils/UnitTest/Test.h"
TEST(LlvmLibcBitsetTest, SetBitForSizeEqualToOne) {
diff --git a/libc/test/utils/CPP/limits_test.cpp b/libc/test/utils/CPP/limits_test.cpp
index 6904a728c4cb1..fa0ae38cae6d2 100644
--- a/libc/test/utils/CPP/limits_test.cpp
+++ b/libc/test/utils/CPP/limits_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/CPP/Limits.h"
+#include "src/__support/CPP/Limits.h"
#include "utils/UnitTest/Test.h"
// This just checks against the C spec, almost all implementations will surpass
diff --git a/libc/test/utils/CPP/stringview_test.cpp b/libc/test/utils/CPP/stringview_test.cpp
index b88bcc38a1efd..a62cde9bfb818 100644
--- a/libc/test/utils/CPP/stringview_test.cpp
+++ b/libc/test/utils/CPP/stringview_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "utils/CPP/StringView.h"
+#include "src/__support/CPP/StringView.h"
#include "utils/UnitTest/Test.h"
TEST(LlvmLibcStringViewTest, InitializeCheck) {
diff --git a/libc/test/utils/UnitTest/CMakeLists.txt b/libc/test/utils/UnitTest/CMakeLists.txt
index 68b127a37c2ec..d677260d11557 100644
--- a/libc/test/utils/UnitTest/CMakeLists.txt
+++ b/libc/test/utils/UnitTest/CMakeLists.txt
@@ -7,5 +7,5 @@ add_libc_unittest(
SRCS
testfilter_test.cpp
DEPENDS
- libc.utils.CPP.standalone_cpp
+ libc.src.__support.CPP.standalone_cpp
)
diff --git a/libc/utils/CMakeLists.txt b/libc/utils/CMakeLists.txt
index a43094c86e34f..df79da3204990 100644
--- a/libc/utils/CMakeLists.txt
+++ b/libc/utils/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(CPP)
add_subdirectory(MPFRWrapper)
add_subdirectory(testutils)
add_subdirectory(UnitTest)
diff --git a/libc/utils/MPFRWrapper/CMakeLists.txt b/libc/utils/MPFRWrapper/CMakeLists.txt
index 46621fb5df265..2ef3731c57493 100644
--- a/libc/utils/MPFRWrapper/CMakeLists.txt
+++ b/libc/utils/MPFRWrapper/CMakeLists.txt
@@ -3,7 +3,7 @@ if(LIBC_TESTS_CAN_USE_MPFR)
MPFRUtils.cpp
MPFRUtils.h
)
- add_dependencies(libcMPFRWrapper libc.utils.CPP.standalone_cpp libc.src.__support.FPUtil.fputil LibcUnitTest)
+ add_dependencies(libcMPFRWrapper libc.src.__support.CPP.standalone_cpp libc.src.__support.FPUtil.fputil LibcUnitTest)
if(EXISTS ${LLVM_LIBC_MPFR_INSTALL_PATH})
target_include_directories(libcMPFRWrapper PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/include)
target_link_directories(libcMPFRWrapper PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/lib)
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
index 86305af009173..8bcaa13d92534 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -8,9 +8,9 @@
#include "MPFRUtils.h"
+#include "src/__support/CPP/StringView.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/TestHelpers.h"
-#include "utils/CPP/StringView.h"
#include <cmath>
#include <memory>
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.h b/libc/utils/MPFRWrapper/MPFRUtils.h
index 4e8dd385d4f9b..d2ca7612cf563 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.h
+++ b/libc/utils/MPFRWrapper/MPFRUtils.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_UTILS_TESTUTILS_MPFRUTILS_H
#define LLVM_LIBC_UTILS_TESTUTILS_MPFRUTILS_H
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#include "utils/UnitTest/Test.h"
#include <stdint.h>
diff --git a/libc/utils/UnitTest/CMakeLists.txt b/libc/utils/UnitTest/CMakeLists.txt
index 3dd79d0638ecf..4140c6daa5d95 100644
--- a/libc/utils/UnitTest/CMakeLists.txt
+++ b/libc/utils/UnitTest/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(
LibcTest.h
)
target_include_directories(LibcUnitTest PUBLIC ${LIBC_SOURCE_DIR})
-add_dependencies(LibcUnitTest libc.utils.CPP.standalone_cpp)
+add_dependencies(LibcUnitTest libc.src.__support.CPP.standalone_cpp)
target_link_libraries(LibcUnitTest PUBLIC libc_test_utils)
add_library(
@@ -14,6 +14,6 @@ add_library(
)
target_include_directories(LibcUnitTestMain PUBLIC ${LIBC_SOURCE_DIR})
-add_dependencies(LibcUnitTestMain LibcUnitTest libc.utils.CPP.standalone_cpp)
+add_dependencies(LibcUnitTestMain LibcUnitTest libc.src.__support.CPP.standalone_cpp)
target_link_libraries(LibcUnitTestMain PUBLIC LibcUnitTest libc_test_utils)
diff --git a/libc/utils/UnitTest/LibcTest.h b/libc/utils/UnitTest/LibcTest.h
index 8e2eec9f41cdf..a9dfbcbb4966a 100644
--- a/libc/utils/UnitTest/LibcTest.h
+++ b/libc/utils/UnitTest/LibcTest.h
@@ -9,12 +9,12 @@
#ifndef LLVM_LIBC_UTILS_UNITTEST_LIBCTEST_H
#define LLVM_LIBC_UTILS_UNITTEST_LIBCTEST_H
-// This file can only include headers from utils/CPP/ or utils/testutils. No
-// other headers should be included.
+// This file can only include headers from src/__support/CPP/ or
+// utils/testutils. No other headers should be included.
#include "PlatformDefs.h"
-#include "utils/CPP/TypeTraits.h"
+#include "src/__support/CPP/TypeTraits.h"
#include "utils/testutils/ExecuteFunction.h"
#include "utils/testutils/StreamWrapper.h"
More information about the libc-commits
mailing list