libm fixes

Author: tgross35

compiler-builtins/Cargo.toml

@@ -13,14 +13,14 @@ Compiler intrinsics used by the Rust compiler. Also available for other targets
 if necessary!
 """
 include = [
-#   '/Cargo.toml',
-#   '/build.rs',
-#   '/configure.rs',
-#   '/src/*',
-#   '/examples/*',
-#   '/LICENSE.txt',
-#   '/README.md',
-#   '/compiler-rt/*',
+  '/Cargo.toml',
+  '/build.rs',
+  '/configure.rs',
+  '/src/*',
+  # '/examples/*',
+  '../LICENSE.txt',
+  '../README.md',
+  '../compiler-rt/*',
   '../libm/src/math/*',
 ]
 links = 'compiler-rt'

compiler-builtins/src/lib.rs

@@ -39,14 +39,19 @@ extern crate core;
 #[macro_use]
 mod macros;
 
+#[rustfmt::skip]
+#[allow(dead_code)]
+#[allow(unused_imports)]
+#[allow(clippy::all)]
+mod libm;
+
 pub mod float;
 pub mod int;
 pub mod math;
 pub mod mem;
 
-// `libm` expects its `support` module to be available in the crate root. This config can be
-// cleaned up once `libm` is made always available.
-use math::libm::support;
+// `libm` expects its `support` module to be available in the crate root.
+use libm::support;
 
 #[cfg(target_arch = "arm")]
 pub mod arm;

compiler-builtins/src/libm

@@ -0,0 +1 @@
+../../libm/src/math

compiler-builtins/src/math.rs

@@ -1,16 +1,9 @@
-#[rustfmt::skip]
-#[allow(dead_code)]
-#[allow(unused_imports)]
-#[allow(clippy::all)]
-#[path = "../../libm/src/math/mod.rs"]
-pub(crate) mod libm;
-
 macro_rules! libm_intrinsics {
     ($(fn $fun:ident($($iid:ident : $ity:ty),+) -> $oty:ty;)+) => {
         intrinsics! {
             $(
                 pub extern "C" fn $fun($($iid: $ity),+) -> $oty {
-                    $crate::math::libm::$fun($($iid),+)
+                    $crate::libm::$fun($($iid),+)
                 }
             )+
         }