From 2d9470b2aed2ead3ca9df5173b0ff6c5c468d9d4 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 14 Oct 2013 22:01:36 -0500 Subject: [PATCH] PowerPC: multiarch logb/logbf/logbl for PowerPC32 --- ChangeLog | 34 +++++++++++++++ sysdeps/ieee754/ldbl-128ibm/s_logbl.c | 3 +- .../{powerpc32 => }/power7/fpu/s_logb.c | 0 .../{powerpc32 => }/power7/fpu/s_logbf.c | 0 .../{powerpc32 => }/power7/fpu/s_logbl.c | 3 +- .../powerpc32/power4/fpu/multiarch/Makefile | 7 +++- .../power4/fpu/multiarch/s_logb-power7.c | 31 ++++++++++++++ .../power4/fpu/multiarch/s_logb-ppc32.c | 28 +++++++++++++ .../powerpc32/power4/fpu/multiarch/s_logb.c | 41 +++++++++++++++++++ .../power4/fpu/multiarch/s_logbf-power7.c | 26 ++++++++++++ .../power4/fpu/multiarch/s_logbf-ppc32.c | 26 ++++++++++++ .../powerpc32/power4/fpu/multiarch/s_logbf.c | 32 +++++++++++++++ .../power4/fpu/multiarch/s_logbl-power7.c | 21 ++++++++++ .../power4/fpu/multiarch/s_logbl-ppc32.c | 21 ++++++++++ .../powerpc32/power4/fpu/multiarch/s_logbl.c | 32 +++++++++++++++ sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c | 2 +- .../powerpc/powerpc64/power7/fpu/s_logbf.c | 2 +- .../powerpc/powerpc64/power7/fpu/s_logbl.c | 2 +- 18 files changed, 305 insertions(+), 6 deletions(-) rename sysdeps/powerpc/{powerpc32 => }/power7/fpu/s_logb.c (100%) rename sysdeps/powerpc/{powerpc32 => }/power7/fpu/s_logbf.c (100%) rename sysdeps/powerpc/{powerpc32 => }/power7/fpu/s_logbl.c (98%) create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-power7.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-ppc32.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-power7.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-ppc32.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-power7.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-ppc32.c create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl.c diff --git a/ChangeLog b/ChangeLog index c96f965cc0..0327415f2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +2013-12-06 Adhemerval Zanella + + * sysdeps/ieee754/ldbl-128ibm/s_logbl.c (__logbl): Define + long_double_symbol only if __logbl is defined. + * sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c: Moved to ... + * sysdeps/powerpc/power7/fpu/s_logb.c: ... here. + * sysdeps/powerpc/powerpc32/power7/fpu/s_logbf.c: Move to ... + * sysdeps/powerpc/power7/fpu/s_logbf.c: ... here. + * sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c: Move to ... + * sysdeps/powerpc/power7/fpu/s_logbl.c: ... here. + * sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c: Adjust to use new + path for implementation. + * sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c: Likewise. + * sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile: Add logbf, + logb, and logbl multiarch implementations for PowerPC32. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-power7.c: New + file. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-ppc32.c: New + file. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb.c: New file: + multiarch logb for PowerPC32. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-power7.c: New + file. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-ppc32.c: New + file. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf.c: New file: + multiarch logbf for PowerPC32. + * sysdeps/powerpc/power4/fpu/multiarch/s_logbl-power7.c: New file. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-ppc32.c: New + file. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl.c: New file: + multiarch logbl implementation for PowerPC32. + 2013-12-06 Adhemerval Zanella * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile: Add modf diff --git a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c index e140288612..da8d71bdec 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_logbl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_logbl.c @@ -44,5 +44,6 @@ __logbl (long double x) } return (long double) (rhx - 1023); } - +#ifndef __logbl long_double_symbol (libm, __logbl, logbl); +#endif diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c b/sysdeps/powerpc/power7/fpu/s_logb.c similarity index 100% rename from sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c rename to sysdeps/powerpc/power7/fpu/s_logb.c diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbf.c b/sysdeps/powerpc/power7/fpu/s_logbf.c similarity index 100% rename from sysdeps/powerpc/powerpc32/power7/fpu/s_logbf.c rename to sysdeps/powerpc/power7/fpu/s_logbf.c diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c b/sysdeps/powerpc/power7/fpu/s_logbl.c similarity index 98% rename from sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c rename to sysdeps/powerpc/power7/fpu/s_logbl.c index 1c82577f5d..f5b90d9942 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_logbl.c +++ b/sysdeps/powerpc/power7/fpu/s_logbl.c @@ -66,5 +66,6 @@ __logbl (long double x) /* Test to avoid logb_downward (0.0) == -0.0. */ return ret == -0.0 ? 0.0 : ret; } - +#ifndef __logbl long_double_symbol (libm, __logbl, logbl); +#endif diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile index e45c0631c1..7f31f75e39 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/Makefile @@ -22,8 +22,13 @@ libm-sysdep_routines += s_llrintf-power6 s_llrintf-ppc32 s_llrint-power6 \ s_copysign-power6 s_copysign-ppc32 s_lround-power6x \ s_lround-power5+ s_lround-ppc32 s_lrint-power6x \ s_lrint-ppc32 s_modf-power5+ s_modf-ppc32 \ - s_modff-power5+ s_modff-ppc32 + s_modff-power5+ s_modff-ppc32 s_logbl-power7 \ + s_logbl-ppc32 s_logb-power7 s_logb-ppc32 \ + s_logbf-power7 s_logbf-ppc32 CFLAGS-s_modf-power5+.c = -mcpu=power5+ CFLAGS-s_modff-power5+.c = -mcpu=power5+ +CFLAGS-s_logbl-power7.c = -mcpu=power7 +CFLAGS-s_logb-power7.c = -mcpu=power7 +CFLAGS-s_logbf-power7.c = -mcpu=power7 endif diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-power7.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-power7.c new file mode 100644 index 0000000000..666c76d285 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-power7.c @@ -0,0 +1,31 @@ +/* logb(). PowerPC32/POWER7 version. + 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 + +#undef weak_alias +#define weak_alias(a, b) +#undef strong_alias +#define strong_alias(a, b) +#undef compat_symbol +#define compat_symbol(lib, name, alias, ver) + +#define __logb __logb_power7 + +#include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-ppc32.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-ppc32.c new file mode 100644 index 0000000000..9190ec9f8c --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb-ppc32.c @@ -0,0 +1,28 @@ +/* logb(). PowerPC32/POWER7 version. + 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 + +#undef weak_alias +#define weak_alias(a, b) +#undef strong_alias +#define strong_alias(a, b) + +#define __logb __logb_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb.c new file mode 100644 index 0000000000..c8eaf93e7c --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logb.c @@ -0,0 +1,41 @@ +/* Multiple versions of logb. + 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 (__logb) __logb_ppc32 attribute_hidden; +extern __typeof (__logb) __logb_power7 attribute_hidden; + +libc_ifunc (__logb, + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __logb_power7 + : __logb_ppc32); + +weak_alias (__logb, logb) + +#ifdef NO_LONG_DOUBLE +strong_alias (__logb, __logbl) +weak_alias (__logb, logbl) +#endif + +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) +compat_symbol (libm, logb, logbl, GLIBC_2_0); +#endif diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-power7.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-power7.c new file mode 100644 index 0000000000..f454c75799 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-power7.c @@ -0,0 +1,26 @@ +/* logbf(). PowerPC32/POWER7 version. + 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 + +#undef weak_alias +#define weak_alias(a, b) + +#define __logbf __logbf_power7 + +#include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-ppc32.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-ppc32.c new file mode 100644 index 0000000000..7d51041375 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf-ppc32.c @@ -0,0 +1,26 @@ +/* logbf(). PowerPC32 default implementation. + 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 + +#undef weak_alias +#define weak_alias(a, b) + +#define __logbf __logbf_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf.c new file mode 100644 index 0000000000..cf66af4367 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbf.c @@ -0,0 +1,32 @@ +/* Multiple versions of logbf. + 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 (__logbf) __logbf_ppc32 attribute_hidden; +extern __typeof (__logbf) __logbf_power7 attribute_hidden; + +libc_ifunc (__logbf, + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __logbf_power7 + : __logbf_ppc32); + +weak_alias (__logbf, logbf) diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-power7.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-power7.c new file mode 100644 index 0000000000..b5adcd232a --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-power7.c @@ -0,0 +1,21 @@ +/* logbl(). PowerPC32/POWER7 version. + 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 + . */ + +#define __logbl __logbl_power7 + +#include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-ppc32.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-ppc32.c new file mode 100644 index 0000000000..705de9f4e5 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl-ppc32.c @@ -0,0 +1,21 @@ +/* logbl(). PowerPC32/POWER7 version. + 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 + . */ + +#define __logbl __logbl_ppc32 + +#include diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl.c new file mode 100644 index 0000000000..acc6700083 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_logbl.c @@ -0,0 +1,32 @@ +/* Multiple versions of logbl. + 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 (__logbl) __logbl_ppc32 attribute_hidden; +extern __typeof (__logbl) __logbl_power7 attribute_hidden; + +libc_ifunc (__logbl, + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __logbl_power7 + : __logbl_ppc32); + +long_double_symbol (libm, __logbl, logbl); diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c b/sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c index ff3a9e0c77..2599c771d9 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c +++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c @@ -1 +1 @@ -#include +#include diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c b/sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c index e79a28f775..7a5a8032e0 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c +++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c @@ -1 +1 @@ -#include +#include diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c b/sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c index 463e411b4e..524ae2c78d 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c +++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c @@ -1 +1 @@ -#include +#include