4 changes: 2 additions & 2 deletions libc/test/src/__support/integer_to_string_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#include "src/__support/CPP/limits.h"
#include "src/__support/CPP/span.h"
#include "src/__support/CPP/string_view.h"
#include "src/__support/UInt.h"
#include "src/__support/UInt128.h"
#include "src/__support/big_int.h"
#include "src/__support/integer_literals.h"
#include "src/__support/integer_to_string.h"
#include "src/__support/uint128.h"

#include "test/UnitTest/Test.h"

Expand Down
2 changes: 1 addition & 1 deletion libc/test/src/__support/math_extras_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//

#include "src/__support/UInt128.h" // UInt<128>
#include "src/__support/integer_literals.h"
#include "src/__support/math_extras.h"
#include "src/__support/uint128.h" // UInt<128>
#include "test/UnitTest/Test.h"

namespace LIBC_NAMESPACE {
Expand Down
2 changes: 1 addition & 1 deletion libc/test/src/__support/str_to_fp_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//

#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/UInt128.h"
#include "src/__support/str_to_float.h"
#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h"

#include "test/UnitTest/Test.h"
Expand Down
2 changes: 1 addition & 1 deletion libc/test/src/__support/uint_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//

#include "src/__support/CPP/optional.h"
#include "src/__support/UInt.h"
#include "src/__support/big_int.h"
#include "src/__support/integer_literals.h" // parse_unsigned_bigint
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128

Expand Down
2 changes: 1 addition & 1 deletion libc/test/src/math/smoke/nanf128_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//

#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/UInt128.h"
#include "src/__support/uint128.h"
#include "src/math/nanf128.h"
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
Expand Down
2 changes: 1 addition & 1 deletion libc/test/src/stdlib/strtold_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//

#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/UInt128.h"
#include "src/__support/uint128.h"
#include "src/errno/libc_errno.h"
#include "src/stdlib/strtold.h"

Expand Down
17 changes: 8 additions & 9 deletions utils/bazel/llvm-project-overlay/libc/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ libc_support_library(
hdrs = ["hdr/math_macros.h"],
)


############################### Support libraries ##############################

libc_support_library(
Expand Down Expand Up @@ -484,12 +483,12 @@ libc_support_library(
"src/__support/ryu_long_double_constants.h",
],
deps = [
":__support_big_int",
":__support_common",
":__support_cpp_type_traits",
":__support_fputil_dyadic_float",
":__support_fputil_fp_bits",
":__support_libc_assert",
":__support_uint",
],
)

Expand All @@ -502,8 +501,8 @@ libc_support_library(
)

libc_support_library(
name = "__support_uint",
hdrs = ["src/__support/UInt.h"],
name = "__support_big_int",
hdrs = ["src/__support/big_int.h"],
deps = [
":__support_cpp_array",
":__support_cpp_bit",
Expand All @@ -528,11 +527,11 @@ libc_support_library(

libc_support_library(
name = "__support_uint128",
hdrs = ["src/__support/UInt128.h"],
hdrs = ["src/__support/uint128.h"],
deps = [
":__support_big_int",
":__support_macros_attributes",
":__support_macros_properties_types",
":__support_uint",
],
)

Expand Down Expand Up @@ -561,6 +560,7 @@ libc_support_library(
name = "__support_integer_to_string",
hdrs = ["src/__support/integer_to_string.h"],
deps = [
":__support_big_int",
":__support_common",
":__support_cpp_algorithm",
":__support_cpp_bit",
Expand All @@ -569,7 +569,6 @@ libc_support_library(
":__support_cpp_span",
":__support_cpp_string_view",
":__support_cpp_type_traits",
":__support_uint",
],
)

Expand Down Expand Up @@ -973,11 +972,11 @@ libc_support_library(
name = "__support_fputil_dyadic_float",
hdrs = ["src/__support/FPUtil/dyadic_float.h"],
deps = [
":__support_big_int",
":__support_common",
":__support_fputil_fp_bits",
":__support_fputil_multiply_add",
":__support_macros_optimization",
":__support_uint",
],
)

Expand Down Expand Up @@ -3223,6 +3222,7 @@ libc_support_library(
],
defines = PRINTF_COPTS,
deps = [
":__support_big_int",
":__support_common",
":__support_cpp_limits",
":__support_cpp_span",
Expand All @@ -3233,7 +3233,6 @@ libc_support_library(
":__support_fputil_rounding_mode",
":__support_integer_to_string",
":__support_libc_assert",
":__support_uint",
":__support_uint128",
":printf_config",
":printf_core_structs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ libc_support_library(
srcs = ["TestLogger.cpp"],
hdrs = ["TestLogger.h"],
deps = [
"//libc:__support_big_int",
"//libc:__support_cpp_string",
"//libc:__support_cpp_string_view",
"//libc:__support_macros_properties_types",
"//libc:__support_osutil_io",
"//libc:__support_uint",
"//libc:__support_uint128",
],
)
Expand Down Expand Up @@ -128,8 +128,8 @@ libc_support_library(
"StringUtils.h",
],
deps = [
"//libc:__support_big_int",
"//libc:__support_cpp_string",
"//libc:__support_cpp_type_traits",
"//libc:__support_uint",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ libc_test(
name = "integer_to_string_test",
srcs = ["integer_to_string_test.cpp"],
deps = [
"//libc:__support_big_int",
"//libc:__support_cpp_limits",
"//libc:__support_cpp_span",
"//libc:__support_cpp_string_view",
"//libc:__support_integer_literals",
"//libc:__support_integer_to_string",
"//libc:__support_uint",
"//libc:__support_uint128",
],
)
Expand All @@ -86,11 +86,12 @@ libc_test(
name = "uint_test",
srcs = ["uint_test.cpp"],
deps = [
"//libc:__support_big_int",
"//libc:__support_cpp_optional",
"//libc:__support_integer_literals",
"//libc:__support_macros_properties_types",
"//libc:__support_uint",
"//libc:hdr_math_macros",
"//libc:llvm_libc_macros_math_macros",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ libc_test(
name = "bit_test",
srcs = ["bit_test.cpp"],
deps = [
"//libc:__support_big_int",
"//libc:__support_cpp_bit",
"//libc:__support_macros_properties_types",
"//libc:__support_uint",
],
)

Expand All @@ -48,9 +48,9 @@ libc_test(
name = "limits_test",
srcs = ["limits_test.cpp"],
deps = [
"//libc:__support_big_int",
"//libc:__support_cpp_limits",
"//libc:__support_macros_properties_types",
"//libc:__support_uint",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ libc_test(
srcs = ["dyadic_float_test.cpp"],
copts = ["-frounding-math"],
deps = [
"//libc:__support_big_int",
"//libc:__support_fputil_dyadic_float",
"//libc:__support_uint",
"//libc:__support_uint128",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
Expand Down