Remove workarounds due to lack of extern C APIs

Author: gnzlbg

crates/libm-bench/benches/bench.rs

@@ -22,21 +22,16 @@ macro_rules! bench_fn {
         #[bench]
         #[allow(unused_mut)]
         pub fn $id(bh: &mut Bencher) {
-            // Type of the system libm fn:
-            type FnTy = unsafe extern "C" fn ($($arg_ids: $arg_tys),*) -> $ret_ty;
-
-            // FIXME: extern "C" wrapper
-            extern "C" fn libm_fn($($arg_ids: $arg_tys),*) -> $ret_ty {
-                libm::$id($($arg_ids),*)
-            }
+            type FnTy
+                = unsafe extern "C" fn ($($arg_ids: $arg_tys),*) -> $ret_ty;
 
             // Generate a tuple of arguments containing random values:
             let mut rng = rand::thread_rng();
             let mut x: ( $($arg_tys,)+ ) = ( $(rng.gen::<$arg_tys>(),)+ );
 
             adjust_input!(fn: $id, input: x);
 
-            bh.iter(|| test::black_box(x).call(libm_fn as FnTy))
+            bh.iter(|| test::black_box(x).call(libm::$id as FnTy))
         }
     };
 }

crates/libm-test/tests/system_libm.rs

@@ -80,12 +80,7 @@ macro_rules! system_libm {
                 type FnTy
                     = unsafe extern "C" fn ($($arg_ids: $arg_tys),*) -> $ret_ty;
 
-                // FIXME: extern "C" wrapper over our libm functions
-                // Shouldn't be needed once they are all extern "C"
-                extern "C" fn libm_fn($($arg_ids: $arg_tys),*) -> $ret_ty {
-                    libm::$id($($arg_ids),*)
-                }
-                extern "C" {
+               extern "C" {
                     // The system's libm function:
                     fn $id($($arg_ids: $arg_tys),*) -> $ret_ty;
                 }
@@ -98,7 +93,7 @@ macro_rules! system_libm {
                 // correct_input!(fn: $id, input: args);
                 adjust_input!(fn: $id, input: args);
 
-                let result = args.call(libm_fn as FnTy);
+                let result = args.call(libm::$id as FnTy);
                 let expected = args.call($id as FnTy);
                 assert_approx_eq!(
                     result == expected,