From 2251fad0254299701f4fb1c65ef8c8b69d0cf00e Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 30 Nov 2017 23:47:18 +0000
Subject: [PATCH] Use libm_alias_double for coldfire.

Continuing the preparation for additional _FloatN / _FloatNx function
aliases, this patch makes coldfire libm function implementations use
libm_alias_double to define function aliases.

Untested, given the currently broken state of GCC for coldfire.

	* sysdeps/m68k/coldfire/fpu/s_fabs.c: Include
	<libm-alias-double.h>.
	(fabs): Define using libm_alias_double.
	* sysdeps/m68k/coldfire/fpu/s_lrint.c: Include
	<libm-alias-double.h>.
	(lrint): Define using libm_alias_double.
	* sysdeps/m68k/coldfire/fpu/s_rint.c: Include
	<libm-alias-double.h>.
	(rint): Define using libm_alias_double.
---
 ChangeLog                           | 10 ++++++++++
 sysdeps/m68k/coldfire/fpu/s_fabs.c  |  8 +++-----
 sysdeps/m68k/coldfire/fpu/s_lrint.c |  8 +++-----
 sysdeps/m68k/coldfire/fpu/s_rint.c  |  8 +++-----
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5f77a49b9..2926264070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2017-11-30  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/m68k/coldfire/fpu/s_fabs.c: Include
+	<libm-alias-double.h>.
+	(fabs): Define using libm_alias_double.
+	* sysdeps/m68k/coldfire/fpu/s_lrint.c: Include
+	<libm-alias-double.h>.
+	(lrint): Define using libm_alias_double.
+	* sysdeps/m68k/coldfire/fpu/s_rint.c: Include
+	<libm-alias-double.h>.
+	(rint): Define using libm_alias_double.
+
 	* sysdeps/m68k/m680x0/fpu/s_atan_template.c: New file.
 	* sysdeps/m68k/m680x0/fpu/s_ceil_template.c: Likewise.
 	* sysdeps/m68k/m680x0/fpu/s_cos_template.c: Likewise.
diff --git a/sysdeps/m68k/coldfire/fpu/s_fabs.c b/sysdeps/m68k/coldfire/fpu/s_fabs.c
index 6c1a8dc344..337d293228 100644
--- a/sysdeps/m68k/coldfire/fpu/s_fabs.c
+++ b/sysdeps/m68k/coldfire/fpu/s_fabs.c
@@ -15,14 +15,12 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-double.h>
+
 double
 __fabs (double x)
 {
   asm ("fdabs.d %1,%0" : "=f" (x) : "fm" (x));
   return x;
 }
-weak_alias (__fabs, fabs)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__fabs, __fabsl)
-weak_alias (__fabs, fabsl)
-#endif
+libm_alias_double (__fabs, fabs)
diff --git a/sysdeps/m68k/coldfire/fpu/s_lrint.c b/sysdeps/m68k/coldfire/fpu/s_lrint.c
index 0cdad325d1..3fa878c985 100644
--- a/sysdeps/m68k/coldfire/fpu/s_lrint.c
+++ b/sysdeps/m68k/coldfire/fpu/s_lrint.c
@@ -15,6 +15,8 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-double.h>
+
 long int
 __lrint (double x)
 {
@@ -22,8 +24,4 @@ __lrint (double x)
   asm ("fmove.l %1,%0" : "=dm" (result) : "f" (x));
   return result;
 }
-weak_alias (__lrint, lrint)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__lrint, __lrintl)
-weak_alias (__lrint, lrintl)
-#endif
+libm_alias_double (__lrint, lrint)
diff --git a/sysdeps/m68k/coldfire/fpu/s_rint.c b/sysdeps/m68k/coldfire/fpu/s_rint.c
index e950630688..feef36752a 100644
--- a/sysdeps/m68k/coldfire/fpu/s_rint.c
+++ b/sysdeps/m68k/coldfire/fpu/s_rint.c
@@ -15,14 +15,12 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-double.h>
+
 double
 __rint (double x)
 {
   asm ("fint.d %1,%0" : "=f" (x) : "fm" (x));
   return x;
 }
-weak_alias (__rint, rint)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__rint, __rintl)
-weak_alias (__rint, rintl)
-#endif
+libm_alias_double (__rint, rint)