commit 4a1af72f219214a9cef31664f0b22d6b7b405851
author Siva Chandra Reddy <sivachandra@google.com> Mon Feb 15 22:58:21 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Feb 19 01:04:39 2021 -0800
tree 4891f12ba3b2f175b8cc0b55d367747bb0cbe0af
parent 4ca0a3588f112a90eb4f39c5ce3cd26c853942e0

[libc][NFC] Make few maths functions buildable outside of LLVM libc build.

Few math functions manipulate errno. They assumed that LLVM libc's errno
is available. However, that might not be the case when these functions
are used in a libc which does not use LLVM libc's errno. This change
switches such uses of LLVM libc's errno to the normal public errno macro.
This does not affect LLVM libc's build because the include order ensures
we get LLVM libc's errno. Also, the header check rule ensures we are only
including LLVM libc's errno.h.

GitOrigin-RevId: dba14814a69143a8763ed4276a38fa9509b5973d

test/src/math/RoundToIntegerTest.h

diff --git a/test/src/math/RoundToIntegerTest.h b/test/src/math/RoundToIntegerTest.h
index 4b28039..63b0484 100644
--- a/test/src/math/RoundToIntegerTest.h
+++ b/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 @@
   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 @@
       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
     }
   }

utils/FPUtil/CMakeLists.txt

diff --git a/utils/FPUtil/CMakeLists.txt b/utils/FPUtil/CMakeLists.txt
index c54184e..2c1c166 100644
--- a/utils/FPUtil/CMakeLists.txt
+++ b/utils/FPUtil/CMakeLists.txt
@@ -31,7 +31,6 @@
     libc.include.math
     libc.include.errno
     libc.include.fenv
-    libc.src.errno.__errno_location
     libc.utils.CPP.standalone_cpp
 )
 

utils/FPUtil/NearestIntegerOperations.h

diff --git a/utils/FPUtil/NearestIntegerOperations.h b/utils/FPUtil/NearestIntegerOperations.h
index 6af4c4c..004f269 100644
--- a/utils/FPUtil/NearestIntegerOperations.h
+++ b/utils/FPUtil/NearestIntegerOperations.h
@@ -16,7 +16,6 @@
 
 #include <math.h>
 #if math_errhandling & MATH_ERRNO
-#include "src/errno/llvmlibc_errno.h"
 #include <errno.h>
 #endif
 
@@ -247,7 +246,7 @@
   FPBits<F> bits(x);
   auto setDomainErrorAndRaiseInvalid = []() {
 #if math_errhandling & MATH_ERRNO
-    llvmlibc_errno = EDOM;
+    errno = EDOM; // NOLINT
 #endif
 #if math_errhandling & MATH_ERREXCEPT
     raiseExcept(FE_INVALID);