diff --git a/ChangeLog b/ChangeLog index 44ea47efae..ade36e3734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2017-11-29 Adhemerval Zanella + * sysdeps/sparc/sparc64/fpu/multiarch/Makefile (sysdeps_calls): + Add s_isnanf-generic and s_isnan-generic objects. + * sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S: New file. + * sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S: Likewise. + * sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c: Likewise. + * sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c: Likewise. + * sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S: Remove file. + * sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S: Likewise. + * sysdeps/sparc/sparc-ifunc.h (sparc_libm_ifunc_redirected): New macro. * sysdeps/sparc/sparc64/fpu/multiarch/Makefile (sysdep_calls): New diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile index 702452cbde..a46773ba1e 100644 --- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile +++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile @@ -5,7 +5,7 @@ ifeq ($(subdir),math) sysdep_calls := s_signbitf-vis3 s_signbit-vis3 s_signbitf-generic \ s_signbit-generic s_finitef-vis3 \ s_finite-vis3 s_isinff-vis3 s_isinf-vis3 \ - s_isnanf-vis3 s_isnan-vis3 + s_isnanf-vis3 s_isnan-vis3 s_isnanf-generic s_isnan-generic sysdep_routines += $(sysdep_calls) libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_rintf-vis3 s_rint-vis3 \ diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S new file mode 100644 index 0000000000..64d4430d82 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan-generic.S @@ -0,0 +1,6 @@ +#define __isnan __isnan_generic +#undef hidden_def +#define hidden_def(a) +#undef weak_alias +#define weak_alias(a,b) +#include diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S deleted file mode 100644 index 40e985a5d4..0000000000 --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S +++ /dev/null @@ -1,15 +0,0 @@ -#include - -SPARC_ASM_VIS3_IFUNC(isnan) - -hidden_def (__isnan) -weak_alias (__isnan, isnan) - -# undef weak_alias -# define weak_alias(a, b) -# undef hidden_def -# define hidden_def(a) - -#define __isnan __isnan_generic - -#include "../s_isnan.S" diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c new file mode 100644 index 0000000000..ffdf50451d --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.c @@ -0,0 +1,37 @@ +/* isnan ifunc resolver, Linux/sparc64 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#define __isnan __redirect___isnan +#define __isnanf __redirect___isnanf +#define __isnanl __redirect___isnanl +#include +#undef __isnan +#undef __isnanf +#undef __isnanl +#include + +extern __typeof (isnan) __isnan_vis3 attribute_hidden; +extern __typeof (isnan) __isnan_generic attribute_hidden; + +sparc_libm_ifunc_redirected (__redirect___isnan, __isnan, + hwcap & HWCAP_SPARC_VIS3 + ? __isnan_vis3 + : __isnan_generic); + +sparc_ifunc_redirected_hidden_def (__redirect___isnan, __isnan) +weak_alias (__isnan, isnan) diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S new file mode 100644 index 0000000000..5c82f7d101 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf-generic.S @@ -0,0 +1,6 @@ +#define __isnanf __isnanf_generic +#undef hidden_def +#define hidden_def(a) +#undef weak_alias +#define weak_alias(a,b) +#include diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S deleted file mode 100644 index 6b53b69d2e..0000000000 --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S +++ /dev/null @@ -1,15 +0,0 @@ -#include - -SPARC_ASM_VIS3_IFUNC(isnanf) - -hidden_def (__isnanf) -weak_alias (__isnanf, isnanf) - -# undef weak_alias -# define weak_alias(a, b) -# undef hidden_def -# define hidden_def(a) - -#define __isnanf __isnanf_generic - -#include "../s_isnanf.S" diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c new file mode 100644 index 0000000000..71038303a5 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.c @@ -0,0 +1,33 @@ +/* isnanf ifunc resolver, Linux/sparc64 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#define __isnanf __redirect___isnanf +#include +#undef __isnanf +#include + +extern __typeof (isnanf) __isnanf_vis3 attribute_hidden; +extern __typeof (isnanf) __isnanf_generic attribute_hidden; + +sparc_libm_ifunc_redirected (__redirect___isnanf, __isnanf, + hwcap & HWCAP_SPARC_VIS3 + ? __isnanf_vis3 + : __isnanf_generic); + +sparc_ifunc_redirected_hidden_def (__redirect___isnanf,__isnanf) +weak_alias (__isnanf, isnanf)