mirror of git://sourceware.org/git/glibc.git
Make common fmin implementation generic.
This commit is contained in:
Paul E. Murphy
parent
847c9161c7
commit
f306ea1ada
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
2016-09-01 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
|
||||
|
||||
* math/Makefile (gen-libm-calls): Add s_fmin
|
||||
(libm-calls): Remove above.
|
||||
|
||||
* math/s_fmin.c: Refactor into ...
|
||||
* math/s_fmin_template.c: New file.
|
||||
|
||||
* math/s_fminf.c: Removed.
|
||||
* math/s_fminl.c: Removed.
|
||||
* sysdeps/ieee754/ldbl-opt/math-type-macros-double.h:
|
||||
(LDOUBLE_fmin_libm_version): New macro.
|
||||
|
||||
* sysdeps/ieee754/ldbl-opt/s_fmin.c: Removed.
|
||||
* sysdeps/ieee754/ldbl-opt/s_fminl.c: Removed.
|
||||
|
||||
2016-09-01 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
|
||||
|
||||
* math/Makefile: (gen-libm-calls): Add s_fmax.
|
||||
|
|
|
|||
|
|
@ -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_fdimF s_nextdownF s_fmaxF
|
||||
s_cpowF s_clog10F s_fdimF s_nextdownF s_fmaxF s_fminF
|
||||
|
||||
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_fminF s_nanF s_truncF \
|
||||
s_fpclassifyF 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 \
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
#include <math.h>
|
||||
|
||||
|
||||
double
|
||||
__fmin (double x, double y)
|
||||
FLOAT
|
||||
M_DECL_FUNC (__fmin) (FLOAT x, FLOAT y)
|
||||
{
|
||||
return (islessequal (x, y) || isnan (y)) ? x : y;
|
||||
}
|
||||
weak_alias (__fmin, fmin)
|
||||
#ifdef NO_LONG_DOUBLE
|
||||
strong_alias (__fmin, __fminl)
|
||||
weak_alias (__fmin, fminl)
|
||||
declare_mgen_alias (__fmin, fmin);
|
||||
|
||||
#if M_LIBM_NEED_COMPAT (fmin)
|
||||
declare_mgen_libm_compat (__fmin, fmin)
|
||||
#endif
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
/* Return minimum numeric value of X and Y.
|
||||
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 <math.h>
|
||||
|
||||
|
||||
float
|
||||
__fminf (float x, float y)
|
||||
{
|
||||
return (islessequal (x, y) || isnan (y)) ? x : y;
|
||||
}
|
||||
weak_alias (__fminf, fminf)
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
/* Return minimum numeric value of X and Y.
|
||||
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 <math.h>
|
||||
|
||||
|
||||
long double
|
||||
__fminl (long double x, long double y)
|
||||
{
|
||||
return (islessequal (x, y) || isnan (y)) ? x : y;
|
||||
}
|
||||
weak_alias (__fminl, fminl)
|
||||
|
|
@ -46,6 +46,7 @@
|
|||
#define LDOUBLE___clog10l_libm_version GLIBC_2_1
|
||||
#define LDOUBLE_fdiml_libm_version GLIBC_2_1
|
||||
#define LDOUBLE_fmaxl_libm_version GLIBC_2_1
|
||||
#define LDOUBLE_fminl_libm_version GLIBC_2_1
|
||||
|
||||
/* Define compat symbols for long double on platforms
|
||||
where it was not always a distinct type. */
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#include <math_ldbl_opt.h>
|
||||
#include <math/s_fmin.c>
|
||||
#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
|
||||
compat_symbol (libm, __fmin, fminl, GLIBC_2_1);
|
||||
#endif
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#include <math_ldbl_opt.h>
|
||||
#undef weak_alias
|
||||
#define weak_alias(n,a)
|
||||
#include <math/s_fminl.c>
|
||||
long_double_symbol (libm, __fminl, fminl);
|
||||
Loading…
Reference in New Issue