[libc] [llvm] [libc] Add proxy header math_macros.h. (PR #87598)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 5 08:51:10 PDT 2024
https://github.com/lntue updated https://github.com/llvm/llvm-project/pull/87598
>From 2922a193ab313aa1284db7091d5369682978477b Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Thu, 4 Apr 2024 05:12:50 +0000
Subject: [PATCH 1/6] [libc] Add proxy header math_macros.h.
---
libc/CMakeLists.txt | 1 +
libc/fuzzing/math/CMakeLists.txt | 1 +
libc/fuzzing/math/RemQuoDiff.h | 2 +-
libc/fuzzing/stdlib/CMakeLists.txt | 1 +
libc/fuzzing/stdlib/strtofloat_fuzz.cpp | 2 +-
libc/hdr/CMakeLists.txt | 33 ++++++
libc/hdr/math_macros.h | 22 ++++
libc/include/llvm-libc-macros/math-macros.h | 8 +-
libc/src/__support/FPUtil/CMakeLists.txt | 7 +-
libc/src/__support/FPUtil/FEnvImpl.h | 2 +-
.../__support/FPUtil/ManipulationFunctions.h | 2 +-
.../FPUtil/NearestIntegerOperations.h | 2 +-
libc/src/math/generic/CMakeLists.txt | 17 +--
libc/src/math/generic/math_utils.h | 2 +-
libc/test/CMakeLists.txt | 6 +-
libc/test/UnitTest/FPMatcher.h | 2 +-
libc/test/src/CMakeLists.txt | 8 +-
libc/test/src/__support/uint_test.cpp | 2 +-
libc/test/src/math/CMakeLists.txt | 88 ---------------
libc/test/src/math/CeilTest.h | 2 +-
libc/test/src/math/CopySignTest.h | 2 +-
libc/test/src/math/FAbsTest.h | 2 +-
libc/test/src/math/FDimTest.h | 2 +-
libc/test/src/math/FMaxTest.h | 2 +-
libc/test/src/math/FMinTest.h | 2 +-
libc/test/src/math/FModTest.h | 2 +-
libc/test/src/math/FloorTest.h | 2 +-
libc/test/src/math/FrexpTest.h | 2 +-
libc/test/src/math/HypotTest.h | 2 +-
libc/test/src/math/ILogbTest.h | 2 +-
libc/test/src/math/LdExpTest.h | 2 +-
libc/test/src/math/LogbTest.h | 2 +-
libc/test/src/math/ModfTest.h | 2 +-
libc/test/src/math/NextAfterTest.h | 2 +-
libc/test/src/math/RIntTest.h | 2 +-
libc/test/src/math/RemQuoTest.h | 2 +-
libc/test/src/math/RoundTest.h | 2 +-
libc/test/src/math/RoundToIntegerTest.h | 2 +-
libc/test/src/math/SqrtTest.h | 2 +-
libc/test/src/math/TruncTest.h | 2 +-
libc/test/src/math/acosf_test.cpp | 2 +-
libc/test/src/math/acoshf_test.cpp | 2 +-
libc/test/src/math/asinf_test.cpp | 2 +-
libc/test/src/math/asinhf_test.cpp | 2 +-
libc/test/src/math/atan2f_test.cpp | 2 +-
libc/test/src/math/atanf_test.cpp | 2 +-
libc/test/src/math/atanhf_test.cpp | 2 +-
libc/test/src/math/cos_test.cpp | 2 +-
libc/test/src/math/cosf_test.cpp | 2 +-
libc/test/src/math/coshf_test.cpp | 2 +-
libc/test/src/math/erff_test.cpp | 2 +-
libc/test/src/math/exhaustive/CMakeLists.txt | 24 -----
libc/test/src/math/exp10_test.cpp | 2 +-
libc/test/src/math/exp10f_test.cpp | 2 +-
libc/test/src/math/exp2_test.cpp | 2 +-
libc/test/src/math/exp2f_test.cpp | 2 +-
libc/test/src/math/exp_test.cpp | 2 +-
libc/test/src/math/expf_test.cpp | 2 +-
libc/test/src/math/explogxf_test.cpp | 2 +-
libc/test/src/math/expm1_test.cpp | 2 +-
libc/test/src/math/expm1f_test.cpp | 2 +-
libc/test/src/math/fdim_test.cpp | 2 +-
libc/test/src/math/fdimf_test.cpp | 2 +-
libc/test/src/math/fdiml_test.cpp | 2 +-
libc/test/src/math/generic/CMakeLists.txt | 3 -
libc/test/src/math/ilogb_test.cpp | 2 +-
libc/test/src/math/ilogbf_test.cpp | 2 +-
libc/test/src/math/ilogbl_test.cpp | 2 +-
libc/test/src/math/log10_test.cpp | 2 +-
libc/test/src/math/log10f_test.cpp | 2 +-
libc/test/src/math/log1p_test.cpp | 2 +-
libc/test/src/math/log1pf_test.cpp | 2 +-
libc/test/src/math/log2_test.cpp | 2 +-
libc/test/src/math/log2f_test.cpp | 2 +-
libc/test/src/math/log_test.cpp | 2 +-
libc/test/src/math/logf_test.cpp | 2 +-
libc/test/src/math/powf_test.cpp | 2 +-
libc/test/src/math/sin_test.cpp | 2 +-
libc/test/src/math/sincosf_test.cpp | 2 +-
libc/test/src/math/sinf_test.cpp | 2 +-
libc/test/src/math/sinhf_test.cpp | 2 +-
libc/test/src/math/smoke/CMakeLists.txt | 102 ------------------
libc/test/src/math/smoke/CanonicalizeTest.h | 2 +-
libc/test/src/math/smoke/CeilTest.h | 2 +-
libc/test/src/math/smoke/CopySignTest.h | 2 +-
libc/test/src/math/smoke/FAbsTest.h | 2 +-
libc/test/src/math/smoke/FModTest.h | 2 +-
libc/test/src/math/smoke/FloorTest.h | 2 +-
libc/test/src/math/smoke/HypotTest.h | 2 +-
libc/test/src/math/smoke/ModfTest.h | 2 +-
libc/test/src/math/smoke/NextAfterTest.h | 2 +-
libc/test/src/math/smoke/NextTowardTest.h | 2 +-
libc/test/src/math/smoke/RIntTest.h | 2 +-
libc/test/src/math/smoke/RemQuoTest.h | 2 +-
libc/test/src/math/smoke/RoundTest.h | 2 +-
libc/test/src/math/smoke/RoundToIntegerTest.h | 2 +-
libc/test/src/math/smoke/SqrtTest.h | 2 +-
libc/test/src/math/smoke/TruncTest.h | 2 +-
libc/test/src/math/smoke/acosf_test.cpp | 2 +-
libc/test/src/math/smoke/acoshf_test.cpp | 2 +-
libc/test/src/math/smoke/asinf_test.cpp | 2 +-
libc/test/src/math/smoke/asinhf_test.cpp | 2 +-
libc/test/src/math/smoke/atan2f_test.cpp | 2 +-
libc/test/src/math/smoke/atanf_test.cpp | 2 +-
libc/test/src/math/smoke/atanhf_test.cpp | 2 +-
libc/test/src/math/smoke/cosf_test.cpp | 2 +-
libc/test/src/math/smoke/coshf_test.cpp | 2 +-
libc/test/src/math/smoke/erff_test.cpp | 2 +-
libc/test/src/math/smoke/exp10_test.cpp | 2 +-
libc/test/src/math/smoke/exp10f_test.cpp | 2 +-
libc/test/src/math/smoke/exp2_test.cpp | 2 +-
libc/test/src/math/smoke/exp2f_test.cpp | 2 +-
libc/test/src/math/smoke/exp_test.cpp | 2 +-
libc/test/src/math/smoke/expf_test.cpp | 2 +-
libc/test/src/math/smoke/expm1_test.cpp | 2 +-
libc/test/src/math/smoke/expm1f_test.cpp | 2 +-
libc/test/src/math/smoke/log10_test.cpp | 2 +-
libc/test/src/math/smoke/log10f_test.cpp | 2 +-
libc/test/src/math/smoke/log1p_test.cpp | 2 +-
libc/test/src/math/smoke/log1pf_test.cpp | 2 +-
libc/test/src/math/smoke/log2_test.cpp | 2 +-
libc/test/src/math/smoke/log2f_test.cpp | 2 +-
libc/test/src/math/smoke/log_test.cpp | 2 +-
libc/test/src/math/smoke/logf_test.cpp | 2 +-
libc/test/src/math/smoke/powf_test.cpp | 2 +-
libc/test/src/math/smoke/sincosf_test.cpp | 2 +-
libc/test/src/math/smoke/sinf_test.cpp | 2 +-
libc/test/src/math/smoke/sinhf_test.cpp | 2 +-
libc/test/src/math/smoke/tanf_test.cpp | 2 +-
libc/test/src/math/smoke/tanhf_test.cpp | 2 +-
libc/test/src/math/tan_test.cpp | 2 +-
libc/test/src/math/tanf_test.cpp | 2 +-
libc/test/src/math/tanhf_test.cpp | 2 +-
libc/test/src/sys/random/linux/CMakeLists.txt | 1 -
libc/test/utils/FPUtil/CMakeLists.txt | 2 +-
.../utils/FPUtil/x86_long_double_test.cpp | 2 +-
libc/utils/MPFRWrapper/MPFRUtils.cpp | 2 +-
.../llvm-project-overlay/libc/BUILD.bazel | 16 ++-
.../libc/test/UnitTest/BUILD.bazel | 2 +-
.../libc/test/src/__support/BUILD.bazel | 2 +-
.../libc/test/src/math/BUILD.bazel | 14 +--
.../test/src/math/libc_math_test_rules.bzl | 2 +-
.../libc/utils/MPFRWrapper/BUILD.bazel | 2 +-
143 files changed, 220 insertions(+), 384 deletions(-)
create mode 100644 libc/hdr/CMakeLists.txt
create mode 100644 libc/hdr/math_macros.h
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index a0d79858a896ad..175efd89d67e6d 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -381,6 +381,7 @@ endforeach()
add_subdirectory(include)
add_subdirectory(config)
+add_subdirectory(hdr)
add_subdirectory(src)
add_subdirectory(utils)
diff --git a/libc/fuzzing/math/CMakeLists.txt b/libc/fuzzing/math/CMakeLists.txt
index 86c864083d206b..6990a04922a5cf 100644
--- a/libc/fuzzing/math/CMakeLists.txt
+++ b/libc/fuzzing/math/CMakeLists.txt
@@ -8,6 +8,7 @@ add_libc_fuzzer(
SingleInputSingleOutputDiff.h
TwoInputSingleOutputDiff.h
DEPENDS
+ libc.hdr.math_macros
libc.src.math.ceil
libc.src.math.ceilf
libc.src.math.ceill
diff --git a/libc/fuzzing/math/RemQuoDiff.h b/libc/fuzzing/math/RemQuoDiff.h
index 95a9866f29dbbe..84a6a24ce52719 100644
--- a/libc/fuzzing/math/RemQuoDiff.h
+++ b/libc/fuzzing/math/RemQuoDiff.h
@@ -11,7 +11,7 @@
#include "src/__support/FPUtil/FPBits.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <stddef.h>
#include <stdint.h>
diff --git a/libc/fuzzing/stdlib/CMakeLists.txt b/libc/fuzzing/stdlib/CMakeLists.txt
index 711b0fd9820f93..204bc619318da2 100644
--- a/libc/fuzzing/stdlib/CMakeLists.txt
+++ b/libc/fuzzing/stdlib/CMakeLists.txt
@@ -22,6 +22,7 @@ add_libc_fuzzer(
SRCS
strtofloat_fuzz.cpp
DEPENDS
+ libc.hdr.math_macros
libc.src.stdlib.atof
libc.src.stdlib.strtof
libc.src.stdlib.strtod
diff --git a/libc/fuzzing/stdlib/strtofloat_fuzz.cpp b/libc/fuzzing/stdlib/strtofloat_fuzz.cpp
index b000321854d16d..c158162ba6238e 100644
--- a/libc/fuzzing/stdlib/strtofloat_fuzz.cpp
+++ b/libc/fuzzing/stdlib/strtofloat_fuzz.cpp
@@ -16,7 +16,7 @@
#include "src/__support/FPUtil/FPBits.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <stddef.h>
#include <stdint.h>
diff --git a/libc/hdr/CMakeLists.txt b/libc/hdr/CMakeLists.txt
new file mode 100644
index 00000000000000..1d3eb9d5240ab9
--- /dev/null
+++ b/libc/hdr/CMakeLists.txt
@@ -0,0 +1,33 @@
+function(add_proxy_header_library target_name)
+ cmake_parse_arguments(
+ "ADD_PROXY_HEADER"
+ "" # Optional arguments
+ "" # Single value arguments
+ "DEPENDS;FULL_BUILD_DEPENDS" # Multi-value arguments
+ ${ARGN}
+ )
+
+ set(deps "")
+ if(ADD_PROXY_HEADER_DEPENDS)
+ list(APPEND deps ${ADD_PROXY_HEADER_DEPENDS})
+ endif()
+
+ if(LLVM_LIBC_FULL_BUILD AND ADD_PROXY_HEADER_FULL_BUILD_DEPENDS)
+ list(APPEND deps ${ADD_PROXY_HEADER_FULL_BUILD_DEPENDS})
+ endif()
+
+ add_header_library(
+ ${target_name}
+ ${ADD_PROXY_HEADER_UNPARSED_ARGUMENTS}
+ DEPENDS ${deps}
+ )
+endfunction()
+
+add_proxy_header_library(
+ math_macros
+ HDRS
+ math_macros.h
+ FULL_BUILD_DEPENDS
+ libc.include.llvm-libc-macros.math_macros
+ libc.include.math
+)
diff --git a/libc/hdr/math_macros.h b/libc/hdr/math_macros.h
new file mode 100644
index 00000000000000..008d00354b4b0e
--- /dev/null
+++ b/libc/hdr/math_macros.h
@@ -0,0 +1,22 @@
+//===-- Definition of macros from math.h ----------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_HDR_MATH_MACROS_H
+#define LLVM_LIBC_HDR_MATH_MACROS_H
+
+#ifdef LLVM_LIBC_FULL_BUILD
+
+#include "include/llvm-libc-macros/math-macros.h"
+
+#else // Overlay mode
+
+#include <math.h>
+
+#endif // LLVM_LIBC_FULL_BUILD
+
+#endif // LLVM_LIBC_HDR_MATH_MACROS_H
diff --git a/libc/include/llvm-libc-macros/math-macros.h b/libc/include/llvm-libc-macros/math-macros.h
index 6046ea98cb8ac5..6fe5b2b3ddd72e 100644
--- a/libc/include/llvm-libc-macros/math-macros.h
+++ b/libc/include/llvm-libc-macros/math-macros.h
@@ -35,12 +35,12 @@
#define INFINITY __builtin_inf()
#define NAN __builtin_nanf("")
-#define FP_ILOGB0 (-INT_MAX - 1)
-#define FP_LLOGB0 (-LONG_MAX - 1)
+#define FP_ILOGB0 INT_MIN
+#define FP_LLOGB0 LONG_MIN
#ifdef __FP_LOGBNAN_MIN
-#define FP_ILOGBNAN (-INT_MAX - 1)
-#define FP_LLOGBNAN (-LONG_MAX - 1)
+#define FP_ILOGBNAN INT_MIN
+#define FP_LLOGBNAN LONG_MIN
#else
#define FP_ILOGBNAN INT_MAX
#define FP_LLOGBNAN LONG_MAX
diff --git a/libc/src/__support/FPUtil/CMakeLists.txt b/libc/src/__support/FPUtil/CMakeLists.txt
index ff155a19758d20..1af236ed9d6bc1 100644
--- a/libc/src/__support/FPUtil/CMakeLists.txt
+++ b/libc/src/__support/FPUtil/CMakeLists.txt
@@ -4,7 +4,7 @@ add_header_library(
FEnvImpl.h
DEPENDS
libc.include.fenv
- libc.include.math
+ libc.hdr.math_macros
libc.src.__support.macros.attributes
libc.src.errno.errno
)
@@ -15,7 +15,6 @@ add_header_library(
rounding_mode.h
DEPENDS
libc.include.fenv
- libc.include.math
libc.src.__support.macros.attributes
libc.src.__support.macros.properties.architectures
libc.src.__support.macros.sanitizer
@@ -59,9 +58,9 @@ add_header_library(
.fp_bits
.fenv_impl
.rounding_mode
+ libc.hdr.math_macros
libc.src.__support.CPP.type_traits
libc.src.__support.common
- libc.include.math
libc.src.errno.errno
)
@@ -216,12 +215,12 @@ add_header_library(
.dyadic_float
.nearest_integer_operations
.normal_float
+ libc.hdr.math_macros
libc.src.__support.CPP.bit
libc.src.__support.CPP.limits
libc.src.__support.CPP.type_traits
libc.src.__support.common
libc.src.__support.macros.optimization
- libc.include.math
libc.src.errno.errno
)
diff --git a/libc/src/__support/FPUtil/FEnvImpl.h b/libc/src/__support/FPUtil/FEnvImpl.h
index 6086d5d3de2dca..4be1a57f0f4b38 100644
--- a/libc/src/__support/FPUtil/FEnvImpl.h
+++ b/libc/src/__support/FPUtil/FEnvImpl.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_FPUTIL_FENVIMPL_H
#define LLVM_LIBC_SRC___SUPPORT_FPUTIL_FENVIMPL_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/macros/attributes.h" // LIBC_INLINE
#include "src/__support/macros/properties/architectures.h"
#include "src/errno/libc_errno.h"
diff --git a/libc/src/__support/FPUtil/ManipulationFunctions.h b/libc/src/__support/FPUtil/ManipulationFunctions.h
index 2c90b4888c2e5d..a289c2ef70467b 100644
--- a/libc/src/__support/FPUtil/ManipulationFunctions.h
+++ b/libc/src/__support/FPUtil/ManipulationFunctions.h
@@ -15,7 +15,7 @@
#include "dyadic_float.h"
#include "rounding_mode.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/limits.h" // INT_MAX, INT_MIN
#include "src/__support/CPP/type_traits.h"
diff --git a/libc/src/__support/FPUtil/NearestIntegerOperations.h b/libc/src/__support/FPUtil/NearestIntegerOperations.h
index 6b28e7ffb387b5..4645ab0b5350be 100644
--- a/libc/src/__support/FPUtil/NearestIntegerOperations.h
+++ b/libc/src/__support/FPUtil/NearestIntegerOperations.h
@@ -13,7 +13,7 @@
#include "FPBits.h"
#include "rounding_mode.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
index 5bc9066c6263cd..afbcdea3cf7abb 100644
--- a/libc/src/math/generic/CMakeLists.txt
+++ b/libc/src/math/generic/CMakeLists.txt
@@ -102,8 +102,8 @@ add_object_library(
HDRS
math_utils.h
DEPENDS
+ libc.hdr.math_macros
libc.include.errno
- libc.include.math
libc.src.errno.errno
)
@@ -139,7 +139,6 @@ add_entrypoint_object(
../cosf.h
DEPENDS
.sincosf_utils
- libc.include.math
libc.src.errno.errno
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fenv_impl
@@ -162,7 +161,6 @@ add_entrypoint_object(
DEPENDS
.range_reduction
.sincosf_utils
- libc.include.math
libc.src.errno.errno
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fenv_impl
@@ -185,7 +183,6 @@ add_entrypoint_object(
DEPENDS
.range_reduction
.sincosf_utils
- libc.include.math
libc.src.errno.errno
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -207,7 +204,6 @@ add_entrypoint_object(
DEPENDS
.range_reduction
.sincosf_utils
- libc.include.math
libc.src.errno.errno
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fenv_impl
@@ -770,7 +766,6 @@ add_entrypoint_object(
libc.src.__support.FPUtil.multiply_add
libc.src.__support.FPUtil.polyeval
libc.src.__support.macros.optimization
- libc.include.math
COMPILE_OPTIONS
-O3
)
@@ -785,7 +780,6 @@ add_entrypoint_object(
.common_constants
.explogxf
libc.include.errno
- libc.include.math
libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.FPUtil.dyadic_float
@@ -821,7 +815,6 @@ add_entrypoint_object(
libc.src.__support.macros.optimization
libc.include.errno
libc.src.errno.errno
- libc.include.math
COMPILE_OPTIONS
-O3
)
@@ -836,7 +829,6 @@ add_entrypoint_object(
.common_constants
.explogxf
libc.include.errno
- libc.include.math
libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.FPUtil.dyadic_float
@@ -871,7 +863,6 @@ add_header_library(
libc.src.__support.common
libc.include.errno
libc.src.errno.errno
- libc.include.math
)
add_entrypoint_object(
@@ -917,7 +908,6 @@ add_entrypoint_object(
.common_constants
.explogxf
libc.include.errno
- libc.include.math
libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.FPUtil.dyadic_float
@@ -951,7 +941,6 @@ add_header_library(
libc.src.__support.common
libc.include.errno
libc.src.errno.errno
- libc.include.math
COMPILE_OPTIONS
-O3
)
@@ -978,7 +967,6 @@ add_entrypoint_object(
.common_constants
.explogxf
libc.include.errno
- libc.include.math
libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.FPUtil.dyadic_float
@@ -1014,7 +1002,6 @@ add_entrypoint_object(
libc.src.__support.macros.optimization
libc.include.errno
libc.src.errno.errno
- libc.include.math
COMPILE_OPTIONS
-O3
)
@@ -1031,7 +1018,6 @@ add_entrypoint_object(
.exp2f_impl
.explogxf
libc.include.errno
- libc.include.math
libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.FPUtil.fenv_impl
@@ -2755,7 +2741,6 @@ add_object_library(
libc.src.__support.common
libc.include.errno
libc.src.errno.errno
- libc.include.math
COMPILE_OPTIONS
-O3
)
diff --git a/libc/src/math/generic/math_utils.h b/libc/src/math/generic/math_utils.h
index cced761fc8c822..3ddfeccfd64837 100644
--- a/libc/src/math/generic/math_utils.h
+++ b/libc/src/math/generic/math_utils.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_SRC_MATH_GENERIC_MATH_UTILS_H
#define LLVM_LIBC_SRC_MATH_GENERIC_MATH_UTILS_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/common.h"
diff --git a/libc/test/CMakeLists.txt b/libc/test/CMakeLists.txt
index 745a9a04b4af82..5e26a1000633b7 100644
--- a/libc/test/CMakeLists.txt
+++ b/libc/test/CMakeLists.txt
@@ -18,10 +18,6 @@ add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(utils)
-if(LLVM_LIBC_FULL_BUILD AND NOT LIBC_TARGET_OS_IS_BAREMETAL)
- add_subdirectory(IntegrationTest)
-endif()
-
if(NOT LLVM_LIBC_FULL_BUILD)
return()
endif()
@@ -31,4 +27,6 @@ if(NOT ${LIBC_TARGET_OS} STREQUAL "linux" AND
# Integration tests are currently only available for linux and the GPU.
return()
endif()
+
+add_subdirectory(IntegrationTest)
add_subdirectory(integration)
diff --git a/libc/test/UnitTest/FPMatcher.h b/libc/test/UnitTest/FPMatcher.h
index f4553eac5c8a57..a76e0b8ef6f6f0 100644
--- a/libc/test/UnitTest/FPMatcher.h
+++ b/libc/test/UnitTest/FPMatcher.h
@@ -18,7 +18,7 @@
#include "test/UnitTest/StringUtils.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace LIBC_NAMESPACE {
namespace testing {
diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt
index f70ffda3f700e5..95f1768c96aac3 100644
--- a/libc/test/src/CMakeLists.txt
+++ b/libc/test/src/CMakeLists.txt
@@ -3,7 +3,7 @@ function(add_fp_unittest name)
"MATH_UNITTEST"
"NEED_MPFR;UNIT_TEST_ONLY;HERMETIC_TEST_ONLY" # Optional arguments
"" # Single value arguments
- "LINK_LIBRARIES" # Multi-value arguments
+ "LINK_LIBRARIES;DEPENDS" # Multi-value arguments
${ARGN}
)
@@ -28,11 +28,17 @@ function(add_fp_unittest name)
endif()
list(APPEND MATH_UNITTEST_LINK_LIBRARIES LibcFPTestHelpers)
+ set(deps libc.hdr.math_macros)
+ if(MATH_UNITTEST_DEPENDS)
+ list(APPEND deps ${MATH_UNITTEST_DEPENDS})
+ endif()
+
add_libc_test(
${name}
${test_type}
LINK_LIBRARIES "${MATH_UNITTEST_LINK_LIBRARIES}"
"${MATH_UNITTEST_UNPARSED_ARGUMENTS}"
+ DEPENDS "${deps}"
)
endfunction(add_fp_unittest)
diff --git a/libc/test/src/__support/uint_test.cpp b/libc/test/src/__support/uint_test.cpp
index 5696e54c73f363..7f278619b8c9f3 100644
--- a/libc/test/src/__support/uint_test.cpp
+++ b/libc/test/src/__support/uint_test.cpp
@@ -11,7 +11,7 @@
#include "src/__support/integer_literals.h" // parse_unsigned_bigint
#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
-#include "include/llvm-libc-macros/math-macros.h" // HUGE_VALF, HUGE_VALF
+#include "hdr/math_macros.h" // HUGE_VALF, HUGE_VALF
#include "test/UnitTest/Test.h"
namespace LIBC_NAMESPACE {
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index d928cb5c64750e..f87f51889062fb 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -108,7 +108,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabs
libc.src.__support.FPUtil.fp_bits
)
@@ -123,7 +122,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabsf
libc.src.__support.FPUtil.fp_bits
)
@@ -138,7 +136,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabsl
libc.src.__support.FPUtil.fp_bits
)
@@ -153,7 +150,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.trunc
libc.src.__support.FPUtil.fp_bits
)
@@ -168,7 +164,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.truncf
libc.src.__support.FPUtil.fp_bits
)
@@ -183,7 +178,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.truncl
libc.src.__support.FPUtil.fp_bits
)
@@ -198,7 +192,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceil
libc.src.__support.FPUtil.fp_bits
)
@@ -213,7 +206,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceilf
libc.src.__support.FPUtil.fp_bits
)
@@ -228,7 +220,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceill
libc.src.__support.FPUtil.fp_bits
)
@@ -243,7 +234,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floor
libc.src.__support.FPUtil.fp_bits
)
@@ -258,7 +248,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floorf
libc.src.__support.FPUtil.fp_bits
)
@@ -273,7 +262,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floorl
libc.src.__support.FPUtil.fp_bits
)
@@ -288,7 +276,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.round
libc.src.__support.FPUtil.fp_bits
)
@@ -303,7 +290,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.roundf
libc.src.__support.FPUtil.fp_bits
)
@@ -318,7 +304,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.roundl
libc.src.__support.FPUtil.fp_bits
)
@@ -378,7 +363,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -397,7 +381,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -416,7 +399,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -435,7 +417,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -454,7 +435,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -473,7 +453,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -492,7 +471,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rint
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -508,7 +486,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rintf
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -524,7 +501,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rintl
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -540,7 +516,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrint
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -556,7 +531,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrintf
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -572,7 +546,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrintl
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -588,7 +561,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrint
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -604,7 +576,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrintf
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -620,7 +591,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrintl
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -635,7 +605,6 @@ add_fp_unittest(
expf_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.expf
libc.src.__support.FPUtil.fp_bits
)
@@ -663,7 +632,6 @@ add_fp_unittest(
exp2f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp2f
libc.src.__support.FPUtil.fp_bits
)
@@ -706,7 +674,6 @@ add_fp_unittest(
exp10f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp10f
libc.src.__support.FPUtil.fp_bits
)
@@ -734,7 +701,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysign
libc.src.__support.FPUtil.fp_bits
# FIXME: Currently fails on the GPU build.
@@ -750,7 +716,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysignf
libc.src.__support.FPUtil.fp_bits
# FIXME: Currently fails on the GPU build.
@@ -766,7 +731,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysignl
libc.src.__support.FPUtil.fp_bits
# FIXME: Currently fails on the GPU build.
@@ -783,7 +747,6 @@ add_fp_unittest(
HDRS
FrexpTest.h
DEPENDS
- libc.include.math
libc.src.math.frexp
libc.src.__support.FPUtil.basic_operations
)
@@ -798,7 +761,6 @@ add_fp_unittest(
HDRS
FrexpTest.h
DEPENDS
- libc.include.math
libc.src.math.frexpf
libc.src.__support.FPUtil.basic_operations
)
@@ -813,7 +775,6 @@ add_fp_unittest(
HDRS
FrexpTest.h
DEPENDS
- libc.include.math
libc.src.math.frexpl
libc.src.__support.FPUtil.basic_operations
)
@@ -827,7 +788,6 @@ add_fp_unittest(
HDRS
ILogbTest.h
DEPENDS
- libc.include.math
libc.src.math.ilogb
libc.src.__support.CPP.limits
libc.src.__support.FPUtil.fp_bits
@@ -843,7 +803,6 @@ add_fp_unittest(
HDRS
ILogbTest.h
DEPENDS
- libc.include.math
libc.src.math.ilogbf
libc.src.__support.CPP.limits
libc.src.__support.FPUtil.fp_bits
@@ -859,7 +818,6 @@ add_fp_unittest(
HDRS
ILogbTest.h
DEPENDS
- libc.include.math
libc.src.math.ilogbl
libc.src.__support.CPP.limits
libc.src.__support.FPUtil.fp_bits
@@ -875,7 +833,6 @@ add_fp_unittest(
HDRS
LdExpTest.h
DEPENDS
- libc.include.math
libc.src.math.ldexp
libc.src.__support.CPP.limits
libc.src.__support.FPUtil.fp_bits
@@ -891,7 +848,6 @@ add_fp_unittest(
HDRS
LdExpTest.h
DEPENDS
- libc.include.math
libc.src.math.ldexpf
libc.src.__support.CPP.limits
libc.src.__support.FPUtil.fp_bits
@@ -907,7 +863,6 @@ add_fp_unittest(
HDRS
LdExpTest.h
DEPENDS
- libc.include.math
libc.src.math.ldexpl
libc.src.__support.CPP.limits
libc.src.__support.FPUtil.fp_bits
@@ -921,7 +876,6 @@ add_fp_unittest(
SRCS
logb_test.cpp
DEPENDS
- libc.include.math
libc.src.math.logb
libc.src.__support.FPUtil.manipulation_functions
)
@@ -933,7 +887,6 @@ add_fp_unittest(
SRCS
logbf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.logbf
libc.src.__support.FPUtil.manipulation_functions
)
@@ -947,7 +900,6 @@ add_fp_unittest(
HDRS
LogbTest.h
DEPENDS
- libc.include.math
libc.src.math.logbl
libc.src.__support.FPUtil.manipulation_functions
)
@@ -961,7 +913,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modf
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -978,7 +929,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modff
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -995,7 +945,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modfl
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -1010,7 +959,6 @@ add_fp_unittest(
HDRS
FDimTest.h
DEPENDS
- libc.include.math
libc.src.math.fdimf
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1025,7 +973,6 @@ add_fp_unittest(
HDRS
FDimTest.h
DEPENDS
- libc.include.math
libc.src.math.fdim
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1040,7 +987,6 @@ add_fp_unittest(
HDRS
FDimTest.h
DEPENDS
- libc.include.math
libc.src.math.fdiml
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1055,7 +1001,6 @@ add_fp_unittest(
HDRS
FMinTest.h
DEPENDS
- libc.include.math
libc.src.math.fminf
libc.src.__support.FPUtil.fp_bits
)
@@ -1069,7 +1014,6 @@ add_fp_unittest(
HDRS
FMinTest.h
DEPENDS
- libc.include.math
libc.src.math.fmin
libc.src.__support.FPUtil.fp_bits
)
@@ -1083,7 +1027,6 @@ add_fp_unittest(
HDRS
FMinTest.h
DEPENDS
- libc.include.math
libc.src.math.fminl
libc.src.__support.FPUtil.fp_bits
)
@@ -1097,7 +1040,6 @@ add_fp_unittest(
HDRS
FMaxTest.h
DEPENDS
- libc.include.math
libc.src.math.fmaxf
libc.src.__support.FPUtil.fp_bits
)
@@ -1111,7 +1053,6 @@ add_fp_unittest(
HDRS
FMaxTest.h
DEPENDS
- libc.include.math
libc.src.math.fmax
libc.src.__support.FPUtil.fp_bits
)
@@ -1125,7 +1066,6 @@ add_fp_unittest(
HDRS
FMaxTest.h
DEPENDS
- libc.include.math
libc.src.math.fmaxl
libc.src.__support.FPUtil.fp_bits
)
@@ -1138,7 +1078,6 @@ add_fp_unittest(
SRCS
sqrtf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrtf
libc.src.__support.FPUtil.fp_bits
)
@@ -1151,7 +1090,6 @@ add_fp_unittest(
SRCS
sqrt_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrt
libc.src.__support.FPUtil.fp_bits
)
@@ -1164,7 +1102,6 @@ add_fp_unittest(
SRCS
sqrtl_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrtl
libc.src.__support.FPUtil.fp_bits
)
@@ -1224,7 +1161,6 @@ add_fp_unittest(
HDRS
RemQuoTest.h
DEPENDS
- libc.include.math
libc.src.math.remquof
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1240,7 +1176,6 @@ add_fp_unittest(
HDRS
RemQuoTest.h
DEPENDS
- libc.include.math
libc.src.math.remquo
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1256,7 +1191,6 @@ add_fp_unittest(
HDRS
RemQuoTest.h
DEPENDS
- libc.include.math
libc.src.math.remquol
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1270,7 +1204,6 @@ add_fp_unittest(
SRCS
hypotf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.hypotf
libc.src.__support.FPUtil.fp_bits
)
@@ -1283,7 +1216,6 @@ add_fp_unittest(
SRCS
hypot_test.cpp
DEPENDS
- libc.include.math
libc.src.math.hypot
libc.src.__support.FPUtil.fp_bits
)
@@ -1297,7 +1229,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafter
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1312,7 +1243,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafterf
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1327,7 +1257,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafterl
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1342,7 +1271,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafterf128
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -1358,7 +1286,6 @@ add_fp_unittest(
SRCS
fmaf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.fmaf
libc.src.__support.FPUtil.fp_bits
FLAGS
@@ -1373,7 +1300,6 @@ add_fp_unittest(
SRCS
fma_test.cpp
DEPENDS
- libc.include.math
libc.src.math.fma
libc.src.__support.FPUtil.fp_bits
)
@@ -1399,7 +1325,6 @@ add_fp_unittest(
expm1f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.expm1f
libc.src.__support.FPUtil.fp_bits
)
@@ -1441,7 +1366,6 @@ add_fp_unittest(
logf_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.logf
libc.src.__support.FPUtil.fp_bits
)
@@ -1469,7 +1393,6 @@ add_fp_unittest(
log2f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log2f
libc.src.__support.FPUtil.fp_bits
)
@@ -1497,7 +1420,6 @@ add_fp_unittest(
log10f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log10f
libc.src.__support.FPUtil.fp_bits
)
@@ -1525,7 +1447,6 @@ add_fp_unittest(
log1pf_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log1pf
libc.src.__support.FPUtil.fp_bits
)
@@ -1539,7 +1460,6 @@ add_fp_unittest(
HDRS
FModTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.math.fmodf
libc.src.__support.FPUtil.basic_operations
@@ -1557,7 +1477,6 @@ add_fp_unittest(
HDRS
FModTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.math.fmod
libc.src.__support.FPUtil.basic_operations
@@ -1576,7 +1495,6 @@ add_fp_unittest(
SRCS
explogxf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.generic.explogxf
libc.src.math.fabs
libc.src.math.fabsf
@@ -1715,7 +1633,6 @@ add_fp_unittest(
HDRS
ScalbnTest.h
DEPENDS
- libc.include.math
libc.src.math.scalbn
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.normal_float
@@ -1731,7 +1648,6 @@ add_fp_unittest(
HDRS
ScalbnTest.h
DEPENDS
- libc.include.math
libc.src.math.scalbnf
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.normal_float
@@ -1747,7 +1663,6 @@ add_fp_unittest(
HDRS
ScalbnTest.h
DEPENDS
- libc.include.math
libc.src.math.scalbnl
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.normal_float
@@ -1761,7 +1676,6 @@ add_fp_unittest(
SRCS
erff_test.cpp
DEPENDS
- libc.include.math
libc.src.math.erff
libc.src.__support.FPUtil.fp_bits
)
@@ -1774,7 +1688,6 @@ add_fp_unittest(
SRCS
powf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.powf
libc.src.__support.FPUtil.fp_bits
)
@@ -1787,7 +1700,6 @@ add_fp_unittest(
SRCS
atan2f_test.cpp
DEPENDS
- libc.include.math
libc.src.math.atan2f
libc.src.__support.FPUtil.fp_bits
)
diff --git a/libc/test/src/math/CeilTest.h b/libc/test/src/math/CeilTest.h
index 74cc90614dfc2a..da3f3c0e8f5abd 100644
--- a/libc/test/src/math/CeilTest.h
+++ b/libc/test/src/math/CeilTest.h
@@ -10,7 +10,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/CopySignTest.h b/libc/test/src/math/CopySignTest.h
index 206626d66f5806..052ff0333438e9 100644
--- a/libc/test/src/math/CopySignTest.h
+++ b/libc/test/src/math/CopySignTest.h
@@ -10,7 +10,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/FAbsTest.h b/libc/test/src/math/FAbsTest.h
index 942991f23be1c6..23ad8a26c481c2 100644
--- a/libc/test/src/math/FAbsTest.h
+++ b/libc/test/src/math/FAbsTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/FDimTest.h b/libc/test/src/math/FDimTest.h
index df8de91b429802..44aba9caf6463e 100644
--- a/libc/test/src/math/FDimTest.h
+++ b/libc/test/src/math/FDimTest.h
@@ -6,7 +6,7 @@
//
//===---------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/FMaxTest.h b/libc/test/src/math/FMaxTest.h
index 2c7dc3dc13ec5a..e9857f332e6518 100644
--- a/libc/test/src/math/FMaxTest.h
+++ b/libc/test/src/math/FMaxTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/FMinTest.h b/libc/test/src/math/FMinTest.h
index a986d5240d0da7..c6b9f4439b79b7 100644
--- a/libc/test/src/math/FMinTest.h
+++ b/libc/test/src/math/FMinTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/FModTest.h b/libc/test/src/math/FModTest.h
index 96ad299258a176..bc909987a161b8 100644
--- a/libc/test/src/math/FModTest.h
+++ b/libc/test/src/math/FModTest.h
@@ -14,7 +14,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#define TEST_SPECIAL(x, y, expected, dom_err, expected_exception) \
EXPECT_FP_EQ(expected, f(x, y)); \
diff --git a/libc/test/src/math/FloorTest.h b/libc/test/src/math/FloorTest.h
index 21ae291e61bc7e..679dc26e124806 100644
--- a/libc/test/src/math/FloorTest.h
+++ b/libc/test/src/math/FloorTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/FrexpTest.h b/libc/test/src/math/FrexpTest.h
index f971b45628f09f..5f993f604999d8 100644
--- a/libc/test/src/math/FrexpTest.h
+++ b/libc/test/src/math/FrexpTest.h
@@ -11,7 +11,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/HypotTest.h b/libc/test/src/math/HypotTest.h
index df69965d5dbced..0c15f02fe37193 100644
--- a/libc/test/src/math/HypotTest.h
+++ b/libc/test/src/math/HypotTest.h
@@ -14,7 +14,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/ILogbTest.h b/libc/test/src/math/ILogbTest.h
index ad47b9bb3961fd..3d1f047a480613 100644
--- a/libc/test/src/math/ILogbTest.h
+++ b/libc/test/src/math/ILogbTest.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_ILOGBTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_ILOGBTEST_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/limits.h" // INT_MAX
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
diff --git a/libc/test/src/math/LdExpTest.h b/libc/test/src/math/LdExpTest.h
index 8bfd022973b44b..2a406feed52fc1 100644
--- a/libc/test/src/math/LdExpTest.h
+++ b/libc/test/src/math/LdExpTest.h
@@ -15,7 +15,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <stdint.h>
template <typename T>
diff --git a/libc/test/src/math/LogbTest.h b/libc/test/src/math/LogbTest.h
index 3859b56582e5e4..f066d5f9de02b1 100644
--- a/libc/test/src/math/LogbTest.h
+++ b/libc/test/src/math/LogbTest.h
@@ -11,7 +11,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/ModfTest.h b/libc/test/src/math/ModfTest.h
index 84e26db49695d5..49b0328753b3bc 100644
--- a/libc/test/src/math/ModfTest.h
+++ b/libc/test/src/math/ModfTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/NextAfterTest.h b/libc/test/src/math/NextAfterTest.h
index 05803fb45ee27e..a7248dd7042d46 100644
--- a/libc/test/src/math/NextAfterTest.h
+++ b/libc/test/src/math/NextAfterTest.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h
index 301655c64ed363..5be34bece54b6a 100644
--- a/libc/test/src/math/RIntTest.h
+++ b/libc/test/src/math/RIntTest.h
@@ -15,7 +15,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <fenv.h>
#include <stdio.h>
diff --git a/libc/test/src/math/RemQuoTest.h b/libc/test/src/math/RemQuoTest.h
index 1cb8cdbe81a220..677772dd9fccfd 100644
--- a/libc/test/src/math/RemQuoTest.h
+++ b/libc/test/src/math/RemQuoTest.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_REMQUOTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_REMQUOTEST_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/RoundTest.h b/libc/test/src/math/RoundTest.h
index 17da00f869d3b3..eecf95982729be 100644
--- a/libc/test/src/math/RoundTest.h
+++ b/libc/test/src/math/RoundTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h
index d2fabd0b4c9c3b..7c93451235f296 100644
--- a/libc/test/src/math/RoundToIntegerTest.h
+++ b/libc/test/src/math/RoundToIntegerTest.h
@@ -15,7 +15,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <errno.h>
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/SqrtTest.h b/libc/test/src/math/SqrtTest.h
index 9811b2767ee337..799b7862a37260 100644
--- a/libc/test/src/math/SqrtTest.h
+++ b/libc/test/src/math/SqrtTest.h
@@ -11,7 +11,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/TruncTest.h b/libc/test/src/math/TruncTest.h
index c3a89dbb837b52..57c953fad8742f 100644
--- a/libc/test/src/math/TruncTest.h
+++ b/libc/test/src/math/TruncTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
namespace mpfr = LIBC_NAMESPACE::testing::mpfr;
diff --git a/libc/test/src/math/acosf_test.cpp b/libc/test/src/math/acosf_test.cpp
index 6f8321bd7182ae..0d25a808e0bf3c 100644
--- a/libc/test/src/math/acosf_test.cpp
+++ b/libc/test/src/math/acosf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/acosf.h"
diff --git a/libc/test/src/math/acoshf_test.cpp b/libc/test/src/math/acoshf_test.cpp
index 41d1166fb430db..32761e25b5ce54 100644
--- a/libc/test/src/math/acoshf_test.cpp
+++ b/libc/test/src/math/acoshf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/acoshf.h"
diff --git a/libc/test/src/math/asinf_test.cpp b/libc/test/src/math/asinf_test.cpp
index 4e36f03f489551..91e61085e91b89 100644
--- a/libc/test/src/math/asinf_test.cpp
+++ b/libc/test/src/math/asinf_test.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/asinf.h"
diff --git a/libc/test/src/math/asinhf_test.cpp b/libc/test/src/math/asinhf_test.cpp
index 9a3bfbed1068d8..b19e26efd07bf6 100644
--- a/libc/test/src/math/asinhf_test.cpp
+++ b/libc/test/src/math/asinhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/asinhf.h"
diff --git a/libc/test/src/math/atan2f_test.cpp b/libc/test/src/math/atan2f_test.cpp
index 343e7601b0392b..1242b7e66528f0 100644
--- a/libc/test/src/math/atan2f_test.cpp
+++ b/libc/test/src/math/atan2f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/atan2f.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/atanf_test.cpp b/libc/test/src/math/atanf_test.cpp
index 58b0eadd63f8d6..4fa7badaf73683 100644
--- a/libc/test/src/math/atanf_test.cpp
+++ b/libc/test/src/math/atanf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/atanf.h"
diff --git a/libc/test/src/math/atanhf_test.cpp b/libc/test/src/math/atanhf_test.cpp
index c659f17d13b0a4..7fc8c70d138675 100644
--- a/libc/test/src/math/atanhf_test.cpp
+++ b/libc/test/src/math/atanhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/atanhf.h"
diff --git a/libc/test/src/math/cos_test.cpp b/libc/test/src/math/cos_test.cpp
index 6a1122997c51a2..9a39616ed16f81 100644
--- a/libc/test/src/math/cos_test.cpp
+++ b/libc/test/src/math/cos_test.cpp
@@ -11,7 +11,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
using LlvmLibcCosTest = LIBC_NAMESPACE::testing::FPTest<double>;
diff --git a/libc/test/src/math/cosf_test.cpp b/libc/test/src/math/cosf_test.cpp
index 8a5eb17fdcea50..dab35fa1a9fe76 100644
--- a/libc/test/src/math/cosf_test.cpp
+++ b/libc/test/src/math/cosf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/cosf.h"
diff --git a/libc/test/src/math/coshf_test.cpp b/libc/test/src/math/coshf_test.cpp
index 8792f56b03461a..7c5d6630e10938 100644
--- a/libc/test/src/math/coshf_test.cpp
+++ b/libc/test/src/math/coshf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/erff_test.cpp b/libc/test/src/math/erff_test.cpp
index 1e43c206aef0da..5c848d7d5bf7d5 100644
--- a/libc/test/src/math/erff_test.cpp
+++ b/libc/test/src/math/erff_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/erff.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/exhaustive/CMakeLists.txt b/libc/test/src/math/exhaustive/CMakeLists.txt
index 6b2f3dddcadd24..938e519aff0847 100644
--- a/libc/test/src/math/exhaustive/CMakeLists.txt
+++ b/libc/test/src/math/exhaustive/CMakeLists.txt
@@ -16,7 +16,6 @@ add_fp_unittest(
sqrtf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.sqrtf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -33,7 +32,6 @@ add_fp_unittest(
sinf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.sinf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -50,7 +48,6 @@ add_fp_unittest(
cosf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.cosf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -67,7 +64,6 @@ add_fp_unittest(
sincosf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.sincosf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -84,7 +80,6 @@ add_fp_unittest(
tanf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.tanf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -101,7 +96,6 @@ add_fp_unittest(
erff_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.erff
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -118,7 +112,6 @@ add_fp_unittest(
expf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.expf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -135,7 +128,6 @@ add_fp_unittest(
exp2f_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.exp2f
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -167,7 +159,6 @@ add_fp_unittest(
exp10f_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.exp10f
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -184,7 +175,6 @@ add_fp_unittest(
expm1f_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.expm1f
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -201,7 +191,6 @@ add_fp_unittest(
logf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.logf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -218,7 +207,6 @@ add_fp_unittest(
log10f_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.log10f
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -235,7 +223,6 @@ add_fp_unittest(
log1pf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.log1pf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -252,7 +239,6 @@ add_fp_unittest(
log2f_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.log2f
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -271,7 +257,6 @@ add_fp_unittest(
-O3
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.hypotf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -302,7 +287,6 @@ add_fp_unittest(
coshf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.coshf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -319,7 +303,6 @@ add_fp_unittest(
sinhf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.sinhf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -336,7 +319,6 @@ add_fp_unittest(
tanhf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.tanhf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -353,7 +335,6 @@ add_fp_unittest(
acoshf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.acoshf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -370,7 +351,6 @@ add_fp_unittest(
asinhf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.asinhf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -387,7 +367,6 @@ add_fp_unittest(
atanhf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.atanhf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -404,7 +383,6 @@ add_fp_unittest(
atanf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.atanf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -421,7 +399,6 @@ add_fp_unittest(
asinf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.asinf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
@@ -438,7 +415,6 @@ add_fp_unittest(
acosf_test.cpp
DEPENDS
.exhaustive_test
- libc.include.math
libc.src.math.acosf
libc.src.__support.FPUtil.fp_bits
LINK_LIBRARIES
diff --git a/libc/test/src/math/exp10_test.cpp b/libc/test/src/math/exp10_test.cpp
index 778189626a6179..4cbdd169d80321 100644
--- a/libc/test/src/math/exp10_test.cpp
+++ b/libc/test/src/math/exp10_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp10.h"
diff --git a/libc/test/src/math/exp10f_test.cpp b/libc/test/src/math/exp10f_test.cpp
index 9d44e8f65deccf..e9b27866810423 100644
--- a/libc/test/src/math/exp10f_test.cpp
+++ b/libc/test/src/math/exp10f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp10f.h"
diff --git a/libc/test/src/math/exp2_test.cpp b/libc/test/src/math/exp2_test.cpp
index 845fda5451d4b7..73232ed36077b8 100644
--- a/libc/test/src/math/exp2_test.cpp
+++ b/libc/test/src/math/exp2_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp2.h"
diff --git a/libc/test/src/math/exp2f_test.cpp b/libc/test/src/math/exp2f_test.cpp
index f63f091eab9a83..8ff0ce6a6e7245 100644
--- a/libc/test/src/math/exp2f_test.cpp
+++ b/libc/test/src/math/exp2f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/exp_test.cpp b/libc/test/src/math/exp_test.cpp
index 42018e608ae45b..64d8198e64f2de 100644
--- a/libc/test/src/math/exp_test.cpp
+++ b/libc/test/src/math/exp_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp.h"
diff --git a/libc/test/src/math/expf_test.cpp b/libc/test/src/math/expf_test.cpp
index 634958bdc43e56..1dce381918eb65 100644
--- a/libc/test/src/math/expf_test.cpp
+++ b/libc/test/src/math/expf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/expf.h"
diff --git a/libc/test/src/math/explogxf_test.cpp b/libc/test/src/math/explogxf_test.cpp
index a536a9f3ab8dea..bcca87f590d759 100644
--- a/libc/test/src/math/explogxf_test.cpp
+++ b/libc/test/src/math/explogxf_test.cpp
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
+#include "hdr/math_macros.h"
#include "in_float_range_test_helper.h"
-#include "include/llvm-libc-macros/math-macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fabs.h"
#include "src/math/fabsf.h"
diff --git a/libc/test/src/math/expm1_test.cpp b/libc/test/src/math/expm1_test.cpp
index 198e6d5cdd8ab2..1bf07f19f3a7c6 100644
--- a/libc/test/src/math/expm1_test.cpp
+++ b/libc/test/src/math/expm1_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/expm1.h"
diff --git a/libc/test/src/math/expm1f_test.cpp b/libc/test/src/math/expm1f_test.cpp
index c72815887ba8b3..515f988b62649f 100644
--- a/libc/test/src/math/expm1f_test.cpp
+++ b/libc/test/src/math/expm1f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/expm1f.h"
diff --git a/libc/test/src/math/fdim_test.cpp b/libc/test/src/math/fdim_test.cpp
index 6c0c3e204c5f9d..1e8adf036ddeaf 100644
--- a/libc/test/src/math/fdim_test.cpp
+++ b/libc/test/src/math/fdim_test.cpp
@@ -8,7 +8,7 @@
#include "FDimTest.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fdim.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/fdimf_test.cpp b/libc/test/src/math/fdimf_test.cpp
index a74011b5a22498..13e61d9082da42 100644
--- a/libc/test/src/math/fdimf_test.cpp
+++ b/libc/test/src/math/fdimf_test.cpp
@@ -8,7 +8,7 @@
#include "FDimTest.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fdimf.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/fdiml_test.cpp b/libc/test/src/math/fdiml_test.cpp
index d3f2e68a7c1d79..2d99d2134c1c03 100644
--- a/libc/test/src/math/fdiml_test.cpp
+++ b/libc/test/src/math/fdiml_test.cpp
@@ -8,7 +8,7 @@
#include "FDimTest.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/fdiml.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/generic/CMakeLists.txt b/libc/test/src/math/generic/CMakeLists.txt
index bc2b5cea89d123..1fe7801941d5a6 100644
--- a/libc/test/src/math/generic/CMakeLists.txt
+++ b/libc/test/src/math/generic/CMakeLists.txt
@@ -6,7 +6,6 @@ add_fp_unittest(
SRCS
../ceil_test.cpp
DEPENDS
- libc.include.math
libc.src.math.generic.ceil
)
@@ -18,7 +17,6 @@ add_fp_unittest(
SRCS
../ceilf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.generic.ceilf
)
@@ -30,7 +28,6 @@ add_fp_unittest(
SRCS
../ceill_test.cpp
DEPENDS
- libc.include.math
libc.src.math.generic.ceill
)
diff --git a/libc/test/src/math/ilogb_test.cpp b/libc/test/src/math/ilogb_test.cpp
index 45756ffa3d9a7c..c8daf2e0adafe1 100644
--- a/libc/test/src/math/ilogb_test.cpp
+++ b/libc/test/src/math/ilogb_test.cpp
@@ -8,7 +8,7 @@
#include "ILogbTest.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/math/ilogb.h"
diff --git a/libc/test/src/math/ilogbf_test.cpp b/libc/test/src/math/ilogbf_test.cpp
index ff19dd145a198d..87a2789f6c1106 100644
--- a/libc/test/src/math/ilogbf_test.cpp
+++ b/libc/test/src/math/ilogbf_test.cpp
@@ -8,7 +8,7 @@
#include "ILogbTest.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/math/ilogbf.h"
diff --git a/libc/test/src/math/ilogbl_test.cpp b/libc/test/src/math/ilogbl_test.cpp
index b2c5246669946a..042a803b024a7e 100644
--- a/libc/test/src/math/ilogbl_test.cpp
+++ b/libc/test/src/math/ilogbl_test.cpp
@@ -8,7 +8,7 @@
#include "ILogbTest.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/FPUtil/ManipulationFunctions.h"
#include "src/math/ilogbl.h"
diff --git a/libc/test/src/math/log10_test.cpp b/libc/test/src/math/log10_test.cpp
index dc4ac895546c43..fd9a615ca87f71 100644
--- a/libc/test/src/math/log10_test.cpp
+++ b/libc/test/src/math/log10_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log10.h"
diff --git a/libc/test/src/math/log10f_test.cpp b/libc/test/src/math/log10f_test.cpp
index f8a137e44c351e..4ba118455df4dd 100644
--- a/libc/test/src/math/log10f_test.cpp
+++ b/libc/test/src/math/log10f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log10f.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/log1p_test.cpp b/libc/test/src/math/log1p_test.cpp
index 975fb8e05c35ea..5e461c91518b1f 100644
--- a/libc/test/src/math/log1p_test.cpp
+++ b/libc/test/src/math/log1p_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log1p.h"
diff --git a/libc/test/src/math/log1pf_test.cpp b/libc/test/src/math/log1pf_test.cpp
index a1108fee48196f..db0772d3c8b878 100644
--- a/libc/test/src/math/log1pf_test.cpp
+++ b/libc/test/src/math/log1pf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log1pf.h"
diff --git a/libc/test/src/math/log2_test.cpp b/libc/test/src/math/log2_test.cpp
index 8765279005798a..9992c1340e99dc 100644
--- a/libc/test/src/math/log2_test.cpp
+++ b/libc/test/src/math/log2_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log2.h"
diff --git a/libc/test/src/math/log2f_test.cpp b/libc/test/src/math/log2f_test.cpp
index c05b6b93cff777..24b51adac94d17 100644
--- a/libc/test/src/math/log2f_test.cpp
+++ b/libc/test/src/math/log2f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log2f.h"
diff --git a/libc/test/src/math/log_test.cpp b/libc/test/src/math/log_test.cpp
index 06a0dc574be518..de1e59579419e5 100644
--- a/libc/test/src/math/log_test.cpp
+++ b/libc/test/src/math/log_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log.h"
diff --git a/libc/test/src/math/logf_test.cpp b/libc/test/src/math/logf_test.cpp
index 1ab480744ba596..28a171d540665c 100644
--- a/libc/test/src/math/logf_test.cpp
+++ b/libc/test/src/math/logf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/logf.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/powf_test.cpp b/libc/test/src/math/powf_test.cpp
index cf674ecf8f99e7..69135593cd32c4 100644
--- a/libc/test/src/math/powf_test.cpp
+++ b/libc/test/src/math/powf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/powf.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/sin_test.cpp b/libc/test/src/math/sin_test.cpp
index fa1c5370c30fbb..0171b79810d4e9 100644
--- a/libc/test/src/math/sin_test.cpp
+++ b/libc/test/src/math/sin_test.cpp
@@ -12,7 +12,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
using LlvmLibcSinTest = LIBC_NAMESPACE::testing::FPTest<double>;
diff --git a/libc/test/src/math/sincosf_test.cpp b/libc/test/src/math/sincosf_test.cpp
index a7372fd53b319e..7c359b345f4c3a 100644
--- a/libc/test/src/math/sincosf_test.cpp
+++ b/libc/test/src/math/sincosf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/sincosf.h"
diff --git a/libc/test/src/math/sinf_test.cpp b/libc/test/src/math/sinf_test.cpp
index a3c5384e3e626f..6a8f8f4ee4288c 100644
--- a/libc/test/src/math/sinf_test.cpp
+++ b/libc/test/src/math/sinf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/sinf.h"
diff --git a/libc/test/src/math/sinhf_test.cpp b/libc/test/src/math/sinhf_test.cpp
index bea976055dbdff..cc0552f728947a 100644
--- a/libc/test/src/math/sinhf_test.cpp
+++ b/libc/test/src/math/sinhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index e9ff35577b9534..ac1a21dbe380ca 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -62,7 +62,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabs
libc.src.__support.FPUtil.fp_bits
)
@@ -76,7 +75,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabsf
libc.src.__support.FPUtil.fp_bits
)
@@ -90,7 +88,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabsl
libc.src.__support.FPUtil.fp_bits
)
@@ -104,7 +101,6 @@ add_fp_unittest(
HDRS
FAbsTest.h
DEPENDS
- libc.include.math
libc.src.math.fabsf128
libc.src.__support.FPUtil.fp_bits
)
@@ -118,7 +114,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.trunc
libc.src.__support.FPUtil.fp_bits
)
@@ -132,7 +127,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.truncf
libc.src.__support.FPUtil.fp_bits
)
@@ -146,7 +140,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.truncl
libc.src.__support.FPUtil.fp_bits
)
@@ -160,7 +153,6 @@ add_fp_unittest(
HDRS
TruncTest.h
DEPENDS
- libc.include.math
libc.src.math.truncf128
libc.src.__support.FPUtil.fp_bits
)
@@ -174,7 +166,6 @@ add_fp_unittest(
HDRS
CanonicalizeTest.h
DEPENDS
- libc.include.math
libc.src.math.canonicalize
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.fenv_impl
@@ -190,7 +181,6 @@ add_fp_unittest(
HDRS
CanonicalizeTest.h
DEPENDS
- libc.include.math
libc.src.math.canonicalizef
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.fenv_impl
@@ -206,7 +196,6 @@ add_fp_unittest(
HDRS
CanonicalizeTest.h
DEPENDS
- libc.include.math
libc.src.math.canonicalizef128
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.fenv_impl
@@ -222,7 +211,6 @@ add_fp_unittest(
HDRS
CanonicalizeTest.h
DEPENDS
- libc.include.math
libc.src.math.canonicalizel
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.fenv_impl
@@ -238,7 +226,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceil
libc.src.__support.FPUtil.fp_bits
)
@@ -252,7 +239,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceilf
libc.src.__support.FPUtil.fp_bits
)
@@ -266,7 +252,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceill
libc.src.__support.FPUtil.fp_bits
)
@@ -280,7 +265,6 @@ add_fp_unittest(
HDRS
CeilTest.h
DEPENDS
- libc.include.math
libc.src.math.ceilf128
libc.src.__support.FPUtil.fp_bits
)
@@ -294,7 +278,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floor
libc.src.__support.FPUtil.fp_bits
)
@@ -308,7 +291,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floorf
libc.src.__support.FPUtil.fp_bits
)
@@ -322,7 +304,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floorl
libc.src.__support.FPUtil.fp_bits
)
@@ -336,7 +317,6 @@ add_fp_unittest(
HDRS
FloorTest.h
DEPENDS
- libc.include.math
libc.src.math.floorf128
libc.src.__support.FPUtil.fp_bits
)
@@ -350,7 +330,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.round
libc.src.__support.FPUtil.fp_bits
)
@@ -364,7 +343,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.roundf
libc.src.__support.FPUtil.fp_bits
)
@@ -378,7 +356,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.roundl
libc.src.__support.FPUtil.fp_bits
)
@@ -392,7 +369,6 @@ add_fp_unittest(
HDRS
RoundTest.h
DEPENDS
- libc.include.math
libc.src.math.roundf128
libc.src.__support.FPUtil.fp_bits
)
@@ -462,7 +438,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -480,7 +455,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -498,7 +472,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -516,7 +489,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -534,7 +506,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -552,7 +523,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -570,7 +540,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -588,7 +557,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.fenv.feclearexcept
libc.src.fenv.feraiseexcept
@@ -606,7 +574,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rint
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -621,7 +588,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rintf
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -636,7 +602,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rintl
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -651,7 +616,6 @@ add_fp_unittest(
HDRS
RIntTest.h
DEPENDS
- libc.include.math
libc.src.math.rintf128
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -666,7 +630,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrint
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -681,7 +644,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrintf
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -696,7 +658,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrintl
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -711,7 +672,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.lrintf128
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -726,7 +686,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrint
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -741,7 +700,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrintf
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -756,7 +714,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrintl
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -771,7 +728,6 @@ add_fp_unittest(
HDRS
RoundToIntegerTest.h
DEPENDS
- libc.include.math
libc.src.math.llrintf128
libc.src.__support.FPUtil.fenv_impl
libc.src.__support.FPUtil.fp_bits
@@ -785,7 +741,6 @@ add_fp_unittest(
expf_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.expf
libc.src.__support.FPUtil.fp_bits
)
@@ -811,7 +766,6 @@ add_fp_unittest(
exp2f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp2f
libc.src.__support.FPUtil.fp_bits
)
@@ -848,7 +802,6 @@ add_fp_unittest(
exp10f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp10f
libc.src.__support.FPUtil.fp_bits
)
@@ -875,7 +828,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysign
libc.src.__support.FPUtil.fp_bits
)
@@ -889,7 +841,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysignf
libc.src.__support.FPUtil.fp_bits
)
@@ -903,7 +854,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysignl
libc.src.__support.FPUtil.fp_bits
)
@@ -917,7 +867,6 @@ add_fp_unittest(
HDRS
CopySignTest.h
DEPENDS
- libc.include.math
libc.src.math.copysignf128
libc.src.__support.FPUtil.fp_bits
)
@@ -1397,7 +1346,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modf
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -1412,7 +1360,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modff
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -1427,7 +1374,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modfl
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -1442,7 +1388,6 @@ add_fp_unittest(
HDRS
ModfTest.h
DEPENDS
- libc.include.math
libc.src.math.modff128
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.nearest_integer_operations
@@ -2033,7 +1978,6 @@ add_fp_unittest(
SRCS
sqrtf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrtf
libc.src.__support.FPUtil.fp_bits
)
@@ -2045,7 +1989,6 @@ add_fp_unittest(
SRCS
sqrt_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrt
libc.src.__support.FPUtil.fp_bits
)
@@ -2057,7 +2000,6 @@ add_fp_unittest(
SRCS
sqrtl_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrtl
libc.src.__support.FPUtil.fp_bits
)
@@ -2069,7 +2011,6 @@ add_fp_unittest(
SRCS
sqrtf128_test.cpp
DEPENDS
- libc.include.math
libc.src.math.sqrtf128
libc.src.__support.FPUtil.fp_bits
)
@@ -2139,7 +2080,6 @@ add_fp_unittest(
HDRS
RemQuoTest.h
DEPENDS
- libc.include.math
libc.src.math.remquof
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2154,7 +2094,6 @@ add_fp_unittest(
HDRS
RemQuoTest.h
DEPENDS
- libc.include.math
libc.src.math.remquo
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2169,7 +2108,6 @@ add_fp_unittest(
HDRS
RemQuoTest.h
DEPENDS
- libc.include.math
libc.src.math.remquol
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2182,7 +2120,6 @@ add_fp_unittest(
SRCS
hypotf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.hypotf
libc.src.__support.FPUtil.fp_bits
)
@@ -2194,7 +2131,6 @@ add_fp_unittest(
SRCS
hypot_test.cpp
DEPENDS
- libc.include.math
libc.src.math.hypot
libc.src.__support.FPUtil.fp_bits
)
@@ -2206,7 +2142,6 @@ add_fp_unittest(
SRCS
nanf_test.cpp
DEPENDS
- libc.include.math
libc.include.signal
libc.src.math.nanf
libc.src.__support.FPUtil.fp_bits
@@ -2222,7 +2157,6 @@ add_fp_unittest(
SRCS
nan_test.cpp
DEPENDS
- libc.include.math
libc.include.signal
libc.src.math.nan
libc.src.__support.FPUtil.fp_bits
@@ -2238,7 +2172,6 @@ add_fp_unittest(
SRCS
nanl_test.cpp
DEPENDS
- libc.include.math
libc.include.signal
libc.src.math.nanl
libc.src.__support.FPUtil.fp_bits
@@ -2254,7 +2187,6 @@ add_fp_unittest(
SRCS
nanf128_test.cpp
DEPENDS
- libc.include.math
libc.include.signal
libc.src.math.nanf128
libc.src.__support.FPUtil.fp_bits
@@ -2272,7 +2204,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafter
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2287,7 +2218,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafterf
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2302,7 +2232,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafterl
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2317,7 +2246,6 @@ add_fp_unittest(
HDRS
NextAfterTest.h
DEPENDS
- libc.include.math
libc.src.math.nextafterf128
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2365,7 +2293,6 @@ add_fp_unittest(
HDRS
NextTowardTest.h
DEPENDS
- libc.include.math
libc.src.math.nexttowardl
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2380,7 +2307,6 @@ add_fp_unittest(
HDRS
NextDownTest.h
DEPENDS
- libc.include.math
libc.src.math.nextdown
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2394,7 +2320,6 @@ add_fp_unittest(
HDRS
NextDownTest.h
DEPENDS
- libc.include.math
libc.src.math.nextdownf
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2408,7 +2333,6 @@ add_fp_unittest(
HDRS
NextDownTest.h
DEPENDS
- libc.include.math
libc.src.math.nextdownl
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2422,7 +2346,6 @@ add_fp_unittest(
HDRS
NextDownTest.h
DEPENDS
- libc.include.math
libc.src.math.nextdownf128
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2436,7 +2359,6 @@ add_fp_unittest(
HDRS
NextUpTest.h
DEPENDS
- libc.include.math
libc.src.math.nextup
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2450,7 +2372,6 @@ add_fp_unittest(
HDRS
NextUpTest.h
DEPENDS
- libc.include.math
libc.src.math.nextupf
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2464,7 +2385,6 @@ add_fp_unittest(
HDRS
NextUpTest.h
DEPENDS
- libc.include.math
libc.src.math.nextupl
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2478,7 +2398,6 @@ add_fp_unittest(
HDRS
NextUpTest.h
DEPENDS
- libc.include.math
libc.src.math.nextupf128
libc.src.__support.FPUtil.manipulation_functions
)
@@ -2492,7 +2411,6 @@ add_fp_unittest(
SRCS
fmaf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.fmaf
libc.src.__support.FPUtil.fp_bits
FLAGS
@@ -2506,7 +2424,6 @@ add_fp_unittest(
SRCS
fma_test.cpp
DEPENDS
- libc.include.math
libc.src.math.fma
libc.src.__support.FPUtil.fp_bits
)
@@ -2519,7 +2436,6 @@ add_fp_unittest(
expm1f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.expm1f
libc.src.__support.FPUtil.fp_bits
)
@@ -2532,7 +2448,6 @@ add_fp_unittest(
expm1_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.expm1
libc.src.__support.FPUtil.fp_bits
)
@@ -2545,7 +2460,6 @@ add_fp_unittest(
log_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log
libc.src.__support.FPUtil.fp_bits
)
@@ -2558,7 +2472,6 @@ add_fp_unittest(
logf_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.logf
libc.src.__support.FPUtil.fp_bits
)
@@ -2571,7 +2484,6 @@ add_fp_unittest(
log2_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log2
libc.src.__support.FPUtil.fp_bits
)
@@ -2584,7 +2496,6 @@ add_fp_unittest(
log2f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log2f
libc.src.__support.FPUtil.fp_bits
)
@@ -2597,7 +2508,6 @@ add_fp_unittest(
log10_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log10
libc.src.__support.FPUtil.fp_bits
)
@@ -2610,7 +2520,6 @@ add_fp_unittest(
log10f_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log10f
libc.src.__support.FPUtil.fp_bits
)
@@ -2623,7 +2532,6 @@ add_fp_unittest(
log1p_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log1p
libc.src.__support.FPUtil.fp_bits
)
@@ -2636,7 +2544,6 @@ add_fp_unittest(
log1pf_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log1pf
libc.src.__support.FPUtil.fp_bits
)
@@ -2650,7 +2557,6 @@ add_fp_unittest(
HDRS
FModTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.math.fmodf
libc.src.__support.FPUtil.basic_operations
@@ -2668,7 +2574,6 @@ add_fp_unittest(
HDRS
FModTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.math.fmod
libc.src.__support.FPUtil.basic_operations
@@ -2686,7 +2591,6 @@ add_fp_unittest(
HDRS
FModTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.math.fmodl
libc.src.__support.FPUtil.basic_operations
@@ -2704,7 +2608,6 @@ add_fp_unittest(
HDRS
FModTest.h
DEPENDS
- libc.include.math
libc.src.errno.errno
libc.src.math.fmodf128
libc.src.__support.FPUtil.basic_operations
@@ -2843,7 +2746,6 @@ add_fp_unittest(
HDRS
ScalbnTest.h
DEPENDS
- libc.include.math
libc.src.math.scalbn
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.normal_float
@@ -2858,7 +2760,6 @@ add_fp_unittest(
HDRS
ScalbnTest.h
DEPENDS
- libc.include.math
libc.src.math.scalbnf
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.normal_float
@@ -2873,7 +2774,6 @@ add_fp_unittest(
HDRS
ScalbnTest.h
DEPENDS
- libc.include.math
libc.src.math.scalbnl
libc.src.__support.FPUtil.fp_bits
libc.src.__support.FPUtil.normal_float
@@ -2886,7 +2786,6 @@ add_fp_unittest(
SRCS
erff_test.cpp
DEPENDS
- libc.include.math
libc.src.math.erff
libc.src.__support.FPUtil.fp_bits
)
@@ -2898,7 +2797,6 @@ add_fp_unittest(
SRCS
powf_test.cpp
DEPENDS
- libc.include.math
libc.src.math.powf
libc.src.__support.FPUtil.fp_bits
)
diff --git a/libc/test/src/math/smoke/CanonicalizeTest.h b/libc/test/src/math/smoke/CanonicalizeTest.h
index 4361f7d8ac7ab1..ab45e0eb8e94d3 100644
--- a/libc/test/src/math/smoke/CanonicalizeTest.h
+++ b/libc/test/src/math/smoke/CanonicalizeTest.h
@@ -14,7 +14,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#define TEST_SPECIAL(x, y, expected, expected_exception) \
EXPECT_EQ(expected, f(&x, &y)); \
diff --git a/libc/test/src/math/smoke/CeilTest.h b/libc/test/src/math/smoke/CeilTest.h
index ec70258fddec15..70e441a849cb4f 100644
--- a/libc/test/src/math/smoke/CeilTest.h
+++ b/libc/test/src/math/smoke/CeilTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class CeilTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/CopySignTest.h b/libc/test/src/math/smoke/CopySignTest.h
index 70a6a419e0a030..fa9da91920f8de 100644
--- a/libc/test/src/math/smoke/CopySignTest.h
+++ b/libc/test/src/math/smoke/CopySignTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T>
class CopySignTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/FAbsTest.h b/libc/test/src/math/smoke/FAbsTest.h
index 9309c2ada4a11f..0c8ca95ba0f7bc 100644
--- a/libc/test/src/math/smoke/FAbsTest.h
+++ b/libc/test/src/math/smoke/FAbsTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class FAbsTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/FModTest.h b/libc/test/src/math/smoke/FModTest.h
index 96ad299258a176..bc909987a161b8 100644
--- a/libc/test/src/math/smoke/FModTest.h
+++ b/libc/test/src/math/smoke/FModTest.h
@@ -14,7 +14,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#define TEST_SPECIAL(x, y, expected, dom_err, expected_exception) \
EXPECT_FP_EQ(expected, f(x, y)); \
diff --git a/libc/test/src/math/smoke/FloorTest.h b/libc/test/src/math/smoke/FloorTest.h
index 8886e8e7518368..12944aa7756269 100644
--- a/libc/test/src/math/smoke/FloorTest.h
+++ b/libc/test/src/math/smoke/FloorTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class FloorTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/HypotTest.h b/libc/test/src/math/smoke/HypotTest.h
index 80816033f28fe8..a1b8f8a7fafa55 100644
--- a/libc/test/src/math/smoke/HypotTest.h
+++ b/libc/test/src/math/smoke/HypotTest.h
@@ -13,7 +13,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T>
class HypotTestTemplate : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/ModfTest.h b/libc/test/src/math/smoke/ModfTest.h
index 107963665b8357..65d61855c9f22d 100644
--- a/libc/test/src/math/smoke/ModfTest.h
+++ b/libc/test/src/math/smoke/ModfTest.h
@@ -11,7 +11,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class ModfTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/NextAfterTest.h b/libc/test/src/math/smoke/NextAfterTest.h
index 403ea6bd8df68a..d9c50c8109d803 100644
--- a/libc/test/src/math/smoke/NextAfterTest.h
+++ b/libc/test/src/math/smoke/NextAfterTest.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_NEXTAFTERTEST_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
diff --git a/libc/test/src/math/smoke/NextTowardTest.h b/libc/test/src/math/smoke/NextTowardTest.h
index 0c2abf815c2390..d97aea96d83781 100644
--- a/libc/test/src/math/smoke/NextTowardTest.h
+++ b/libc/test/src/math/smoke/NextTowardTest.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_NEXTTOWARDTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_NEXTTOWARDTEST_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/bit.h"
#include "src/__support/CPP/type_traits.h"
#include "src/__support/FPUtil/BasicOperations.h"
diff --git a/libc/test/src/math/smoke/RIntTest.h b/libc/test/src/math/smoke/RIntTest.h
index 5a283a8bc0b531..73c3428047e9dd 100644
--- a/libc/test/src/math/smoke/RIntTest.h
+++ b/libc/test/src/math/smoke/RIntTest.h
@@ -14,7 +14,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <fenv.h>
#include <stdio.h>
diff --git a/libc/test/src/math/smoke/RemQuoTest.h b/libc/test/src/math/smoke/RemQuoTest.h
index cf56b1d6460fe5..7df537d8b20631 100644
--- a/libc/test/src/math/smoke/RemQuoTest.h
+++ b/libc/test/src/math/smoke/RemQuoTest.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_TEST_SRC_MATH_REMQUOTEST_H
#define LLVM_LIBC_TEST_SRC_MATH_REMQUOTEST_H
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/BasicOperations.h"
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/smoke/RoundTest.h b/libc/test/src/math/smoke/RoundTest.h
index 8cf96f4569034a..49b2a1bf7dfba7 100644
--- a/libc/test/src/math/smoke/RoundTest.h
+++ b/libc/test/src/math/smoke/RoundTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class RoundTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/RoundToIntegerTest.h b/libc/test/src/math/smoke/RoundToIntegerTest.h
index 44b3f8996df5aa..863cf75f05ff6b 100644
--- a/libc/test/src/math/smoke/RoundToIntegerTest.h
+++ b/libc/test/src/math/smoke/RoundToIntegerTest.h
@@ -14,7 +14,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <errno.h>
static constexpr int ROUNDING_MODES[4] = {FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO,
diff --git a/libc/test/src/math/smoke/SqrtTest.h b/libc/test/src/math/smoke/SqrtTest.h
index eea5dc1534e0bb..46382ed58e1402 100644
--- a/libc/test/src/math/smoke/SqrtTest.h
+++ b/libc/test/src/math/smoke/SqrtTest.h
@@ -10,7 +10,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class SqrtTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/TruncTest.h b/libc/test/src/math/smoke/TruncTest.h
index 5612d27fef21d8..c0fc87f9313b2f 100644
--- a/libc/test/src/math/smoke/TruncTest.h
+++ b/libc/test/src/math/smoke/TruncTest.h
@@ -12,7 +12,7 @@
#include "test/UnitTest/FPMatcher.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
template <typename T> class TruncTest : public LIBC_NAMESPACE::testing::Test {
diff --git a/libc/test/src/math/smoke/acosf_test.cpp b/libc/test/src/math/smoke/acosf_test.cpp
index 573a2c39492f0c..732c29548c60d3 100644
--- a/libc/test/src/math/smoke/acosf_test.cpp
+++ b/libc/test/src/math/smoke/acosf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/acosf.h"
diff --git a/libc/test/src/math/smoke/acoshf_test.cpp b/libc/test/src/math/smoke/acoshf_test.cpp
index f561f23eb99ad3..2e94216ede364b 100644
--- a/libc/test/src/math/smoke/acoshf_test.cpp
+++ b/libc/test/src/math/smoke/acoshf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/acoshf.h"
diff --git a/libc/test/src/math/smoke/asinf_test.cpp b/libc/test/src/math/smoke/asinf_test.cpp
index 39d25e72c143b9..c67d07711cd132 100644
--- a/libc/test/src/math/smoke/asinf_test.cpp
+++ b/libc/test/src/math/smoke/asinf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/asinf.h"
diff --git a/libc/test/src/math/smoke/asinhf_test.cpp b/libc/test/src/math/smoke/asinhf_test.cpp
index 9637bfa5394885..f95184676303d6 100644
--- a/libc/test/src/math/smoke/asinhf_test.cpp
+++ b/libc/test/src/math/smoke/asinhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/asinhf.h"
diff --git a/libc/test/src/math/smoke/atan2f_test.cpp b/libc/test/src/math/smoke/atan2f_test.cpp
index ecac36b3a8c01f..f81d140fefc5ea 100644
--- a/libc/test/src/math/smoke/atan2f_test.cpp
+++ b/libc/test/src/math/smoke/atan2f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/atan2f.h"
diff --git a/libc/test/src/math/smoke/atanf_test.cpp b/libc/test/src/math/smoke/atanf_test.cpp
index abd9835d38a057..3800c2334b922a 100644
--- a/libc/test/src/math/smoke/atanf_test.cpp
+++ b/libc/test/src/math/smoke/atanf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/atanf.h"
diff --git a/libc/test/src/math/smoke/atanhf_test.cpp b/libc/test/src/math/smoke/atanhf_test.cpp
index 590a7ab60f04f3..fc3e2dd9bc54da 100644
--- a/libc/test/src/math/smoke/atanhf_test.cpp
+++ b/libc/test/src/math/smoke/atanhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/atanhf.h"
diff --git a/libc/test/src/math/smoke/cosf_test.cpp b/libc/test/src/math/smoke/cosf_test.cpp
index 62132990ed5473..7000fe2f2b07de 100644
--- a/libc/test/src/math/smoke/cosf_test.cpp
+++ b/libc/test/src/math/smoke/cosf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/cosf.h"
diff --git a/libc/test/src/math/smoke/coshf_test.cpp b/libc/test/src/math/smoke/coshf_test.cpp
index 9d7ef505ae7497..4d915b12dee164 100644
--- a/libc/test/src/math/smoke/coshf_test.cpp
+++ b/libc/test/src/math/smoke/coshf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/smoke/erff_test.cpp b/libc/test/src/math/smoke/erff_test.cpp
index 24778f8d653add..102126ee4e23fe 100644
--- a/libc/test/src/math/smoke/erff_test.cpp
+++ b/libc/test/src/math/smoke/erff_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/erff.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/smoke/exp10_test.cpp b/libc/test/src/math/smoke/exp10_test.cpp
index fffffeb4c78abf..7154cb176038c2 100644
--- a/libc/test/src/math/smoke/exp10_test.cpp
+++ b/libc/test/src/math/smoke/exp10_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp10.h"
diff --git a/libc/test/src/math/smoke/exp10f_test.cpp b/libc/test/src/math/smoke/exp10f_test.cpp
index c0dcc125033248..9fb15ae75348bb 100644
--- a/libc/test/src/math/smoke/exp10f_test.cpp
+++ b/libc/test/src/math/smoke/exp10f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp10f.h"
diff --git a/libc/test/src/math/smoke/exp2_test.cpp b/libc/test/src/math/smoke/exp2_test.cpp
index d362d32f678b25..a8ef6cfa7f6a12 100644
--- a/libc/test/src/math/smoke/exp2_test.cpp
+++ b/libc/test/src/math/smoke/exp2_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp2.h"
diff --git a/libc/test/src/math/smoke/exp2f_test.cpp b/libc/test/src/math/smoke/exp2f_test.cpp
index e2989a6ec4d8af..3ef1a4ece4cf63 100644
--- a/libc/test/src/math/smoke/exp2f_test.cpp
+++ b/libc/test/src/math/smoke/exp2f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/__support/macros/properties/cpu_features.h" // LIBC_TARGET_CPU_HAS_FMA
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/smoke/exp_test.cpp b/libc/test/src/math/smoke/exp_test.cpp
index a2becc74f526f9..2abaa7230831f2 100644
--- a/libc/test/src/math/smoke/exp_test.cpp
+++ b/libc/test/src/math/smoke/exp_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/exp.h"
diff --git a/libc/test/src/math/smoke/expf_test.cpp b/libc/test/src/math/smoke/expf_test.cpp
index 42710c5fa404e9..b954125afd7bba 100644
--- a/libc/test/src/math/smoke/expf_test.cpp
+++ b/libc/test/src/math/smoke/expf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/expf.h"
diff --git a/libc/test/src/math/smoke/expm1_test.cpp b/libc/test/src/math/smoke/expm1_test.cpp
index 07963ec2d34c8d..d5f166d53a50eb 100644
--- a/libc/test/src/math/smoke/expm1_test.cpp
+++ b/libc/test/src/math/smoke/expm1_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/expm1.h"
diff --git a/libc/test/src/math/smoke/expm1f_test.cpp b/libc/test/src/math/smoke/expm1f_test.cpp
index 82e0b154635044..03b6e47b7c3bc4 100644
--- a/libc/test/src/math/smoke/expm1f_test.cpp
+++ b/libc/test/src/math/smoke/expm1f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/expm1f.h"
diff --git a/libc/test/src/math/smoke/log10_test.cpp b/libc/test/src/math/smoke/log10_test.cpp
index 36d75341976482..37baf89128f2ec 100644
--- a/libc/test/src/math/smoke/log10_test.cpp
+++ b/libc/test/src/math/smoke/log10_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log10.h"
diff --git a/libc/test/src/math/smoke/log10f_test.cpp b/libc/test/src/math/smoke/log10f_test.cpp
index 53e699417fb7c0..721045d355da8c 100644
--- a/libc/test/src/math/smoke/log10f_test.cpp
+++ b/libc/test/src/math/smoke/log10f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/log10f.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/smoke/log1p_test.cpp b/libc/test/src/math/smoke/log1p_test.cpp
index 5fe9c60f90abff..993dbf8001df86 100644
--- a/libc/test/src/math/smoke/log1p_test.cpp
+++ b/libc/test/src/math/smoke/log1p_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log1p.h"
diff --git a/libc/test/src/math/smoke/log1pf_test.cpp b/libc/test/src/math/smoke/log1pf_test.cpp
index e2fb2f057d2eb7..6127cc89a74216 100644
--- a/libc/test/src/math/smoke/log1pf_test.cpp
+++ b/libc/test/src/math/smoke/log1pf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log1pf.h"
diff --git a/libc/test/src/math/smoke/log2_test.cpp b/libc/test/src/math/smoke/log2_test.cpp
index fbeba9527bcb7b..b59767e668eb61 100644
--- a/libc/test/src/math/smoke/log2_test.cpp
+++ b/libc/test/src/math/smoke/log2_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log2.h"
diff --git a/libc/test/src/math/smoke/log2f_test.cpp b/libc/test/src/math/smoke/log2f_test.cpp
index 46906e78dcaf71..00bfb7c4abad67 100644
--- a/libc/test/src/math/smoke/log2f_test.cpp
+++ b/libc/test/src/math/smoke/log2f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log2f.h"
diff --git a/libc/test/src/math/smoke/log_test.cpp b/libc/test/src/math/smoke/log_test.cpp
index b1e39059948001..fd527dee50847c 100644
--- a/libc/test/src/math/smoke/log_test.cpp
+++ b/libc/test/src/math/smoke/log_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/log.h"
diff --git a/libc/test/src/math/smoke/logf_test.cpp b/libc/test/src/math/smoke/logf_test.cpp
index 97b6bdde307b3d..a2720602761452 100644
--- a/libc/test/src/math/smoke/logf_test.cpp
+++ b/libc/test/src/math/smoke/logf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/logf.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/smoke/powf_test.cpp b/libc/test/src/math/smoke/powf_test.cpp
index e9de1554ec6148..98a532f3468c73 100644
--- a/libc/test/src/math/smoke/powf_test.cpp
+++ b/libc/test/src/math/smoke/powf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/math/powf.h"
#include "test/UnitTest/FPMatcher.h"
diff --git a/libc/test/src/math/smoke/sincosf_test.cpp b/libc/test/src/math/smoke/sincosf_test.cpp
index 5952b20fc5bff3..8c35953240d8da 100644
--- a/libc/test/src/math/smoke/sincosf_test.cpp
+++ b/libc/test/src/math/smoke/sincosf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/sincosf.h"
diff --git a/libc/test/src/math/smoke/sinf_test.cpp b/libc/test/src/math/smoke/sinf_test.cpp
index 94508950418742..9fc208dd545b2d 100644
--- a/libc/test/src/math/smoke/sinf_test.cpp
+++ b/libc/test/src/math/smoke/sinf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/sinf.h"
diff --git a/libc/test/src/math/smoke/sinhf_test.cpp b/libc/test/src/math/smoke/sinhf_test.cpp
index 0f005f752e6982..1e052988eb2862 100644
--- a/libc/test/src/math/smoke/sinhf_test.cpp
+++ b/libc/test/src/math/smoke/sinhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/smoke/tanf_test.cpp b/libc/test/src/math/smoke/tanf_test.cpp
index 68bf493f7e8227..ab3f7c1aeb7e4e 100644
--- a/libc/test/src/math/smoke/tanf_test.cpp
+++ b/libc/test/src/math/smoke/tanf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/tanf.h"
diff --git a/libc/test/src/math/smoke/tanhf_test.cpp b/libc/test/src/math/smoke/tanhf_test.cpp
index f1ce8b40d43ac2..ddae021d2bc423 100644
--- a/libc/test/src/math/smoke/tanhf_test.cpp
+++ b/libc/test/src/math/smoke/tanhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/tanhf.h"
diff --git a/libc/test/src/math/tan_test.cpp b/libc/test/src/math/tan_test.cpp
index 85174db9364e36..d813dccc383692 100644
--- a/libc/test/src/math/tan_test.cpp
+++ b/libc/test/src/math/tan_test.cpp
@@ -11,7 +11,7 @@
#include "test/UnitTest/Test.h"
#include "utils/MPFRWrapper/MPFRUtils.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
using LlvmLibcTanTest = LIBC_NAMESPACE::testing::FPTest<double>;
diff --git a/libc/test/src/math/tanf_test.cpp b/libc/test/src/math/tanf_test.cpp
index d40bc44d6442f9..e624d30f1e00ff 100644
--- a/libc/test/src/math/tanf_test.cpp
+++ b/libc/test/src/math/tanf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/tanf.h"
diff --git a/libc/test/src/math/tanhf_test.cpp b/libc/test/src/math/tanhf_test.cpp
index ef272b17d68cad..c34efe8d733be4 100644
--- a/libc/test/src/math/tanhf_test.cpp
+++ b/libc/test/src/math/tanhf_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
#include "src/math/tanhf.h"
diff --git a/libc/test/src/sys/random/linux/CMakeLists.txt b/libc/test/src/sys/random/linux/CMakeLists.txt
index 47d363c2c17465..737326cb158ce5 100644
--- a/libc/test/src/sys/random/linux/CMakeLists.txt
+++ b/libc/test/src/sys/random/linux/CMakeLists.txt
@@ -7,7 +7,6 @@ add_libc_unittest(
SRCS
getrandom_test.cpp
DEPENDS
- libc.include.math
libc.include.sys_random
libc.src.errno.errno
libc.src.math.fabs
diff --git a/libc/test/utils/FPUtil/CMakeLists.txt b/libc/test/utils/FPUtil/CMakeLists.txt
index 06b7042e20db5a..7b6c294506b19b 100644
--- a/libc/test/utils/FPUtil/CMakeLists.txt
+++ b/libc/test/utils/FPUtil/CMakeLists.txt
@@ -4,7 +4,7 @@ if((${LIBC_TARGET_OS} STREQUAL "linux") AND (${LIBC_TARGET_ARCHITECTURE_IS_X86})
SRCS
x86_long_double_test.cpp
DEPENDS
- libc.include.math
+ libc.hdr.math_macros
libc.src.__support.FPUtil.fp_bits
)
endif()
diff --git a/libc/test/utils/FPUtil/x86_long_double_test.cpp b/libc/test/utils/FPUtil/x86_long_double_test.cpp
index 3b140c6c026670..87796b5c9f5ba5 100644
--- a/libc/test/utils/FPUtil/x86_long_double_test.cpp
+++ b/libc/test/utils/FPUtil/x86_long_double_test.cpp
@@ -9,7 +9,7 @@
#include "src/__support/FPUtil/FPBits.h"
#include "test/UnitTest/Test.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
using FPBits = LIBC_NAMESPACE::fputil::FPBits<long double>;
diff --git a/libc/utils/MPFRWrapper/MPFRUtils.cpp b/libc/utils/MPFRWrapper/MPFRUtils.cpp
index 938e2c3c0edfaf..91a623ddfa12c8 100644
--- a/libc/utils/MPFRWrapper/MPFRUtils.cpp
+++ b/libc/utils/MPFRWrapper/MPFRUtils.cpp
@@ -14,7 +14,7 @@
#include "src/__support/FPUtil/fpbits_str.h"
#include "test/UnitTest/FPMatcher.h"
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include <fenv.h>
#include <memory>
#include <stdint.h>
diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
index 42af5cbe8f35f4..c4bff36669dd65 100644
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -106,6 +106,14 @@ libc_support_library(
hdrs = ["include/llvm-libc-macros/linux/fcntl-macros.h"],
)
+############################ Proxy Header Files ################################
+
+libc_support_library(
+ name = "hdr_math_macros",
+ hdrs = ["hdr/math_macros.h"],
+)
+
+
############################### Support libraries ##############################
libc_support_library(
@@ -736,7 +744,7 @@ libc_support_library(
":__support_macros_properties_architectures",
":__support_macros_sanitizer",
":errno",
- ":llvm_libc_macros_math_macros",
+ ":hdr_math_macros",
],
)
@@ -810,7 +818,7 @@ libc_support_library(
":__support_fputil_normal_float",
":__support_macros_optimization",
":__support_uint128",
- ":llvm_libc_macros_math_macros",
+ ":hdr_math_macros",
],
)
@@ -824,7 +832,7 @@ libc_support_library(
":__support_fputil_fp_bits",
":__support_fputil_rounding_mode",
":__support_macros_attributes",
- ":llvm_libc_macros_math_macros",
+ ":hdr_math_macros",
],
)
@@ -1235,7 +1243,7 @@ libc_support_library(
"__support_cpp_type_traits",
":__support_common",
":errno",
- ":llvm_libc_macros_math_macros",
+ ":hdr_math_macros",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
index d2087a3d528f44..7d77b6114464f0 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel
@@ -85,7 +85,7 @@ libc_support_library(
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_fpbits_str",
"//libc:__support_fputil_rounding_mode",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
index c0d402a89ea3ce..9e1b25e10d6ce2 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel
@@ -90,7 +90,7 @@ libc_test(
"//libc:__support_integer_literals",
"//libc:__support_macros_properties_types",
"//libc:__support_uint",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
],
)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
index 15e367f0aca2dc..3c43c604316fc2 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel
@@ -178,7 +178,7 @@ libc_support_library(
deps = [
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fp_bits",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
@@ -297,7 +297,7 @@ libc_support_library(
"//libc:__support_cpp_limits",
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_manipulation_functions",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
],
)
@@ -324,7 +324,7 @@ libc_support_library(
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fenv_impl",
"//libc:__support_fputil_fp_bits",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
],
@@ -352,7 +352,7 @@ libc_support_library(
"//libc:__support_cpp_limits",
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_normal_float",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
],
@@ -379,7 +379,7 @@ libc_support_library(
deps = [
"//libc:__support_fputil_fenv_impl",
"//libc:__support_fputil_fp_bits",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
@@ -416,7 +416,7 @@ libc_support_library(
deps = [
"//libc:__support_fputil_fenv_impl",
"//libc:__support_fputil_fp_bits",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_wrapper",
@@ -528,7 +528,7 @@ libc_support_library(
"//libc:__support_cpp_type_traits",
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fp_bits",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
],
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl b/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
index 1a5868d242e80a..da4964bd89824f 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/math/libc_math_test_rules.bzl
@@ -34,7 +34,7 @@ def math_test(name, hdrs = [], deps = [], **kwargs):
"//libc:__support_math_extras",
"//libc:__support_uint128",
"//libc/test/UnitTest:fp_test_helpers",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
] + deps,
**kwargs
)
diff --git a/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
index 5f59d70ecc16d0..53a8c9b9476f3e 100644
--- a/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/utils/MPFRWrapper/BUILD.bazel
@@ -46,7 +46,7 @@ libc_support_library(
"//libc:__support_cpp_type_traits",
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_fpbits_str",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
"//libc/utils/MPFRWrapper:mpfr_impl",
>From e6fdd2064d4faf4124cd95f7559c678dd8f86fe3 Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Thu, 4 Apr 2024 05:31:19 +0000
Subject: [PATCH 2/6] Use LIBC_FULL_BUILD flag.
---
libc/hdr/math_macros.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libc/hdr/math_macros.h b/libc/hdr/math_macros.h
index 008d00354b4b0e..864afd0e50e356 100644
--- a/libc/hdr/math_macros.h
+++ b/libc/hdr/math_macros.h
@@ -9,7 +9,7 @@
#ifndef LLVM_LIBC_HDR_MATH_MACROS_H
#define LLVM_LIBC_HDR_MATH_MACROS_H
-#ifdef LLVM_LIBC_FULL_BUILD
+#ifdef LIBC_FULL_BUILD
#include "include/llvm-libc-macros/math-macros.h"
>From 2d637ad796fd3b4b931403f855fdf16df817ead5 Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Thu, 4 Apr 2024 12:37:46 +0000
Subject: [PATCH 3/6] Sync and remove remaining libc.include.math in tests.
---
libc/test/src/math/CMakeLists.txt | 9 ---------
libc/test/src/math/exp2m1f_test.cpp | 2 +-
libc/test/src/math/smoke/CMakeLists.txt | 3 ---
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index f87f51889062fb..5fb2289052223a 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -618,7 +618,6 @@ add_fp_unittest(
exp_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp
libc.src.__support.FPUtil.fp_bits
)
@@ -645,7 +644,6 @@ add_fp_unittest(
exp2_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp2
libc.src.__support.FPUtil.fp_bits
)
@@ -658,7 +656,6 @@ add_fp_unittest(
SRCS
exp2m1f_test.cpp
DEPENDS
- libc.include.llvm-libc-macros.math_macros
libc.src.errno.errno
libc.src.math.exp2m1f
libc.src.__support.CPP.array
@@ -687,7 +684,6 @@ add_fp_unittest(
exp10_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp10
libc.src.__support.FPUtil.fp_bits
)
@@ -1338,7 +1334,6 @@ add_fp_unittest(
expm1_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.expm1
libc.src.__support.FPUtil.fp_bits
)
@@ -1352,7 +1347,6 @@ add_fp_unittest(
log_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log
libc.src.__support.FPUtil.fp_bits
)
@@ -1379,7 +1373,6 @@ log2_test
log2_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log2
libc.src.__support.FPUtil.fp_bits
)
@@ -1406,7 +1399,6 @@ add_fp_unittest(
log10_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log10
libc.src.__support.FPUtil.fp_bits
)
@@ -1433,7 +1425,6 @@ log1p_test
log1p_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.log1p
libc.src.__support.FPUtil.fp_bits
)
diff --git a/libc/test/src/math/exp2m1f_test.cpp b/libc/test/src/math/exp2m1f_test.cpp
index a0f0da86811746..cb948289b6179c 100644
--- a/libc/test/src/math/exp2m1f_test.cpp
+++ b/libc/test/src/math/exp2m1f_test.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#include "include/llvm-libc-macros/math-macros.h"
+#include "hdr/math_macros.h"
#include "src/__support/CPP/array.h"
#include "src/__support/FPUtil/FPBits.h"
#include "src/errno/libc_errno.h"
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index ac1a21dbe380ca..0323a5fae6cef8 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -753,7 +753,6 @@ add_fp_unittest(
exp_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp
libc.src.__support.FPUtil.fp_bits
)
@@ -778,7 +777,6 @@ add_fp_unittest(
exp2_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp2
libc.src.__support.FPUtil.fp_bits
)
@@ -814,7 +812,6 @@ add_fp_unittest(
exp10_test.cpp
DEPENDS
libc.src.errno.errno
- libc.include.math
libc.src.math.exp10
libc.src.__support.FPUtil.fp_bits
)
>From 918e334db5c894ce9e4298699b0e6b25887590ba Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Thu, 4 Apr 2024 16:47:22 +0000
Subject: [PATCH 4/6] Restore math-macros.h.
---
libc/include/llvm-libc-macros/math-macros.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libc/include/llvm-libc-macros/math-macros.h b/libc/include/llvm-libc-macros/math-macros.h
index 6fe5b2b3ddd72e..6046ea98cb8ac5 100644
--- a/libc/include/llvm-libc-macros/math-macros.h
+++ b/libc/include/llvm-libc-macros/math-macros.h
@@ -35,12 +35,12 @@
#define INFINITY __builtin_inf()
#define NAN __builtin_nanf("")
-#define FP_ILOGB0 INT_MIN
-#define FP_LLOGB0 LONG_MIN
+#define FP_ILOGB0 (-INT_MAX - 1)
+#define FP_LLOGB0 (-LONG_MAX - 1)
#ifdef __FP_LOGBNAN_MIN
-#define FP_ILOGBNAN INT_MIN
-#define FP_LLOGBNAN LONG_MIN
+#define FP_ILOGBNAN (-INT_MAX - 1)
+#define FP_LLOGBNAN (-LONG_MAX - 1)
#else
#define FP_ILOGBNAN INT_MAX
#define FP_LLOGBNAN LONG_MAX
>From 8b51d5b013ad96ece2aff1b6611406c78c226058 Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Thu, 4 Apr 2024 17:34:53 +0000
Subject: [PATCH 5/6] Sync
---
.../llvm-project-overlay/libc/test/src/math/smoke/BUILD.bazel | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/bazel/llvm-project-overlay/libc/test/src/math/smoke/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/test/src/math/smoke/BUILD.bazel
index 0d69a480cb2870..f16bce32fe9823 100644
--- a/utils/bazel/llvm-project-overlay/libc/test/src/math/smoke/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/test/src/math/smoke/BUILD.bazel
@@ -90,7 +90,7 @@ libc_support_library(
"//libc:__support_cpp_limits",
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_normal_float",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
],
@@ -135,7 +135,7 @@ libc_support_library(
"//libc:__support_cpp_type_traits",
"//libc:__support_fputil_basic_operations",
"//libc:__support_fputil_fp_bits",
- "//libc:llvm_libc_macros_math_macros",
+ "//libc:hdr_math_macros",
"//libc/test/UnitTest:LibcUnitTest",
"//libc/test/UnitTest:fp_test_helpers",
],
>From c54f2e7a5d34c1099b5357469c07ff922067f621 Mon Sep 17 00:00:00 2001
From: Tue Ly <lntue.h at gmail.com>
Date: Fri, 5 Apr 2024 15:50:38 +0000
Subject: [PATCH 6/6] Sync and remove LIBC_FULL_BUILD check in math-macros.h.
---
libc/include/llvm-libc-macros/math-macros.h | 12 +-----------
libc/test/src/math/CMakeLists.txt | 3 ---
libc/test/src/math/smoke/CMakeLists.txt | 6 ------
3 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/libc/include/llvm-libc-macros/math-macros.h b/libc/include/llvm-libc-macros/math-macros.h
index 6046ea98cb8ac5..1cbd1665d0cd2a 100644
--- a/libc/include/llvm-libc-macros/math-macros.h
+++ b/libc/include/llvm-libc-macros/math-macros.h
@@ -9,11 +9,6 @@
#ifndef LLVM_LIBC_MACROS_MATH_MACROS_H
#define LLVM_LIBC_MACROS_MATH_MACROS_H
-// TODO: Remove this. This is a temporary fix for a downstream problem.
-// This cannot be left permanently since it would require downstream users to
-// define this macro.
-#ifdef LIBC_FULL_BUILD
-
#include "limits-macros.h"
#define FP_NAN 0
@@ -62,6 +57,7 @@
// the identifier, even in places with parentheses where a function-like macro
// will be expanded (such as a function declaration in a C++ namespace).
+// TODO: Move generic functional math macros to a separate header file.
#ifdef __cplusplus
template <typename T> inline constexpr bool isfinite(T x) {
@@ -84,10 +80,4 @@ template <typename T> inline constexpr bool isnan(T x) {
#endif
-#else // LIBC_FULL_BUILD
-
-#include <math.h>
-
-#endif // LIBC_FULL_BUILD
-
#endif // LLVM_LIBC_MACROS_MATH_MACROS_H
diff --git a/libc/test/src/math/CMakeLists.txt b/libc/test/src/math/CMakeLists.txt
index 5fb2289052223a..01416eefc15ef8 100644
--- a/libc/test/src/math/CMakeLists.txt
+++ b/libc/test/src/math/CMakeLists.txt
@@ -318,7 +318,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundeven
libc.src.__support.FPUtil.fp_bits
)
@@ -333,7 +332,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundevenf
libc.src.__support.FPUtil.fp_bits
)
@@ -348,7 +346,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundevenl
libc.src.__support.FPUtil.fp_bits
)
diff --git a/libc/test/src/math/smoke/CMakeLists.txt b/libc/test/src/math/smoke/CMakeLists.txt
index 0323a5fae6cef8..22c59c97f6c7fd 100644
--- a/libc/test/src/math/smoke/CMakeLists.txt
+++ b/libc/test/src/math/smoke/CMakeLists.txt
@@ -382,7 +382,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundeven
libc.src.__support.FPUtil.fp_bits
)
@@ -396,7 +395,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundevenf
libc.src.__support.FPUtil.fp_bits
)
@@ -410,7 +408,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundevenl
libc.src.__support.FPUtil.fp_bits
)
@@ -424,7 +421,6 @@ add_fp_unittest(
HDRS
RoundEvenTest.h
DEPENDS
- libc.include.math
libc.src.math.roundevenf128
libc.src.__support.FPUtil.fp_bits
)
@@ -2259,7 +2255,6 @@ if(NOT LIBC_TARGET_OS_IS_GPU)
HDRS
NextTowardTest.h
DEPENDS
- libc.include.math
libc.src.math.nexttoward
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
@@ -2274,7 +2269,6 @@ if(NOT LIBC_TARGET_OS_IS_GPU)
HDRS
NextTowardTest.h
DEPENDS
- libc.include.math
libc.src.math.nexttowardf
libc.src.__support.FPUtil.basic_operations
libc.src.__support.FPUtil.fp_bits
More information about the llvm-commits
mailing list