From f938b397dd17265a1a005cd5786f197de1013e74 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 30 Nov 2017 23:52:35 +0000
Subject: [PATCH] Use libm_alias_float for coldfire.

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

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

	* sysdeps/m68k/coldfire/fpu/s_fabsf.c: Include
	<libm-alias-float.h>.
	(fabsf): Define using libm_alias_float.
	* sysdeps/m68k/coldfire/fpu/s_lrintf.c: Include
	<libm-alias-float.h>.
	(lrintf): Define using libm_alias_float.
	* sysdeps/m68k/coldfire/fpu/s_rintf.c: Include
	<libm-alias-float.h>.
	(rintf): Define using libm_alias_float.
---
 ChangeLog                            | 10 ++++++++++
 sysdeps/m68k/coldfire/fpu/s_fabsf.c  |  4 +++-
 sysdeps/m68k/coldfire/fpu/s_lrintf.c |  4 +++-
 sysdeps/m68k/coldfire/fpu/s_rintf.c  |  4 +++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29262640706..9f842e7b269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2017-11-30  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/m68k/coldfire/fpu/s_fabsf.c: Include
+	<libm-alias-float.h>.
+	(fabsf): Define using libm_alias_float.
+	* sysdeps/m68k/coldfire/fpu/s_lrintf.c: Include
+	<libm-alias-float.h>.
+	(lrintf): Define using libm_alias_float.
+	* sysdeps/m68k/coldfire/fpu/s_rintf.c: Include
+	<libm-alias-float.h>.
+	(rintf): Define using libm_alias_float.
+
 	* sysdeps/m68k/coldfire/fpu/s_fabs.c: Include
 	<libm-alias-double.h>.
 	(fabs): Define using libm_alias_double.
diff --git a/sysdeps/m68k/coldfire/fpu/s_fabsf.c b/sysdeps/m68k/coldfire/fpu/s_fabsf.c
index e134c102e99..eff98884aea 100644
--- a/sysdeps/m68k/coldfire/fpu/s_fabsf.c
+++ b/sysdeps/m68k/coldfire/fpu/s_fabsf.c
@@ -15,10 +15,12 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-float.h>
+
 float
 __fabsf (float x)
 {
   asm ("fsabs.s %1,%0" : "=f" (x) : "dm" (x));
   return x;
 }
-weak_alias (__fabsf, fabsf)
+libm_alias_float (__fabs, fabs)
diff --git a/sysdeps/m68k/coldfire/fpu/s_lrintf.c b/sysdeps/m68k/coldfire/fpu/s_lrintf.c
index 7f5c9d04f2f..0ec101499fe 100644
--- a/sysdeps/m68k/coldfire/fpu/s_lrintf.c
+++ b/sysdeps/m68k/coldfire/fpu/s_lrintf.c
@@ -15,6 +15,8 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-float.h>
+
 long int
 __lrintf (float x)
 {
@@ -22,4 +24,4 @@ __lrintf (float x)
   asm ("fmove.l %1,%0" : "=dm" (result) : "f" (x));
   return result;
 }
-weak_alias (__lrintf, lrintf)
+libm_alias_float (__lrint, lrint)
diff --git a/sysdeps/m68k/coldfire/fpu/s_rintf.c b/sysdeps/m68k/coldfire/fpu/s_rintf.c
index ea244e8b88b..aa0e1582056 100644
--- a/sysdeps/m68k/coldfire/fpu/s_rintf.c
+++ b/sysdeps/m68k/coldfire/fpu/s_rintf.c
@@ -15,6 +15,8 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <libm-alias-float.h>
+
 float
 __rintf (float x)
 {
@@ -22,4 +24,4 @@ __rintf (float x)
   asm ("fint.s %1,%0" : "=f" (result) : "dm" (x));
   return (float) result;
 }
-weak_alias (__rintf, rintf)
+libm_alias_float (__rint, rint)
-- 
2.47.2