[libc] Rename FEnv.h and refactor subsequent files

Because Windows's pathnames are not case sensitive,
to avoid include conflicts between our header file FEnv.h and the
one from the C Standard library, <fenv.h>, the prior file was renamed.
The motive for the relabel came to fix this include error in
TestHelpers.cpp since a conflict arose with a file in the same
directory when #include <fenv.h> was being used.

Reviewed By: sivachandra, aeubanks

Differential Revision: https://reviews.llvm.org/D106470

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 {
 

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 {
 

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 <fenv.h>
 

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 {
 

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 <fenv.h>
 

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 {
 

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 {
 

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 <fenv.h>
 

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 {
 

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 {
 

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 <fenv.h>
 

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"
 

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 <fenv.h>

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 <fenv.h>

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 <fenv.h>

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"
 

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 <fenv.h>

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 <fenv.h>

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"

libc/test/src/math/RoundToIntegerTest.h

@@ -18,7 +18,7 @@
 #include <errno.h>
 #endif
 #if math_errhandling & MATH_ERREXCEPT
-#include "utils/FPUtil/FEnv.h"
+#include "utils/FPUtil/FEnvUtils.h"
 #endif
 
 namespace mpfr = __llvm_libc::testing::mpfr;

libc/utils/FPUtil/CMakeLists.txt

@@ -5,9 +5,9 @@ else()
 endif()
 
 if(EXISTS ${LIBC_TARGET_ARCHITECTURE})
-  set(FENV_IMPL ${LIBC_TARGET_ARCHITECTURE}/FEnv.h)
+  set(FENV_IMPL ${LIBC_TARGET_ARCHITECTURE}/FEnvImpl.h)
 else()
-  set(FENV_IMPL DummyFEnv.h)
+  set(FENV_IMPL DummyFEnvImpl.h)
 endif()
 
 add_header_library(
@@ -17,7 +17,7 @@ add_header_library(
     ${FENV_IMPL}
     BasicOperations.h
     DivisionAndRemainderOperations.h
-    FEnv.h
+    FEnvUtils.h
     FloatProperties.h
     FPBits.h
     BasicOperations.h

libc/utils/FPUtil/DummyFEnvImpl.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_UTILS_FPUTIL_DUMMY_FENV_H
-#define LLVM_LIBC_UTILS_FPUTIL_DUMMY_FENV_H
+#ifndef LLVM_LIBC_UTILS_FPUTIL_DUMMY_FENVIMPL_H
+#define LLVM_LIBC_UTILS_FPUTIL_DUMMY_FENVIMPL_H
 
 #include <fenv.h>
 #include <math.h>
@@ -36,4 +36,4 @@ static inline int setEnv(const fenv_t *) { return 0; }
 } // namespace fputil
 } // namespace __llvm_libc
 
-#endif // LLVM_LIBC_UTILS_FPUTIL_DUMMY_FENV_H
+#endif // LLVM_LIBC_UTILS_FPUTIL_DUMMY_FENVIMPL_H

libc/utils/FPUtil/FEnvUtils.h

@@ -6,15 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_UTILS_FPUTIL_FENV_H
-#define LLVM_LIBC_UTILS_FPUTIL_FENV_H
+#ifndef LLVM_LIBC_UTILS_FPUTIL_FENVUTILS_H
+#define LLVM_LIBC_UTILS_FPUTIL_FENVUTILS_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"
+#include "DummyFEnvImpl.h"
 #endif
 
-#endif // LLVM_LIBC_UTILS_FPUTIL_FP_BITS_H
+#endif // LLVM_LIBC_UTILS_FPUTIL_FENVUTILS_H

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"

libc/utils/FPUtil/aarch64/FEnvImpl.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_UTILS_FPUTIL_AARCH64_FENV_H
-#define LLVM_LIBC_UTILS_FPUTIL_AARCH64_FENV_H
+#ifndef LLVM_LIBC_UTILS_FPUTIL_AARCH64_FENVIMPL_H
+#define LLVM_LIBC_UTILS_FPUTIL_AARCH64_FENVIMPL_H
 
 #include <arm_acle.h>
 #include <fenv.h>
@@ -232,4 +232,4 @@ static inline int setEnv(const fenv_t *envp) {
 } // namespace fputil
 } // namespace __llvm_libc
 
-#endif // LLVM_LIBC_UTILS_FPUTIL_AARCH64_FENV_H
+#endif // LLVM_LIBC_UTILS_FPUTIL_AARCH64_FENVIMPL_H

libc/utils/FPUtil/x86_64/FEnvImpl.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_UTILS_FPUTIL_X86_64_FENV_H
-#define LLVM_LIBC_UTILS_FPUTIL_X86_64_FENV_H
+#ifndef LLVM_LIBC_UTILS_FPUTIL_X86_64_FENVIMPL_H
+#define LLVM_LIBC_UTILS_FPUTIL_X86_64_FENVIMPL_H
 
 #include <fenv.h>
 #include <stdint.h>
@@ -370,4 +370,4 @@ static inline int setEnv(const fenv_t *envp) {
 } // namespace fputil
 } // namespace __llvm_libc
 
-#endif // LLVM_LIBC_UTILS_FPUTIL_X86_64_FENV_H
+#endif // LLVM_LIBC_UTILS_FPUTIL_X86_64_FENVIMPL_H