|
 |
00db10 |
From e7197c1f8c4c30734723059c97b6e7a8f58fb171 Mon Sep 17 00:00:00 2001
|
|
|
00db10 |
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
|
|
|
00db10 |
Date: Wed, 30 Jul 2014 11:33:51 -0500
|
|
|
00db10 |
Subject: [PATCH] PowerPC: multiarch finite/finitef for PowerPC64
|
|
|
00db10 |
|
|
|
00db10 |
commit 1481d7066c4ce697ada1f33c8c7f97b46ef685e3
|
|
|
00db10 |
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
00db10 |
Date: Fri Dec 13 15:34:52 2013 -0500
|
|
|
00db10 |
|
|
|
00db10 |
Modified the following files apart from the original commit.
|
|
|
00db10 |
sysdeps/ieee754/dbl-64/s_finite.c
|
|
|
00db10 |
sysdeps/ieee754/flt-32/s_finitef.c
|
|
|
00db10 |
---
|
|
|
00db10 |
sysdeps/ieee754/dbl-64/s_finite.c | 13 ++++--
|
|
|
00db10 |
sysdeps/ieee754/flt-32/s_finitef.c | 7 ++-
|
|
|
00db10 |
sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile | 6 ++-
|
|
|
00db10 |
.../powerpc64/fpu/multiarch/s_finite-power7.S | 33 ++++++++++++++
|
|
|
00db10 |
.../powerpc64/fpu/multiarch/s_finite-ppc64.c | 34 +++++++++++++++
|
|
|
00db10 |
sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c | 51 ++++++++++++++++++++++
|
|
|
00db10 |
.../powerpc64/fpu/multiarch/s_finitef-ppc64.c | 32 ++++++++++++++
|
|
|
00db10 |
.../powerpc/powerpc64/fpu/multiarch/s_finitef.c | 32 ++++++++++++++
|
|
|
00db10 |
8 files changed, 201 insertions(+), 7 deletions(-)
|
|
|
00db10 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
|
|
|
00db10 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c
|
|
|
00db10 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
|
|
|
00db10 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c
|
|
|
00db10 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c
|
|
|
00db10 |
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/ieee754/dbl-64/s_finite.c glibc-2.17-c758a686/sysdeps/ieee754/dbl-64/s_finite.c
|
|
|
00db10 |
index 47dad5d..49986bb 100644
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/ieee754/dbl-64/s_finite.c
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/ieee754/dbl-64/s_finite.c
|
|
|
00db10 |
@@ -23,11 +23,16 @@ static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $";
|
|
|
00db10 |
#include <math_private.h>
|
|
|
00db10 |
|
|
|
00db10 |
#undef __finite
|
|
|
00db10 |
-int __finite(double x)
|
|
|
00db10 |
+
|
|
|
00db10 |
+#ifndef FINITE
|
|
|
00db10 |
+# define FINITE __finite
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
+
|
|
|
00db10 |
+int FINITE(double x)
|
|
|
00db10 |
{
|
|
|
00db10 |
- int32_t hx;
|
|
|
00db10 |
- GET_HIGH_WORD(hx,x);
|
|
|
00db10 |
- return (int)((u_int32_t)((hx&0x7fffffff)-0x7ff00000)>>31);
|
|
|
00db10 |
+ int32_t hx;
|
|
|
00db10 |
+ GET_HIGH_WORD (hx, x);
|
|
|
00db10 |
+ return (int) ((u_int32_t) ((hx & 0x7fffffff) - 0x7ff00000) >> 31);
|
|
|
00db10 |
}
|
|
|
00db10 |
hidden_def (__finite)
|
|
|
00db10 |
weak_alias (__finite, finite)
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/ieee754/flt-32/s_finitef.c glibc-2.17-c758a686/sysdeps/ieee754/flt-32/s_finitef.c
|
|
|
00db10 |
index dfdf4ad..4ea270a 100644
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/ieee754/flt-32/s_finitef.c
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/ieee754/flt-32/s_finitef.c
|
|
|
00db10 |
@@ -26,7 +26,12 @@ static char rcsid[] = "$NetBSD: s_finitef.c,v 1.4 1995/05/10 20:47:18 jtc Exp $"
|
|
|
00db10 |
#include <math_private.h>
|
|
|
00db10 |
|
|
|
00db10 |
#undef __finitef
|
|
|
00db10 |
-int __finitef(float x)
|
|
|
00db10 |
+
|
|
|
00db10 |
+#ifndef FINITEF
|
|
|
00db10 |
+# define FINITEF __finitef
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
+
|
|
|
00db10 |
+int FINITEF(float x)
|
|
|
00db10 |
{
|
|
|
00db10 |
int32_t ix;
|
|
|
00db10 |
GET_FLOAT_WORD(ix,x);
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
|
|
|
00db10 |
index 10d0ac9..1c23ddc 100644
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
|
|
|
00db10 |
@@ -1,7 +1,8 @@
|
|
|
00db10 |
ifeq ($(subdir),math)
|
|
|
00db10 |
sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
|
|
|
00db10 |
s_isnan-power5 s_isnan-ppc64 s_copysign-power6 \
|
|
|
00db10 |
- s_copysign-ppc64
|
|
|
00db10 |
+ s_copysign-ppc64 s_finite-power7 s_finite-ppc64 \
|
|
|
00db10 |
+ s_finitef-ppc64
|
|
|
00db10 |
|
|
|
00db10 |
libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
|
|
|
00db10 |
s_isnan-power5 s_isnan-ppc64 s_llround-power6x \
|
|
|
00db10 |
@@ -12,5 +13,6 @@ libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
|
|
|
00db10 |
s_roundf-power5+ s_roundf-ppc64 s_trunc-power5+ \
|
|
|
00db10 |
s_trunc-ppc64 s_truncf-power5+ s_truncf-ppc64 \
|
|
|
00db10 |
s_copysign-power6 s_copysign-ppc64 s_llrint-power6x \
|
|
|
00db10 |
- s_llrint-ppc64
|
|
|
00db10 |
+ s_llrint-ppc64 s_finite-power7 s_finite-ppc64 \
|
|
|
00db10 |
+ s_finitef-ppc64
|
|
|
00db10 |
endif
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
|
|
|
00db10 |
new file mode 100644
|
|
|
00db10 |
index 0000000..ac2244b
|
|
|
00db10 |
--- /dev/null
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S
|
|
|
00db10 |
@@ -0,0 +1,33 @@
|
|
|
00db10 |
+/* isnan(). PowerPC64/POWER7 version.
|
|
|
00db10 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
00db10 |
+ This file is part of the GNU C Library.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
00db10 |
+ License as published by the Free Software Foundation; either
|
|
|
00db10 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Lesser General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
00db10 |
+ License along with the GNU C Library; if not, see
|
|
|
00db10 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <sysdep.h>
|
|
|
00db10 |
+#include <math_ldbl_opt.h>
|
|
|
00db10 |
+
|
|
|
00db10 |
+#undef hidden_def
|
|
|
00db10 |
+#define hidden_def(name)
|
|
|
00db10 |
+#undef weak_alias
|
|
|
00db10 |
+#define weak_alias(name, alias)
|
|
|
00db10 |
+#undef strong_alias
|
|
|
00db10 |
+#define strong_alias(name, alias)
|
|
|
00db10 |
+#undef compat_symbol
|
|
|
00db10 |
+#define compat_symbol(lib, name, symbol, ver)
|
|
|
00db10 |
+
|
|
|
00db10 |
+#define __finite __finite_power7
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S>
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c
|
|
|
00db10 |
new file mode 100644
|
|
|
00db10 |
index 0000000..1922e2b
|
|
|
00db10 |
--- /dev/null
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c
|
|
|
00db10 |
@@ -0,0 +1,34 @@
|
|
|
00db10 |
+/* finite(). PowerPC64 default version.
|
|
|
00db10 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
00db10 |
+ Contributed by Luis Machado <luisgpm@br.ibm.com>.
|
|
|
00db10 |
+ This file is part of the GNU C Library.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
00db10 |
+ License as published by the Free Software Foundation; either
|
|
|
00db10 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Lesser General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
00db10 |
+ License along with the GNU C Library; if not, see
|
|
|
00db10 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <math.h>
|
|
|
00db10 |
+
|
|
|
00db10 |
+#undef weak_alias
|
|
|
00db10 |
+#define weak_alias(a, b)
|
|
|
00db10 |
+#undef strong_alias
|
|
|
00db10 |
+#define strong_alias(a, b)
|
|
|
00db10 |
+
|
|
|
00db10 |
+#define FINITE __finite_ppc64
|
|
|
00db10 |
+#ifdef SHARED
|
|
|
00db10 |
+# undef hidden_def
|
|
|
00db10 |
+# define hidden_def(a) \
|
|
|
00db10 |
+ __hidden_ver1 (__finite_ppc64, __GI___finite, __finite_ppc64);
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <sysdeps/ieee754/dbl-64/s_finite.c>
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
|
|
|
00db10 |
new file mode 100644
|
|
|
00db10 |
index 0000000..f79a93e
|
|
|
00db10 |
--- /dev/null
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
|
|
|
00db10 |
@@ -0,0 +1,51 @@
|
|
|
00db10 |
+/* Multiple versions of finite.
|
|
|
00db10 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
00db10 |
+ This file is part of the GNU C Library.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
00db10 |
+ License as published by the Free Software Foundation; either
|
|
|
00db10 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Lesser General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
00db10 |
+ License along with the GNU C Library; if not, see
|
|
|
00db10 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <math.h>
|
|
|
00db10 |
+#include <math_ldbl_opt.h>
|
|
|
00db10 |
+#include <shlib-compat.h>
|
|
|
00db10 |
+#include "init-arch.h"
|
|
|
00db10 |
+
|
|
|
00db10 |
+extern __typeof (__finite) __finite_ppc64 attribute_hidden;
|
|
|
00db10 |
+extern __typeof (__finite) __finite_power7 attribute_hidden;
|
|
|
00db10 |
+
|
|
|
00db10 |
+libc_ifunc (__finite,
|
|
|
00db10 |
+ (hwcap & PPC_FEATURE_ARCH_2_06)
|
|
|
00db10 |
+ ? __finite_power7
|
|
|
00db10 |
+ : __finite_ppc64);
|
|
|
00db10 |
+
|
|
|
00db10 |
+weak_alias (__finite, finite)
|
|
|
00db10 |
+
|
|
|
00db10 |
+#ifdef NO_LONG_DOUBLE
|
|
|
00db10 |
+strong_alias (__finite, __finitel)
|
|
|
00db10 |
+weak_alias (__finite, finitel)
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
+
|
|
|
00db10 |
+#ifdef IS_IN_libm
|
|
|
00db10 |
+# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
|
|
|
00db10 |
+compat_symbol (libm, finite, finitel, GLIBC_2_0);
|
|
|
00db10 |
+# endif
|
|
|
00db10 |
+# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1)
|
|
|
00db10 |
+compat_symbol (libm, __finite, __finitel, GLIBC_2_1);
|
|
|
00db10 |
+# endif
|
|
|
00db10 |
+#else
|
|
|
00db10 |
+# if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
|
|
|
00db10 |
+compat_symbol (libc, __finite, __finitel, GLIBC_2_0);
|
|
|
00db10 |
+compat_symbol (libc, finite, finitel, GLIBC_2_0);
|
|
|
00db10 |
+# endif
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c
|
|
|
00db10 |
new file mode 100644
|
|
|
00db10 |
index 0000000..63dd003
|
|
|
00db10 |
--- /dev/null
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c
|
|
|
00db10 |
@@ -0,0 +1,32 @@
|
|
|
00db10 |
+/* finitef(). PowerPC64 default version.
|
|
|
00db10 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
00db10 |
+ Contributed by Luis Machado <luisgpm@br.ibm.com>.
|
|
|
00db10 |
+ This file is part of the GNU C Library.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
00db10 |
+ License as published by the Free Software Foundation; either
|
|
|
00db10 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Lesser General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
00db10 |
+ License along with the GNU C Library; if not, see
|
|
|
00db10 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <math.h>
|
|
|
00db10 |
+
|
|
|
00db10 |
+#undef weak_alias
|
|
|
00db10 |
+#define weak_alias(a, b)
|
|
|
00db10 |
+
|
|
|
00db10 |
+#define FINITEF __finitef_ppc64
|
|
|
00db10 |
+#ifdef SHARED
|
|
|
00db10 |
+# undef hidden_def
|
|
|
00db10 |
+# define hidden_def(a) \
|
|
|
00db10 |
+ __hidden_ver1 (__finitef_ppc64, __GI___finitef, __finitef_ppc64);
|
|
|
00db10 |
+#endif
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <sysdeps/ieee754/flt-32/s_finitef.c>
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c
|
|
|
00db10 |
new file mode 100644
|
|
|
00db10 |
index 0000000..a7243b5
|
|
|
00db10 |
--- /dev/null
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c
|
|
|
00db10 |
@@ -0,0 +1,32 @@
|
|
|
00db10 |
+/* Multiple versions of finitef.
|
|
|
00db10 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
00db10 |
+ This file is part of the GNU C Library.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
00db10 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
00db10 |
+ License as published by the Free Software Foundation; either
|
|
|
00db10 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
00db10 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
00db10 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
00db10 |
+ Lesser General Public License for more details.
|
|
|
00db10 |
+
|
|
|
00db10 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
00db10 |
+ License along with the GNU C Library; if not, see
|
|
|
00db10 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
00db10 |
+
|
|
|
00db10 |
+#include <math.h>
|
|
|
00db10 |
+#include <shlib-compat.h>
|
|
|
00db10 |
+#include "init-arch.h"
|
|
|
00db10 |
+
|
|
|
00db10 |
+extern __typeof (__finitef) __finitef_ppc64 attribute_hidden;
|
|
|
00db10 |
+/* The double-precision version also works for single-precision. */
|
|
|
00db10 |
+extern __typeof (__finitef) __finite_power7 attribute_hidden;
|
|
|
00db10 |
+
|
|
|
00db10 |
+libc_ifunc (__finitef,
|
|
|
00db10 |
+ (hwcap & PPC_FEATURE_ARCH_2_06)
|
|
|
00db10 |
+ ? __finite_power7
|
|
|
00db10 |
+ : __finitef_ppc64);
|
|
|
00db10 |
+
|
|
|
00db10 |
+weak_alias (__finitef, finitef)
|
|
|
00db10 |
--
|
|
|
00db10 |
1.8.3.1
|
|
|
00db10 |
|