2 files changed, 39 insertions, 14 deletions
diff --git a/bits/fp-fast.h b/bits/fp-fast.h
new file mode 100644
index 0000000000..8598710c1a
--- /dev/null
+++ b/bits/fp-fast.h
@@ -0,0 +1,39 @@
+/* Define FP_FAST_* macros.
+   Copyright (C) 2016 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _MATH_H
+# error "Never use <bits/fp-fast.h> directly; include <math.h> instead."
+#endif
+
+#ifdef __USE_ISOC99
+
+/* The GCC 4.6 compiler will define __FP_FAST_FMA{,F,L} if the fma{,f,l}
+   builtins are supported.  */
+# ifdef __FP_FAST_FMA
+#  define FP_FAST_FMA 1
+# endif
+
+# ifdef __FP_FAST_FMAF
+#  define FP_FAST_FMAF 1
+# endif
+
+# ifdef __FP_FAST_FMAL
+#  define FP_FAST_FMAL 1
+# endif
+
+#endif
diff --git a/bits/mathdef.h b/bits/mathdef.h
index 6dedc51c83..050204ab66 100644
--- a/bits/mathdef.h
+++ b/bits/mathdef.h
@@ -26,20 +26,6 @@
 # define FP_ILOGB0	(-2147483647)
 # define FP_ILOGBNAN	2147483647
 
-/* The GCC 4.6 compiler will define __FP_FAST_FMA{,F,L} if the fma{,f,l}
-   builtins are supported.  */
-#ifdef __FP_FAST_FMA
-# define FP_FAST_FMA 1
-#endif
-
-#ifdef __FP_FAST_FMAF
-# define FP_FAST_FMAF 1
-#endif
-
-#ifdef __FP_FAST_FMAL
-# define FP_FAST_FMAL 1
-#endif
-
 #endif	/* ISO C99 */
 
 #ifndef __NO_LONG_DOUBLE_MATH