From aa5bd1097bbffa3414dc78c4a9e193389ef29e2c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Sun, 14 Apr 2013 15:36:20 -0500 Subject: PowerPC: trunc/truncf multilib for PowerPC32 --- sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile | 4 ++- .../powerpc32/fpu/multiarch/s_trunc-power5+.S | 26 ++++++++++++++ .../powerpc32/fpu/multiarch/s_trunc-ppc32.S | 13 +++++++ sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc.c | 40 ++++++++++++++++++++++ .../powerpc32/fpu/multiarch/s_truncf-power5+.S | 26 ++++++++++++++ .../powerpc32/fpu/multiarch/s_truncf-ppc32.S | 9 +++++ sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf.c | 32 +++++++++++++++++ sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S | 36 ------------------- sysdeps/powerpc/powerpc32/power5+/fpu/s_truncf.S | 29 ---------------- 9 files changed, 149 insertions(+), 66 deletions(-) create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-power5+.S create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-ppc32.S create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc.c create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-power5+.S create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-ppc32.S create mode 100644 sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf.c delete mode 100644 sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S delete mode 100644 sysdeps/powerpc/powerpc32/power5+/fpu/s_truncf.S diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile index 8c7868e9d1..20c8dd8b1b 100644 --- a/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/Makefile @@ -21,7 +21,9 @@ libm-sysdep_routines += s_llrintf-power6 s_llrintf-power4 s_llrintf-c \ s_floor-power5+ s_floor-ppc32 \ s_floorf-power5+ s_floorf-ppc32 \ s_round-power5+ s_round-ppc32 \ - s_roundf-power5+ s_roundf-ppc32 + s_roundf-power5+ s_roundf-ppc32 \ + s_trunc-power5+ s_trunc-ppc32 \ + s_truncf-power5+ s_truncf-ppc32 CFLAGS-s_llround.c = -fno-builtin-llroundf endif diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-power5+.S b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-power5+.S new file mode 100644 index 0000000000..d9fc987134 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-power5+.S @@ -0,0 +1,26 @@ +/* trunc function. PowerPC32/power5+ version. + Copyright (C) 2006-2013 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 + . */ + +#include +#include + + .machine "power5" +EALIGN (__trunc_power5plus, 4, 0) + friz fp1, fp1 + blr +END (__trunc_power5plus) diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-ppc32.S b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-ppc32.S new file mode 100644 index 0000000000..2e931c6a8c --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc-ppc32.S @@ -0,0 +1,13 @@ +#include +#include + +#undef weak_alias +#define weak_alias(a,b) +#undef strong_alias +#define strong_alias(a,b) +#undef compat_symbol +#define compat_symbol(a,b,c,d) + +#define __trunc __trunc_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc.c new file mode 100644 index 0000000000..a5fa8addf5 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_trunc.c @@ -0,0 +1,40 @@ +/* Multiple versions of s_trunc. + Copyright (C) 2013 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 + . */ + +#include +#include +#include +#include "init-arch.h" + +extern __typeof (__trunc) __trunc_ppc32 attribute_hidden; +extern __typeof (__trunc) __trunc_power5plus attribute_hidden; + +libc_ifunc (__trunc, + (hwcap & PPC_FEATURE_POWER5_PLUS) + ? __trunc_power5plus + : __trunc_ppc32); + +weak_alias (__trunc, trunc) + +#ifdef NO_LONG_DOUBLE +strong_alias (__trunc, __truncl) +weak_alias (__trunc, truncl) +#endif +#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) +compat_symbol (libm, __trunc, truncl, GLIBC_2_1); +#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-power5+.S b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-power5+.S new file mode 100644 index 0000000000..35cd65acab --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-power5+.S @@ -0,0 +1,26 @@ +/* truncf function. PowerPC32/power5+ version. + Copyright (C) 2006-2013 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 + . */ + +#include + + .machine "power5" +EALIGN (__truncf_power5plus, 4, 0) + friz fp1, fp1 /* The rounding instructions are double. */ + frsp fp1, fp1 /* But we need to set overflow for float. */ + blr +END (__truncf_power5plus) diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-ppc32.S b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-ppc32.S new file mode 100644 index 0000000000..e4fe3b948b --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf-ppc32.S @@ -0,0 +1,9 @@ +#include +#include + +#undef weak_alias +#define weak_alias(a,b) + +#define __truncf __truncf_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf.c b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf.c new file mode 100644 index 0000000000..b0ab04a90e --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/multiarch/s_truncf.c @@ -0,0 +1,32 @@ +/* Multiple versions of s_truncf. + Copyright (C) 2013 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 + . */ + +#include +#include +#include +#include "init-arch.h" + +extern __typeof (__truncf) __truncf_ppc32 attribute_hidden; +extern __typeof (__truncf) __truncf_power5plus attribute_hidden; + +libc_ifunc (__truncf, + (hwcap & PPC_FEATURE_POWER5_PLUS) + ? __truncf_power5plus + : __truncf_ppc32); + +weak_alias (__truncf, truncf) diff --git a/sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S b/sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S deleted file mode 100644 index 2d4ec5a060..0000000000 --- a/sysdeps/powerpc/powerpc32/power5+/fpu/s_trunc.S +++ /dev/null @@ -1,36 +0,0 @@ -/* trunc function. PowerPC32/power5+ version. - Copyright (C) 2006-2013 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 - . */ - -#include -#include - - .machine "power5" -EALIGN (__trunc, 4, 0) - friz fp1, fp1 - blr - END (__trunc) - -weak_alias (__trunc, trunc) - -#ifdef NO_LONG_DOUBLE -weak_alias (__trunc, truncl) -strong_alias (__trunc, __truncl) -#endif -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __trunc, truncl, GLIBC_2_1) -#endif diff --git a/sysdeps/powerpc/powerpc32/power5+/fpu/s_truncf.S b/sysdeps/powerpc/powerpc32/power5+/fpu/s_truncf.S deleted file mode 100644 index 0ca5b5c505..0000000000 --- a/sysdeps/powerpc/powerpc32/power5+/fpu/s_truncf.S +++ /dev/null @@ -1,29 +0,0 @@ -/* truncf function. PowerPC32/power5+ version. - Copyright (C) 2006-2013 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 - . */ - -#include - - .machine "power5" -EALIGN (__truncf, 4, 0) - friz fp1, fp1 /* The rounding instructions are double. */ - frsp fp1, fp1 /* But we need to set ooverflow for float. */ - blr - END (__truncf) - -weak_alias (__truncf, truncf) - -- cgit v1.2.1