diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h index 4b28039dbbb320..63b04845f8fc4f 100644 --- a/libc/test/src/math/RoundToIntegerTest.h +++ b/libc/test/src/math/RoundToIntegerTest.h @@ -9,7 +9,6 @@ #ifndef LLVM_LIBC_TEST_SRC_MATH_ROUNDTOINTEGERTEST_H #define LLVM_LIBC_TEST_SRC_MATH_ROUNDTOINTEGERTEST_H -#include "src/errno/llvmlibc_errno.h" #include "utils/FPUtil/FPBits.h" #include "utils/MPFRWrapper/MPFRUtils.h" #include "utils/UnitTest/Test.h" @@ -47,7 +46,7 @@ class RoundToIntegerTestTemplate : public __llvm_libc::testing::Test { void testOneInput(RoundToIntegerFunc func, F input, I expected, bool expectError) { #if math_errhandling & MATH_ERRNO - llvmlibc_errno = 0; + errno = 0; #endif #if math_errhandling & MATH_ERREXCEPT __llvm_libc::fputil::clearExcept(FE_ALL_EXCEPT); @@ -60,14 +59,14 @@ class RoundToIntegerTestTemplate : public __llvm_libc::testing::Test { ASSERT_EQ(__llvm_libc::fputil::testExcept(FE_ALL_EXCEPT), FE_INVALID); #endif #if math_errhandling & MATH_ERRNO - ASSERT_EQ(llvmlibc_errno, EDOM); + ASSERT_EQ(errno, EDOM); #endif } else { #if math_errhandling & MATH_ERREXCEPT ASSERT_EQ(__llvm_libc::fputil::testExcept(FE_ALL_EXCEPT), 0); #endif #if math_errhandling & MATH_ERRNO - ASSERT_EQ(llvmlibc_errno, 0); + ASSERT_EQ(errno, 0); #endif } } diff --git a/libc/utils/FPUtil/CMakeLists.txt b/libc/utils/FPUtil/CMakeLists.txt index c54184ec775f15..2c1c1661a5785a 100644 --- a/libc/utils/FPUtil/CMakeLists.txt +++ b/libc/utils/FPUtil/CMakeLists.txt @@ -31,7 +31,6 @@ add_header_library( libc.include.math libc.include.errno libc.include.fenv - libc.src.errno.__errno_location libc.utils.CPP.standalone_cpp ) diff --git a/libc/utils/FPUtil/NearestIntegerOperations.h b/libc/utils/FPUtil/NearestIntegerOperations.h index 6af4c4ccf9132d..004f269009d4f6 100644 --- a/libc/utils/FPUtil/NearestIntegerOperations.h +++ b/libc/utils/FPUtil/NearestIntegerOperations.h @@ -16,7 +16,6 @@ #include #if math_errhandling & MATH_ERRNO -#include "src/errno/llvmlibc_errno.h" #include #endif @@ -247,7 +246,7 @@ static inline I roundedFloatToSignedInteger(F x) { FPBits bits(x); auto setDomainErrorAndRaiseInvalid = []() { #if math_errhandling & MATH_ERRNO - llvmlibc_errno = EDOM; + errno = EDOM; // NOLINT #endif #if math_errhandling & MATH_ERREXCEPT raiseExcept(FE_INVALID);