diff --git a/libc/src/fenv/feclearexcept.cpp b/libc/src/fenv/feclearexcept.cpp --- a/libc/src/fenv/feclearexcept.cpp +++ b/libc/src/fenv/feclearexcept.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feclearexcept.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/fegetenv.cpp b/libc/src/fenv/fegetenv.cpp --- a/libc/src/fenv/fegetenv.cpp +++ b/libc/src/fenv/fegetenv.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fegetenv.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/fegetexceptflag.cpp b/libc/src/fenv/fegetexceptflag.cpp --- a/libc/src/fenv/fegetexceptflag.cpp +++ b/libc/src/fenv/fegetexceptflag.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fegetexceptflag.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include diff --git a/libc/src/fenv/fegetround.cpp b/libc/src/fenv/fegetround.cpp --- a/libc/src/fenv/fegetround.cpp +++ b/libc/src/fenv/fegetround.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fegetround.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/feholdexcept.cpp b/libc/src/fenv/feholdexcept.cpp --- a/libc/src/fenv/feholdexcept.cpp +++ b/libc/src/fenv/feholdexcept.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feholdexcept.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include diff --git a/libc/src/fenv/feraiseexcept.cpp b/libc/src/fenv/feraiseexcept.cpp --- a/libc/src/fenv/feraiseexcept.cpp +++ b/libc/src/fenv/feraiseexcept.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feraiseexcept.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/fesetenv.cpp b/libc/src/fenv/fesetenv.cpp --- a/libc/src/fenv/fesetenv.cpp +++ b/libc/src/fenv/fesetenv.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fesetenv.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/fesetexceptflag.cpp b/libc/src/fenv/fesetexceptflag.cpp --- a/libc/src/fenv/fesetexceptflag.cpp +++ b/libc/src/fenv/fesetexceptflag.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fesetexceptflag.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include diff --git a/libc/src/fenv/fesetround.cpp b/libc/src/fenv/fesetround.cpp --- a/libc/src/fenv/fesetround.cpp +++ b/libc/src/fenv/fesetround.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fesetround.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/fetestexcept.cpp b/libc/src/fenv/fetestexcept.cpp --- a/libc/src/fenv/fetestexcept.cpp +++ b/libc/src/fenv/fetestexcept.cpp @@ -8,7 +8,7 @@ #include "src/fenv/fetestexcept.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" namespace __llvm_libc { diff --git a/libc/src/fenv/feupdateenv.cpp b/libc/src/fenv/feupdateenv.cpp --- a/libc/src/fenv/feupdateenv.cpp +++ b/libc/src/fenv/feupdateenv.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feupdateenv.h" #include "src/__support/common.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include diff --git a/libc/test/src/fenv/enabled_exceptions_test.cpp b/libc/test/src/fenv/enabled_exceptions_test.cpp --- a/libc/test/src/fenv/enabled_exceptions_test.cpp +++ b/libc/test/src/fenv/enabled_exceptions_test.cpp @@ -10,7 +10,7 @@ #include "src/fenv/feraiseexcept.h" #include "src/fenv/fetestexcept.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/FPUtil/TestHelpers.h" #include "utils/UnitTest/Test.h" diff --git a/libc/test/src/fenv/exception_flags_test.cpp b/libc/test/src/fenv/exception_flags_test.cpp --- a/libc/test/src/fenv/exception_flags_test.cpp +++ b/libc/test/src/fenv/exception_flags_test.cpp @@ -9,7 +9,7 @@ #include "src/fenv/fegetexceptflag.h" #include "src/fenv/fesetexceptflag.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/fenv/exception_status_test.cpp b/libc/test/src/fenv/exception_status_test.cpp --- a/libc/test/src/fenv/exception_status_test.cpp +++ b/libc/test/src/fenv/exception_status_test.cpp @@ -10,7 +10,7 @@ #include "src/fenv/feraiseexcept.h" #include "src/fenv/fetestexcept.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/fenv/feclearexcept_test.cpp b/libc/test/src/fenv/feclearexcept_test.cpp --- a/libc/test/src/fenv/feclearexcept_test.cpp +++ b/libc/test/src/fenv/feclearexcept_test.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feclearexcept.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/fenv/feholdexcept_test.cpp b/libc/test/src/fenv/feholdexcept_test.cpp --- a/libc/test/src/fenv/feholdexcept_test.cpp +++ b/libc/test/src/fenv/feholdexcept_test.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feholdexcept.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/FPUtil/TestHelpers.h" #include "utils/UnitTest/Test.h" diff --git a/libc/test/src/fenv/feupdateenv_test.cpp b/libc/test/src/fenv/feupdateenv_test.cpp --- a/libc/test/src/fenv/feupdateenv_test.cpp +++ b/libc/test/src/fenv/feupdateenv_test.cpp @@ -8,7 +8,7 @@ #include "src/fenv/feupdateenv.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/fenv/getenv_and_setenv_test.cpp b/libc/test/src/fenv/getenv_and_setenv_test.cpp --- a/libc/test/src/fenv/getenv_and_setenv_test.cpp +++ b/libc/test/src/fenv/getenv_and_setenv_test.cpp @@ -9,7 +9,7 @@ #include "src/fenv/fegetenv.h" #include "src/fenv/fesetenv.h" -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/UnitTest/Test.h" #include diff --git a/libc/test/src/math/RIntTest.h b/libc/test/src/math/RIntTest.h --- a/libc/test/src/math/RIntTest.h +++ b/libc/test/src/math/RIntTest.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_TEST_SRC_MATH_RINTTEST_H #define LLVM_LIBC_TEST_SRC_MATH_RINTTEST_H -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #include "utils/FPUtil/FPBits.h" #include "utils/FPUtil/TestHelpers.h" #include "utils/MPFRWrapper/MPFRUtils.h" diff --git a/libc/test/src/math/RoundToIntegerTest.h b/libc/test/src/math/RoundToIntegerTest.h --- a/libc/test/src/math/RoundToIntegerTest.h +++ b/libc/test/src/math/RoundToIntegerTest.h @@ -18,7 +18,7 @@ #include #endif #if math_errhandling & MATH_ERREXCEPT -#include "utils/FPUtil/FEnv.h" +#include "utils/FPUtil/FEnvUtils.h" #endif namespace mpfr = __llvm_libc::testing::mpfr; diff --git a/libc/utils/FPUtil/FEnv.h b/libc/utils/FPUtil/FEnvUtils.h rename from libc/utils/FPUtil/FEnv.h rename to libc/utils/FPUtil/FEnvUtils.h --- a/libc/utils/FPUtil/FEnv.h +++ b/libc/utils/FPUtil/FEnvUtils.h @@ -10,9 +10,9 @@ #define LLVM_LIBC_UTILS_FPUTIL_FENV_H #ifdef __x86_64__ -#include "x86_64/FEnv.h" +#include "x86_64/FEnvImpl.h" #elif defined(__aarch64__) -#include "aarch64/FEnv.h" +#include "aarch64/FEnvImpl.h" #else #include "DummyFEnv.h" #endif diff --git a/libc/utils/FPUtil/NearestIntegerOperations.h b/libc/utils/FPUtil/NearestIntegerOperations.h --- a/libc/utils/FPUtil/NearestIntegerOperations.h +++ b/libc/utils/FPUtil/NearestIntegerOperations.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_UTILS_FPUTIL_NEAREST_INTEGER_OPERATIONS_H #define LLVM_LIBC_UTILS_FPUTIL_NEAREST_INTEGER_OPERATIONS_H -#include "FEnv.h" +#include "FEnvUtils.h" #include "FPBits.h" #include "utils/CPP/TypeTraits.h" diff --git a/libc/utils/FPUtil/aarch64/FEnv.h b/libc/utils/FPUtil/aarch64/FEnvImpl.h rename from libc/utils/FPUtil/aarch64/FEnv.h rename to libc/utils/FPUtil/aarch64/FEnvImpl.h diff --git a/libc/utils/FPUtil/x86_64/FEnv.h b/libc/utils/FPUtil/x86_64/FEnvImpl.h rename from libc/utils/FPUtil/x86_64/FEnv.h rename to libc/utils/FPUtil/x86_64/FEnvImpl.h