Make common fdim implementation generic.

The only difference is the usage of math_narrow_eval when
building s_fdiml.c.  This should be harmless for long double,
but I did observe some code generation changes on m68k, but
lack the resources to test it.

Likewise, to more easily support overriding symbol generation,
the aliasing macros are always conditionally defined on their
absence to reduce boilerplate.

I also ran builds for i486, ppc64, sparcv9, aarch64,
s390x and observed no changes to s_fdim* objects.

4 files changed, 10 insertions, 85 deletions

diff --git a/math/Makefile b/math/Makefile
index f1b7937c98..d4b6d98740 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -49,7 +49,7 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF		  \
 	         s_cacoshF s_ccosF s_ccoshF s_casinF s_csinF s_casinhF	  \
 		 k_casinhF s_csinhF k_casinhF s_csinhF s_catanhF s_catanF \
 		 s_ctanF s_ctanhF s_cexpF s_clogF s_cprojF s_csqrtF	  \
-		 s_cpowF s_clog10F
+		 s_cpowF s_clog10F s_fdimF
 
 libm-calls =								  \
 	e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \
@@ -65,7 +65,7 @@ libm-calls =								  \
 	w_tgammaF w_hypotF w_j0F w_j1F w_jnF w_lgammaF w_lgammaF_r	  \
 	w_logF w_log10F w_powF w_remainderF w_scalbF w_sinhF w_sqrtF	  \
 	w_ilogbF							  \
-	s_fpclassifyF s_fmaxF s_fminF s_fdimF s_nanF s_truncF		  \
+	s_fpclassifyF s_fmaxF s_fminF s_nanF s_truncF		  	  \
 	s_remquoF e_log2F e_exp2F s_roundF s_nearbyintF s_sincosF	  \
 	s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F w_log2F	  \
 	s_issignalingF $(calls:s_%=m_%) x2y2m1F				  \
diff --git a/math/s_fdim.c b/math/s_fdim.c
deleted file mode 100644
index 1786521c17..0000000000
--- a/math/s_fdim.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Return positive difference between arguments.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   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/>.  */
-
-#include <errno.h>
-#include <math.h>
-#include <math_private.h>
-
-double
-__fdim (double x, double y)
-{
-  if (islessequal (x, y))
-    return 0.0;
-
-  double r = math_narrow_eval (x - y);
-  if (isinf (r) && !isinf (x) && !isinf (y))
-    __set_errno (ERANGE);
-
-  return r;
-}
-#ifndef __fdim
-weak_alias (__fdim, fdim)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__fdim, __fdiml)
-weak_alias (__fdim, fdiml)
-# endif
-#endif
diff --git a/math/s_fdimf.c b/math/s_fdim_template.c
index e457f9d3b9..d3e73790af 100644
--- a/math/s_fdimf.c
+++ b/math/s_fdim_template.c
@@ -21,18 +21,20 @@
 #include <math.h>
 #include <math_private.h>
 
-float
-__fdimf (float x, float y)
+FLOAT
+M_DECL_FUNC (__fdim) (FLOAT x, FLOAT y)
 {
   if (islessequal (x, y))
-    return 0.0f;
+    return 0;
 
-  float r = math_narrow_eval (x - y);
+  FLOAT r = math_narrow_eval (x - y);
   if (isinf (r) && !isinf (x) && !isinf (y))
     __set_errno (ERANGE);
 
   return r;
 }
-#ifndef __fdimf
-weak_alias (__fdimf, fdimf)
+declare_mgen_alias (__fdim, fdim);
+
+#if M_LIBM_NEED_COMPAT (fdim)
+declare_mgen_libm_compat (__fdim, fdim)
 #endif
diff --git a/math/s_fdiml.c b/math/s_fdiml.c
deleted file mode 100644
index 4a1f6722c6..0000000000
--- a/math/s_fdiml.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Return positive difference between arguments.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   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/>.  */
-
-#include <errno.h>
-#include <math.h>
-
-long double
-__fdiml (long double x, long double y)
-{
-  if (islessequal (x, y))
-    return 0.0f;
-
-  long double r = x - y;
-  if (isinf (r) && !isinf (x) && !isinf (y))
-    __set_errno (ERANGE);
-
-  return r;
-}
-weak_alias (__fdiml, fdiml)