diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 4 | ||||
| -rw-r--r-- | math/s_fmax_template.c (renamed from math/s_fmax.c) | 14 | ||||
| -rw-r--r-- | math/s_fmaxf.c | 28 | ||||
| -rw-r--r-- | math/s_fmaxl.c | 28 |
4 files changed, 9 insertions, 65 deletions
diff --git a/math/Makefile b/math/Makefile index be6b8acf87..09c4c5659c 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_fdimF s_nextdownF + s_cpowF s_clog10F s_fdimF s_nextdownF s_fmaxF 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_nanF s_truncF \ + s_fpclassifyF 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_fmax.c b/math/s_fmax_template.c index 9a8efce87f..dea53d45f0 100644 --- a/math/s_fmax.c +++ b/math/s_fmax_template.c @@ -19,14 +19,14 @@ #include <math.h> - -double -__fmax (double x, double y) +FLOAT +M_DECL_FUNC (__fmax) (FLOAT x, FLOAT y) { return (isgreaterequal (x, y) || isnan (y)) ? x : y; } -weak_alias (__fmax, fmax) -#ifdef NO_LONG_DOUBLE -strong_alias (__fmax, __fmaxl) -weak_alias (__fmax, fmaxl) + +declare_mgen_alias (__fmax, fmax); + +#if M_LIBM_NEED_COMPAT (fmax) +declare_mgen_libm_compat (__fmax, fmax) #endif diff --git a/math/s_fmaxf.c b/math/s_fmaxf.c deleted file mode 100644 index c241963bd1..0000000000 --- a/math/s_fmaxf.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Return maximum 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 -__fmaxf (float x, float y) -{ - return (isgreaterequal (x, y) || isnan (y)) ? x : y; -} -weak_alias (__fmaxf, fmaxf) diff --git a/math/s_fmaxl.c b/math/s_fmaxl.c deleted file mode 100644 index 3b2273548a..0000000000 --- a/math/s_fmaxl.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Return maximum 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 -__fmaxl (long double x, long double y) -{ - return (isgreaterequal (x, y) || isnan (y)) ? x : y; -} -weak_alias (__fmaxl, fmaxl) |