From 9395c8002c0bacb90a2a0008ddf709c775ce5a90 Mon Sep 17 00:00:00 2001
From: Michael Howell <michael@notriddle.com>
Date: Fri, 13 Jul 2018 01:38:04 +0000
Subject: [PATCH] Move the `force_eval!` macro into the math module

This fixes the cross-inclusion into the compiler builtins
---
 library/compiler-builtins/libm/src/lib.rs      | 6 ------
 library/compiler-builtins/libm/src/math/mod.rs | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/compiler-builtins/libm/src/lib.rs b/library/compiler-builtins/libm/src/lib.rs
index 06ef4592dcee..0d13590c7ecc 100644
--- a/library/compiler-builtins/libm/src/lib.rs
+++ b/library/compiler-builtins/libm/src/lib.rs
@@ -12,12 +12,6 @@
 #![deny(warnings)]
 #![no_std]
 
-macro_rules! force_eval {
-    ($e:expr) => {
-        unsafe { ::core::ptr::read_volatile(&$e); }
-    }
-}
-
 mod math;
 
 #[cfg(todo)]
diff --git a/library/compiler-builtins/libm/src/math/mod.rs b/library/compiler-builtins/libm/src/math/mod.rs
index c150a629516c..41359bf8c059 100644
--- a/library/compiler-builtins/libm/src/math/mod.rs
+++ b/library/compiler-builtins/libm/src/math/mod.rs
@@ -1,3 +1,9 @@
+macro_rules! force_eval {
+    ($e:expr) => {
+        unsafe { ::core::ptr::read_volatile(&$e); }
+    }
+}
+
 mod fabs;
 mod fabsf;
 mod fmodf;