diff mbox series

[1/4] m68k: Remove mathinline.h

Message ID 20200317190133.29644-1-adhemerval.zanella@linaro.org
State New
Headers show
Series [1/4] m68k: Remove mathinline.h | expand

Commit Message

Michael Kerrisk \(man-pages\) via Libc-alpha March 17, 2020, 7:01 p.m. UTC
This is similar to x86 (da75c1b180f9355a) and powerpc (32ea72999693b98e)
mathinline.h removal.  The requires macros to build the fpu routines
are moved to mathimpl.h, while the inline optimization macros for
atan, tanh, rint, log1p, significand, trunc, floor, ceil, isinf,
finite, scalbn, isnan, scalbln, nearbyint, lrint, and sincos are removed.

The gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94204 was
created to track builtin support.

Checked with a build against m68k-linux-gnu, resulting binaries
are similar with and without the patch.
---
 sysdeps/m68k/m680x0/fpu/bits/mathinline.h     | 378 ------------------
 sysdeps/m68k/m680x0/fpu/mathimpl.h            | 224 +++++++++++
 sysdeps/m68k/m680x0/fpu/s_atan_template.c     |   1 +
 sysdeps/m68k/m680x0/fpu/s_ceil_template.c     |   1 +
 sysdeps/m68k/m680x0/fpu/s_fabs_template.c     |   1 +
 sysdeps/m68k/m680x0/fpu/s_floor_template.c    |   1 +
 sysdeps/m68k/m680x0/fpu/s_isinf.c             |   1 +
 sysdeps/m68k/m680x0/fpu/s_log1p.c             |   1 +
 sysdeps/m68k/m680x0/fpu/s_lrint_template.c    |   1 +
 .../m68k/m680x0/fpu/s_nearbyint_template.c    |   1 +
 sysdeps/m68k/m680x0/fpu/s_rint_template.c     |   1 +
 sysdeps/m68k/m680x0/fpu/s_scalbn.c            |   2 +
 sysdeps/m68k/m680x0/fpu/s_sincos_template.c   |   1 +
 sysdeps/m68k/m680x0/fpu/s_tanh_template.c     |   1 +
 sysdeps/m68k/m680x0/fpu/s_trunc_template.c    |   1 +
 15 files changed, 238 insertions(+), 378 deletions(-)
 delete mode 100644 sysdeps/m68k/m680x0/fpu/bits/mathinline.h

Comments

Andreas Schwab March 17, 2020, 8:51 p.m. UTC | #1
On Mär 17 2020, Adhemerval Zanella via Libc-alpha wrote:

> This is similar to x86 (da75c1b180f9355a) and powerpc (32ea72999693b98e)
> mathinline.h removal.  The requires macros to build the fpu routines

s/requires/required/

> are moved to mathimpl.h, while the inline optimization macros for
> atan, tanh, rint, log1p, significand, trunc, floor, ceil, isinf,
> finite, scalbn, isnan, scalbln, nearbyint, lrint, and sincos are removed.
>
> The gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94204 was
> created to track builtin support.
>
> Checked with a build against m68k-linux-gnu, resulting binaries
> are similar with and without the patch.

Ok.

Andreas.
diff mbox series

Patch

diff --git a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h b/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
deleted file mode 100644
index 2b71679ca4..0000000000
--- a/sysdeps/m68k/m680x0/fpu/bits/mathinline.h
+++ /dev/null
@@ -1,378 +0,0 @@ 
-/* Definitions of inline math functions implemented by the m68881/2.
-   Copyright (C) 1991-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#ifndef _MATH_H
-# error "Never use <bits/mathinline.h> directly; include <math.h> instead."
-#endif
-
-#ifndef __extern_inline
-# define __MATH_INLINE __inline
-#else
-# define __MATH_INLINE __extern_inline
-#endif
-
-#ifdef	__GNUC__
-
-#if (!defined __NO_MATH_INLINES && defined __OPTIMIZE__) \
-    || defined __LIBC_INTERNAL_MATH_INLINES
-
-#ifdef	__LIBC_INTERNAL_MATH_INLINES
-/* This is used when defining the functions themselves.  Define them with
-   __ names, and with `static inline' instead of `extern inline' so the
-   bodies will always be used, never an external function call.
-   Note: GCC 6 objects to __attribute__ ((__leaf__)) on static functions.  */
-# define __m81_u(x)		__CONCAT(__,x)
-# define __m81_inline		static __inline
-# define __m81_nth(fn)		__NTHNL (fn)
-#else
-# define __m81_u(x)		x
-# define __m81_inline		__MATH_INLINE
-# define __m81_nth(fn)		__NTH (fn)
-# define __M81_MATH_INLINES	1
-#endif
-
-/* Define a math function.  */
-#define __m81_defun(rettype, func, args, attrs)	\
-  __m81_inline rettype attrs			\
-  __m81_nth (__m81_u(func) args)
-
-/* Define the three variants of a math function that has a direct
-   implementation in the m68k fpu.  FUNC is the name for C (which will be
-   suffixed with f and l for the float and long double version, resp).  OP
-   is the name of the fpu operation (without leading f).  */
-
-#ifdef __USE_ISOC99
-# define __inline_mathop(func, op, attrs)			\
-  __inline_mathop1(double, func, op, attrs)			\
-  __inline_mathop1(float, __CONCAT(func,f), op, attrs)		\
-  __inline_mathop1(long double, __CONCAT(func,l), op, attrs)
-#else
-# define __inline_mathop(func, op, attrs)	\
-  __inline_mathop1(double, func, op, attrs)
-#endif
-
-#define __inline_mathop1(float_type,func, op, attrs)			      \
-  __m81_defun (float_type, func, (float_type __mathop_x), attrs)	      \
-  {									      \
-    float_type __result;						      \
-    __asm __volatile__ ("f" __STRING(op) "%.x %1, %0"			      \
-			: "=f" (__result) : "f" (__mathop_x));		      \
-    return __result;							      \
-  }
-
-__inline_mathop(__atan, atan,)
-__inline_mathop(__cos, cos,)
-__inline_mathop(__sin, sin,)
-__inline_mathop(__tan, tan,)
-__inline_mathop(__tanh, tanh,)
-__inline_mathop(__fabs, abs, __attribute__ ((__const__)))
-
-#if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__inline_mathop(__rint, int,)
-__inline_mathop(__expm1, etoxm1,)
-__inline_mathop(__log1p, lognp1,)
-#endif
-
-#ifdef __USE_MISC
-__inline_mathop(__significand, getman,)
-#endif
-
-#ifdef __USE_ISOC99
-__inline_mathop(__trunc, intrz, __attribute__ ((__const__)))
-#endif
-
-#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
-
-__inline_mathop(atan, atan,)
-__inline_mathop(tanh, tanh,)
-
-# if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
-__inline_mathop(rint, int,)
-__inline_mathop(log1p, lognp1,)
-# endif
-
-# ifdef __USE_MISC
-__inline_mathop(significand, getman,)
-# endif
-
-# ifdef __USE_ISOC99
-__inline_mathop(trunc, intrz, __attribute__ ((__const__)))
-# endif
-
-#endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */
-
-/* This macro contains the definition for the rest of the inline
-   functions, using FLOAT_TYPE as the domain type and M as a macro
-   that adds the suffix for the function names.  */
-
-#define __inline_functions(float_type, m)				  \
-__m81_defun (float_type, m(__floor), (float_type __x),			  \
-	     __attribute__ ((__const__)))				  \
-{									  \
-  float_type __result;							  \
-  unsigned long int __ctrl_reg;						  \
-  __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));		  \
-  /* Set rounding towards negative infinity.  */			  \
-  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
-		      : "dmi" ((__ctrl_reg & ~0x10) | 0x20));		  \
-  /* Convert X to an integer, using -Inf rounding.  */			  \
-  __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));	  \
-  /* Restore the previous rounding mode.  */				  \
-  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
-		      : "dmi" (__ctrl_reg));				  \
-  return __result;							  \
-}									  \
-									  \
-__m81_defun (float_type, m(__ceil), (float_type __x),			  \
-	     __attribute__ ((__const__)))				  \
-{									  \
-  float_type __result;							  \
-  unsigned long int __ctrl_reg;						  \
-  __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));		  \
-  /* Set rounding towards positive infinity.  */			  \
-  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
-		      : "dmi" (__ctrl_reg | 0x30));			  \
-  /* Convert X to an integer, using +Inf rounding.  */			  \
-  __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));	  \
-  /* Restore the previous rounding mode.  */				  \
-  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
-		      : "dmi" (__ctrl_reg));				  \
-  return __result;							  \
-}
-
-#define __CONCAT_d(arg) arg
-#define __CONCAT_f(arg) arg ## f
-#define __CONCAT_l(arg) arg ## l
-__inline_functions(double, __CONCAT_d)
-#ifdef __USE_ISOC99
-__inline_functions(float, __CONCAT_f)
-__inline_functions(long double, __CONCAT_l)
-#endif
-#undef __inline_functions
-
-#ifdef __USE_MISC
-
-# define __inline_functions(float_type, m)				  \
-__m81_defun (int, m(__isinf), (float_type __value),			  \
-	     __attribute__ ((__const__)))				  \
-{									  \
-  /* There is no branch-condition for infinity,				  \
-     so we must extract and examine the condition codes manually.  */	  \
-  unsigned long int __fpsr;						  \
-  __asm ("ftst%.x %1\n"							  \
-	 "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));	  \
-  return (__fpsr & (2 << 24)) ? (__fpsr & (8 << 24) ? -1 : 1) : 0;	  \
-}									  \
-									  \
-__m81_defun (int, m(__finite), (float_type __value),			  \
-	     __attribute__ ((__const__)))				  \
-{									  \
-  /* There is no branch-condition for infinity, so we must extract and	  \
-     examine the condition codes manually.  */				  \
-  unsigned long int __fpsr;						  \
-  __asm ("ftst%.x %1\n"							  \
-	 "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));	  \
-  return (__fpsr & (3 << 24)) == 0;					  \
-}									  \
-									  \
-__m81_defun (float_type, m(__scalbn),					  \
-	     (float_type __x, int __n),)				  \
-{									  \
-  float_type __result;							  \
-  __asm __volatile__  ("fscale%.l %1, %0" : "=f" (__result)		  \
-		       : "dmi" (__n), "0" (__x));			  \
-  return __result;							  \
-}
-
-__inline_functions(double, __CONCAT_d)
-__inline_functions(float, __CONCAT_f)
-__inline_functions(long double, __CONCAT_l)
-# undef __inline_functions
-
-#endif /* Use misc.  */
-
-#if defined __USE_MISC || defined __USE_XOPEN
-
-# define __inline_functions(float_type, m)				  \
-__m81_defun (int, m(__isnan), (float_type __value),			  \
-	     __attribute__ ((__const__)))			  	  \
-{									  \
-  char __result;							  \
-  __asm ("ftst%.x %1\n"							  \
-	 "fsun %0" : "=dm" (__result) : "f" (__value));			  \
-  return __result;							  \
-}
-
-__inline_functions(double, __CONCAT_d)
-# ifdef __USE_MISC
-__inline_functions(float, __CONCAT_f)
-__inline_functions(long double, __CONCAT_l)
-# endif
-# undef __inline_functions
-
-#endif
-
-#ifdef __USE_ISOC99
-
-# define __inline_functions(float_type, m)				  \
-__m81_defun (float_type, m(__scalbln),					  \
-	     (float_type __x, long int __n),)				  \
-{									  \
-  return m(__scalbn) (__x, __n);					  \
-}									  \
-									  \
-__m81_defun (float_type, m(__nearbyint), (float_type __x),)		  \
-{									  \
-  float_type __result;							  \
-  unsigned long int __ctrl_reg;						  \
-  __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));		  \
-  /* Temporarily disable the inexact exception.  */			  \
-  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
-		      : "dmi" (__ctrl_reg & ~0x200));			  \
-  __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));	  \
-  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
-		      : "dmi" (__ctrl_reg));				  \
-  return __result;							  \
-}									  \
-									  \
-__m81_defun (long int, m(__lrint), (float_type __x),)			  \
-{									  \
-  long int __result;							  \
-  __asm __volatile__ ("fmove%.l %1, %0" : "=dm" (__result) : "f" (__x));  \
-  return __result;							  \
-}
-
-__inline_functions (double, __CONCAT_d)
-__inline_functions (float, __CONCAT_f)
-__inline_functions (long double, __CONCAT_l)
-# undef __inline_functions
-
-#endif /* Use ISO C9x */
-
-#ifdef __USE_GNU
-
-# define __inline_functions(float_type, m)				\
-__m81_inline void							\
-__m81_nth (__m81_u(m(__sincos))						\
-	   (float_type __x, float_type *__sinx, float_type *__cosx))	\
-{									\
-  __asm __volatile__ ("fsincos%.x %2,%1:%0"				\
-		      : "=f" (*__sinx), "=f" (*__cosx) : "f" (__x));	\
-}
-
-__inline_functions (double, __CONCAT_d)
-__inline_functions (float, __CONCAT_f)
-__inline_functions (long double, __CONCAT_l)
-# undef __inline_functions
-
-#endif
-
-#undef __CONCAT_d
-#undef __CONCAT_f
-#undef __CONCAT_l
-
-#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
-
-/* Define inline versions of the user visible functions.  */
-
-# define __inline_forward_c(rettype, name, args1, args2)	\
-__MATH_INLINE rettype __attribute__((__const__))		\
-__NTH (name args1)						\
-{								\
-  return __CONCAT(__,name) args2;				\
-}
-
-# define __inline_forward(rettype, name, args1, args2)	\
-__MATH_INLINE rettype __NTH (name args1)		\
-{							\
-  return __CONCAT(__,name) args2;			\
-}
-
-__inline_forward_c(double,floor, (double __x), (__x))
-__inline_forward_c(double,ceil, (double __x), (__x))
-# ifdef __USE_MISC
-#  ifndef __USE_ISOC99 /* Conflict with macro of same name.  */
-__inline_forward_c(int,isinf, (double __value), (__value))
-#  endif
-__inline_forward_c(int,finite, (double __value), (__value))
-__inline_forward(double,scalbn, (double __x, int __n), (__x, __n))
-# endif
-# if defined __USE_MISC || defined __USE_XOPEN
-#  ifndef __USE_ISOC99 /* Conflict with macro of same name.  */
-__inline_forward_c(int,isnan, (double __value), (__value))
-#  endif
-# endif
-# ifdef __USE_ISOC99
-__inline_forward(double,scalbln, (double __x, long int __n), (__x, __n))
-__inline_forward(double,nearbyint, (double __value), (__value))
-__inline_forward(long int,lrint, (double __value), (__value))
-# endif
-# ifdef __USE_GNU
-__inline_forward(void,sincos, (double __x, double *__sinx, double *__cosx),
-		 (__x, __sinx, __cosx))
-# endif
-
-# ifdef __USE_ISOC99
-
-__inline_forward_c(float,floorf, (float __x), (__x))
-__inline_forward_c(float,ceilf, (float __x), (__x))
-#  ifdef __USE_MISC
-__inline_forward_c(int,isinff, (float __value), (__value))
-__inline_forward_c(int,finitef, (float __value), (__value))
-__inline_forward(float,scalbnf, (float __x, int __n), (__x, __n))
-__inline_forward_c(int,isnanf, (float __value), (__value))
-#  endif
-# ifdef __USE_ISOC99
-__inline_forward(float,scalblnf, (float __x, long int __n), (__x, __n))
-__inline_forward(float,nearbyintf, (float __value), (__value))
-__inline_forward(long int,lrintf, (float __value), (__value))
-# endif
-# ifdef __USE_GNU
-__inline_forward(void,sincosf, (float __x, float *__sinx, float *__cosx),
-		 (__x, __sinx, __cosx))
-# endif
-
-__inline_forward_c(long double,floorl, (long double __x), (__x))
-__inline_forward_c(long double,ceill, (long double __x), (__x))
-# ifdef __USE_MISC
-__inline_forward_c(int,isinfl, (long double __value), (__value))
-__inline_forward_c(int,finitel, (long double __value), (__value))
-__inline_forward(long double,scalbnl, (long double __x, int __n), (__x, __n))
-__inline_forward_c(int,isnanl, (long double __value), (__value))
-# endif
-# ifdef __USE_ISOC99
-__inline_forward(long double,scalblnl, (long double __x, long int __n),
-		 (__x, __n))
-__inline_forward(long double,nearbyintl, (long double __value), (__value))
-__inline_forward(long int,lrintl, (long double __value), (__value))
-# endif
-# ifdef __USE_GNU
-__inline_forward(void,sincosl,
-		 (long double __x, long double *__sinx, long double *__cosx),
-		 (__x, __sinx, __cosx))
-# endif
-
-#endif /* Use misc or ISO C99 */
-
-#undef __inline_forward
-#undef __inline_forward_c
-
-#endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */
-
-#endif
-#endif	/* GCC.  */
diff --git a/sysdeps/m68k/m680x0/fpu/mathimpl.h b/sysdeps/m68k/m680x0/fpu/mathimpl.h
index 245fe7b2e3..b4df24043c 100644
--- a/sysdeps/m68k/m680x0/fpu/mathimpl.h
+++ b/sysdeps/m68k/m680x0/fpu/mathimpl.h
@@ -17,9 +17,231 @@ 
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
+#ifndef _MATHIMPL_H
+#define _MATHIMPL_H
+
 /* This file contains the definitions of the inline math functions that
    are only used internally inside libm, not visible to the user.  */
 
+#define __MATH_INLINE __extern_inline
+
+/* This is used when defining the functions themselves.  Define them with
+   __ names, and with `static inline' instead of `extern inline' so the
+   bodies will always be used, never an external function call.
+   Note: GCC 6 objects to __attribute__ ((__leaf__)) on static functions.  */
+#define __m81_u(x)             __CONCAT(__,x)
+#define __m81_inline           static __inline
+#define __m81_nth(fn)          __NTH (fn)
+
+/* Define a math function.  */
+#define __m81_defun(rettype, func, args, attrs)	\
+  __m81_inline rettype attrs			\
+  __m81_nth (__m81_u(func) args)
+
+/* Define the three variants of a math function that has a direct
+   implementation in the m68k fpu.  FUNC is the name for C (which will be
+   suffixed with f and l for the float and long double version, resp).  OP
+   is the name of the fpu operation (without leading f).  */
+
+# define __inline_mathop(func, op, attrs)			\
+  __inline_mathop1(double, func, op, attrs)			\
+  __inline_mathop1(float, __CONCAT(func,f), op, attrs)		\
+  __inline_mathop1(long double, __CONCAT(func,l), op, attrs)
+
+#define __inline_mathop1(float_type,func, op, attrs)			      \
+  __m81_defun (float_type, func, (float_type __mathop_x), attrs)	      \
+  {									      \
+    float_type __result;						      \
+    __asm __volatile__ ("f" __STRING(op) "%.x %1, %0"			      \
+			: "=f" (__result) : "f" (__mathop_x));		      \
+    return __result;							      \
+  }
+
+__inline_mathop(__atan, atan,)
+__inline_mathop(__cos, cos,)
+__inline_mathop(__sin, sin,)
+__inline_mathop(__tan, tan,)
+__inline_mathop(__tanh, tanh,)
+__inline_mathop(__fabs, abs, __attribute__ ((__const__)))
+
+__inline_mathop(__rint, int,)
+__inline_mathop(__expm1, etoxm1,)
+__inline_mathop(__log1p, lognp1,)
+
+__inline_mathop(__significand, getman,)
+
+__inline_mathop(__trunc, intrz, __attribute__ ((__const__)))
+
+
+/* This macro contains the definition for the rest of the inline
+   functions, using FLOAT_TYPE as the domain type and M as a macro
+   that adds the suffix for the function names.  */
+
+#define __inline_functions(float_type, m)				  \
+__m81_defun (float_type, m(__floor), (float_type __x),			  \
+	     __attribute__ ((__const__)))				  \
+{									  \
+  float_type __result;							  \
+  unsigned long int __ctrl_reg;						  \
+  __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));		  \
+  /* Set rounding towards negative infinity.  */			  \
+  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
+		      : "dmi" ((__ctrl_reg & ~0x10) | 0x20));		  \
+  /* Convert X to an integer, using -Inf rounding.  */			  \
+  __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));	  \
+  /* Restore the previous rounding mode.  */				  \
+  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
+		      : "dmi" (__ctrl_reg));				  \
+  return __result;							  \
+}									  \
+									  \
+__m81_defun (float_type, m(__ceil), (float_type __x),			  \
+	     __attribute__ ((__const__)))				  \
+{									  \
+  float_type __result;							  \
+  unsigned long int __ctrl_reg;						  \
+  __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));		  \
+  /* Set rounding towards positive infinity.  */			  \
+  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
+		      : "dmi" (__ctrl_reg | 0x30));			  \
+  /* Convert X to an integer, using +Inf rounding.  */			  \
+  __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));	  \
+  /* Restore the previous rounding mode.  */				  \
+  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
+		      : "dmi" (__ctrl_reg));				  \
+  return __result;							  \
+}
+
+#define __CONCAT_d(arg) arg
+#define __CONCAT_f(arg) arg ## f
+#define __CONCAT_l(arg) arg ## l
+__inline_functions(double, __CONCAT_d)
+__inline_functions(float, __CONCAT_f)
+__inline_functions(long double, __CONCAT_l)
+#undef __inline_functions
+
+# define __inline_functions(float_type, m)				  \
+__m81_defun (int, m(__isinf), (float_type __value),			  \
+	     __attribute__ ((__const__)))				  \
+{									  \
+  /* There is no branch-condition for infinity,				  \
+     so we must extract and examine the condition codes manually.  */	  \
+  unsigned long int __fpsr;						  \
+  __asm ("ftst%.x %1\n"							  \
+	 "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));	  \
+  return (__fpsr & (2 << 24)) ? (__fpsr & (8 << 24) ? -1 : 1) : 0;	  \
+}									  \
+									  \
+__m81_defun (int, m(__finite), (float_type __value),			  \
+	     __attribute__ ((__const__)))				  \
+{									  \
+  /* There is no branch-condition for infinity, so we must extract and	  \
+     examine the condition codes manually.  */				  \
+  unsigned long int __fpsr;						  \
+  __asm ("ftst%.x %1\n"							  \
+	 "fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));	  \
+  return (__fpsr & (3 << 24)) == 0;					  \
+}									  \
+									  \
+__m81_defun (float_type, m(__scalbn),					  \
+	     (float_type __x, int __n),)				  \
+{									  \
+  float_type __result;							  \
+  __asm __volatile__  ("fscale%.l %1, %0" : "=f" (__result)		  \
+		       : "dmi" (__n), "0" (__x));			  \
+  return __result;							  \
+}
+
+__inline_functions(double, __CONCAT_d)
+__inline_functions(float, __CONCAT_f)
+__inline_functions(long double, __CONCAT_l)
+#undef __inline_functions
+
+# define __inline_functions(float_type, m)				  \
+__m81_defun (int, m(__isnan), (float_type __value),			  \
+	     __attribute__ ((__const__)))			  	  \
+{									  \
+  char __result;							  \
+  __asm ("ftst%.x %1\n"							  \
+	 "fsun %0" : "=dm" (__result) : "f" (__value));			  \
+  return __result;							  \
+}
+
+__inline_functions(double, __CONCAT_d)
+__inline_functions(float, __CONCAT_f)
+__inline_functions(long double, __CONCAT_l)
+#undef __inline_functions
+
+# define __inline_functions(float_type, m)				  \
+__m81_defun (float_type, m(__scalbln),					  \
+	     (float_type __x, long int __n),)				  \
+{									  \
+  return m(__scalbn) (__x, __n);					  \
+}									  \
+									  \
+__m81_defun (float_type, m(__nearbyint), (float_type __x),)		  \
+{									  \
+  float_type __result;							  \
+  unsigned long int __ctrl_reg;						  \
+  __asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));		  \
+  /* Temporarily disable the inexact exception.  */			  \
+  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
+		      : "dmi" (__ctrl_reg & ~0x200));			  \
+  __asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));	  \
+  __asm __volatile__ ("fmove%.l %0, %!" : /* No outputs.  */		  \
+		      : "dmi" (__ctrl_reg));				  \
+  return __result;							  \
+}									  \
+									  \
+__m81_defun (long int, m(__lrint), (float_type __x),)			  \
+{									  \
+  long int __result;							  \
+  __asm __volatile__ ("fmove%.l %1, %0" : "=dm" (__result) : "f" (__x));  \
+  return __result;							  \
+}
+
+__inline_functions (double, __CONCAT_d)
+__inline_functions (float, __CONCAT_f)
+__inline_functions (long double, __CONCAT_l)
+#undef __inline_functions
+
+#define __inline_functions(float_type, m)				\
+__m81_inline void							\
+__m81_nth (__m81_u(m(__sincos))						\
+	   (float_type __x, float_type *__sinx, float_type *__cosx))	\
+{									\
+  __asm __volatile__ ("fsincos%.x %2,%1:%0"				\
+		      : "=f" (*__sinx), "=f" (*__cosx) : "f" (__x));	\
+}
+
+__inline_functions (double, __CONCAT_d)
+__inline_functions (float, __CONCAT_f)
+__inline_functions (long double, __CONCAT_l)
+#undef __inline_functions
+
+#undef __CONCAT_d
+#undef __CONCAT_f
+#undef __CONCAT_l
+
+/* Define the three variants of a math function that has a direct
+   implementation in the m68k fpu.  FUNC is the name for C (which will be
+   suffixed with f and l for the float and long double version, resp).  OP
+   is the name of the fpu operation (without leading f).  */
+
+#define __inline_mathop(func, op, attrs)			\
+  __inline_mathop1(double, func, op, attrs)			\
+  __inline_mathop1(float, __CONCAT(func,f), op, attrs)		\
+  __inline_mathop1(long double, __CONCAT(func,l), op, attrs)
+
+#define __inline_mathop1(float_type,func, op, attrs)			      \
+  __m81_defun (float_type, func, (float_type __mathop_x), attrs)	      \
+  {									      \
+    float_type __result;						      \
+    __asm __volatile__ ("f" __STRING(op) "%.x %1, %0"			      \
+			: "=f" (__result) : "f" (__mathop_x));		      \
+    return __result;							      \
+  }
+
 __inline_mathop	(__ieee754_acos, acos,)
 __inline_mathop	(__ieee754_asin, asin,)
 __inline_mathop	(__ieee754_cosh, cosh,)
@@ -91,3 +313,5 @@  __m81_test (long double __val)
 #define __M81_COND_INF  (2 << 24)
 #define __M81_COND_ZERO (4 << 24)
 #define __M81_COND_NEG  (8 << 24)
+
+#endif /* _MATHIMPL_H  */
diff --git a/sysdeps/m68k/m680x0/fpu/s_atan_template.c b/sysdeps/m68k/m680x0/fpu/s_atan_template.c
index de1f121583..445ad02806 100644
--- a/sysdeps/m68k/m680x0/fpu/s_atan_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_atan_template.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__atan) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_ceil_template.c b/sysdeps/m68k/m680x0/fpu/s_ceil_template.c
index 077353ccbe..9f27550c35 100644
--- a/sysdeps/m68k/m680x0/fpu/s_ceil_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_ceil_template.c
@@ -18,6 +18,7 @@ 
 
 #define NO_MATH_REDIRECT
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__ceil) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_fabs_template.c b/sysdeps/m68k/m680x0/fpu/s_fabs_template.c
index d8a5f8be84..398fc89e63 100644
--- a/sysdeps/m68k/m680x0/fpu/s_fabs_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_fabs_template.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__fabs) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_floor_template.c b/sysdeps/m68k/m680x0/fpu/s_floor_template.c
index bd4526a4fd..2026c3f5a6 100644
--- a/sysdeps/m68k/m680x0/fpu/s_floor_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_floor_template.c
@@ -18,6 +18,7 @@ 
 
 #define NO_MATH_REDIRECT
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__floor) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_isinf.c b/sysdeps/m68k/m680x0/fpu/s_isinf.c
index 68c767196f..d350e38beb 100644
--- a/sysdeps/m68k/m680x0/fpu/s_isinf.c
+++ b/sysdeps/m68k/m680x0/fpu/s_isinf.c
@@ -16,6 +16,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 #ifndef FUNC
 #define FUNC isinf
diff --git a/sysdeps/m68k/m680x0/fpu/s_log1p.c b/sysdeps/m68k/m680x0/fpu/s_log1p.c
index 52c7cb5987..f115223295 100644
--- a/sysdeps/m68k/m680x0/fpu/s_log1p.c
+++ b/sysdeps/m68k/m680x0/fpu/s_log1p.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 #ifndef FUNC
 #define FUNC log1p
diff --git a/sysdeps/m68k/m680x0/fpu/s_lrint_template.c b/sysdeps/m68k/m680x0/fpu/s_lrint_template.c
index 8eb4b65699..1eeec41802 100644
--- a/sysdeps/m68k/m680x0/fpu/s_lrint_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_lrint_template.c
@@ -19,6 +19,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 long int
 M_DECL_FUNC (__lrint) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_nearbyint_template.c b/sysdeps/m68k/m680x0/fpu/s_nearbyint_template.c
index 735f4b808c..1dd4dcb201 100644
--- a/sysdeps/m68k/m680x0/fpu/s_nearbyint_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_nearbyint_template.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__nearbyint) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_rint_template.c b/sysdeps/m68k/m680x0/fpu/s_rint_template.c
index a5fff65f8d..eb38400118 100644
--- a/sysdeps/m68k/m680x0/fpu/s_rint_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_rint_template.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__rint) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_scalbn.c b/sysdeps/m68k/m680x0/fpu/s_scalbn.c
index 6475092d7f..e3c69ebc12 100644
--- a/sysdeps/m68k/m680x0/fpu/s_scalbn.c
+++ b/sysdeps/m68k/m680x0/fpu/s_scalbn.c
@@ -15,6 +15,7 @@ 
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #define scalbln __no_scalbln_decl
 #define scalblnf __no_scalblnf_decl
 #define scalblnl __no_scalblnl_decl
@@ -28,6 +29,7 @@ 
 #undef __scalbln
 #undef __scalblnf
 #undef __scalblnl
+#include "mathimpl.h"
 
 #ifndef suffix
 #define suffix /*empty*/
diff --git a/sysdeps/m68k/m680x0/fpu/s_sincos_template.c b/sysdeps/m68k/m680x0/fpu/s_sincos_template.c
index f529cf5c10..ffae28d7d0 100644
--- a/sysdeps/m68k/m680x0/fpu/s_sincos_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_sincos_template.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 void
 M_DECL_FUNC (__sincos) (FLOAT x, FLOAT *sinx, FLOAT *cosx)
diff --git a/sysdeps/m68k/m680x0/fpu/s_tanh_template.c b/sysdeps/m68k/m680x0/fpu/s_tanh_template.c
index ab20976997..0e93371ec5 100644
--- a/sysdeps/m68k/m680x0/fpu/s_tanh_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_tanh_template.c
@@ -17,6 +17,7 @@ 
    <https://www.gnu.org/licenses/>.  */
 
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__tanh) (FLOAT x)
diff --git a/sysdeps/m68k/m680x0/fpu/s_trunc_template.c b/sysdeps/m68k/m680x0/fpu/s_trunc_template.c
index e8cb9fa1ec..1483abfbd0 100644
--- a/sysdeps/m68k/m680x0/fpu/s_trunc_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_trunc_template.c
@@ -18,6 +18,7 @@ 
 
 #define NO_MATH_REDIRECT
 #include <math.h>
+#include "mathimpl.h"
 
 FLOAT
 M_DECL_FUNC (__trunc) (FLOAT x)