Revert "[libc] Remove direct math.h includes from src" (#85314)

Reverts #84991

Caused build failures

Author: michaelrj-google

libc/src/__support/FPUtil/FEnvImpl.h

@@ -9,12 +9,13 @@
 #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 "src/__support/macros/attributes.h" // LIBC_INLINE
 #include "src/__support/macros/config.h"     // LIBC_HAS_BUILTIN
 #include "src/__support/macros/properties/architectures.h"
 #include "src/errno/libc_errno.h"
+
 #include <fenv.h>
+#include <math.h>
 
 #if defined(LIBC_TARGET_ARCH_IS_AARCH64)
 #if defined(__APPLE__)

libc/src/__support/FPUtil/ManipulationFunctions.h

@@ -15,14 +15,15 @@
 #include "dyadic_float.h"
 #include "rounding_mode.h"
 
-#include "include/llvm-libc-macros/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"
 #include "src/__support/FPUtil/FEnvImpl.h"
 #include "src/__support/macros/attributes.h"
 #include "src/__support/macros/optimization.h" // LIBC_UNLIKELY
 
+#include <math.h>
+
 namespace LIBC_NAMESPACE {
 namespace fputil {
 

libc/src/__support/FPUtil/NearestIntegerOperations.h

@@ -13,10 +13,11 @@
 #include "FPBits.h"
 #include "rounding_mode.h"
 
-#include "include/llvm-libc-macros/math-macros.h"
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/common.h"
 
+#include <math.h>
+
 namespace LIBC_NAMESPACE {
 namespace fputil {
 

libc/src/math/generic/math_utils.h

@@ -9,12 +9,13 @@
 #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 "src/__support/CPP/bit.h"
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/common.h"
 #include "src/errno/libc_errno.h"
 
+#include <math.h>
+
 #include <stdint.h>
 
 // TODO: evaluate which functions from this file are actually used.

libc/test/src/math/ILogbTest.h

@@ -9,11 +9,11 @@
 #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 "src/__support/CPP/limits.h" // INT_MAX
 #include "src/__support/FPUtil/FPBits.h"
 #include "src/__support/FPUtil/ManipulationFunctions.h"
 #include "test/UnitTest/Test.h"
+#include <math.h>
 
 class LlvmLibcILogbTest : public LIBC_NAMESPACE::testing::Test {
 public:

utils/bazel/llvm-project-overlay/libc/BUILD.bazel

@@ -62,17 +62,7 @@ config_setting(
     flag_values = {":mpfr": "system"},
 )
 
-################################# Include Files ################################
-
-libc_support_library(
-    name = "internal_includes",
-    hdrs = glob([
-        "include/llvm-libc-macros/*.h",
-        "include/llvm-libc/types/*",
-    ]),
-)
-
-############################### Support libraries ##############################
+############################## Support libraries #############################
 
 libc_support_library(
     name = "__support_macros_properties_architectures",
@@ -680,7 +670,6 @@ libc_support_library(
         ":__support_macros_properties_architectures",
         ":__support_macros_sanitizer",
         ":errno",
-        ":internal_includes",
     ],
 )
 
@@ -750,7 +739,6 @@ libc_support_library(
         ":__support_fputil_normal_float",
         ":__support_macros_optimization",
         ":__support_uint128",
-        ":internal_includes",
     ],
 )
 
@@ -764,7 +752,6 @@ libc_support_library(
         ":__support_fputil_fp_bits",
         ":__support_fputil_rounding_mode",
         ":__support_macros_attributes",
-        ":internal_includes",
     ],
 )
 
@@ -1186,7 +1173,6 @@ libc_support_library(
         "__support_cpp_type_traits",
         ":__support_common",
         ":errno",
-        ":internal_includes",
     ],
 )
 

utils/bazel/llvm-project-overlay/libc/test/src/__support/BUILD.bazel

@@ -64,7 +64,6 @@ libc_test(
     name = "integer_to_string_test",
     srcs = ["integer_to_string_test.cpp"],
     deps = [
-        "//libc:__support_cpp_limits",
         "//libc:__support_cpp_span",
         "//libc:__support_cpp_limits",
         "//libc:__support_cpp_string_view",

utils/bazel/llvm-project-overlay/libc/test/src/math/BUILD.bazel

@@ -296,7 +296,6 @@ libc_support_library(
         "//libc:__support_cpp_limits",
         "//libc:__support_fputil_fp_bits",
         "//libc:__support_fputil_manipulation_functions",
-        "//libc:internal_includes",
         "//libc/test/UnitTest:LibcUnitTest",
     ],
 )