|
 |
147e83 |
From b303432f970be8b430f7155fd40adcffb65390ef Mon Sep 17 00:00:00 2001
|
|
|
147e83 |
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Wed, 30 Jul 2014 11:31:40 -0500
|
|
|
147e83 |
Subject: [PATCH] PowerPC: multiarch llrint/lrint for PowerPC64
|
|
|
147e83 |
|
|
|
147e83 |
commit 5ccd5fc893ca027703d2d9747092ee25729223d9
|
|
|
147e83 |
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Fri Dec 13 15:33:54 2013 -0500
|
|
|
147e83 |
---
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile | 3 +-
|
|
|
147e83 |
.../powerpc64/fpu/multiarch/s_llrint-power6x.S | 31 ++++++++++++
|
|
|
147e83 |
.../powerpc64/fpu/multiarch/s_llrint-ppc64.S | 31 ++++++++++++
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c | 57 ++++++++++++++++++++++
|
|
|
147e83 |
sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c | 1 +
|
|
|
147e83 |
5 files changed, 122 insertions(+), 1 deletion(-)
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c
|
|
|
147e83 |
create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c
|
|
|
147e83 |
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
|
|
|
147e83 |
index 3af4ac3..10d0ac9 100644
|
|
|
147e83 |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
|
|
|
147e83 |
@@ -11,5 +11,6 @@ libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
|
|
|
147e83 |
s_floorf-ppc64 s_round-power5+ s_round-ppc64 \
|
|
|
147e83 |
s_roundf-power5+ s_roundf-ppc64 s_trunc-power5+ \
|
|
|
147e83 |
s_trunc-ppc64 s_truncf-power5+ s_truncf-ppc64 \
|
|
|
147e83 |
- s_copysign-power6 s_copysign-ppc64
|
|
|
147e83 |
+ s_copysign-power6 s_copysign-ppc64 s_llrint-power6x \
|
|
|
147e83 |
+ s_llrint-ppc64
|
|
|
147e83 |
endif
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..8cd39c6
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S
|
|
|
147e83 |
@@ -0,0 +1,31 @@
|
|
|
147e83 |
+/* Round double to long int. PowerPC64/POWER6X default version.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdep.h>
|
|
|
147e83 |
+#include <math_ldbl_opt.h>
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef weak_alias
|
|
|
147e83 |
+#define weak_alias(a,b)
|
|
|
147e83 |
+#undef strong_alias
|
|
|
147e83 |
+#define strong_alias(a,b)
|
|
|
147e83 |
+#undef compat_symbol
|
|
|
147e83 |
+#define compat_symbol(a,b,c,d)
|
|
|
147e83 |
+
|
|
|
147e83 |
+#define __llrint __llrint_power6x
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..754d28f
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S
|
|
|
147e83 |
@@ -0,0 +1,31 @@
|
|
|
147e83 |
+/* Round double to long int. PowerPC32 default version.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdep.h>
|
|
|
147e83 |
+#include <math_ldbl_opt.h>
|
|
|
147e83 |
+
|
|
|
147e83 |
+#undef weak_alias
|
|
|
147e83 |
+#define weak_alias(a,b)
|
|
|
147e83 |
+#undef strong_alias
|
|
|
147e83 |
+#define strong_alias(a,b)
|
|
|
147e83 |
+#undef compat_symbol
|
|
|
147e83 |
+#define compat_symbol(a,b,c,d)
|
|
|
147e83 |
+
|
|
|
147e83 |
+#define __llrint __llrint_ppc64
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <sysdeps/powerpc/powerpc64/fpu/s_llrint.S>
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..5818b53
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c
|
|
|
147e83 |
@@ -0,0 +1,57 @@
|
|
|
147e83 |
+/* Multiple versions of llrint.
|
|
|
147e83 |
+ Copyright (C) 2013-2014 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* Redefine lrint/__lrint so that the compiler won't complain about the type
|
|
|
147e83 |
+ mismatch with the IFUNC selector in strong_alias below. */
|
|
|
147e83 |
+#define lrint __hidden_lrint
|
|
|
147e83 |
+#define __lrint __hidden___lrint
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <math.h>
|
|
|
147e83 |
+#include <math_ldbl_opt.h>
|
|
|
147e83 |
+#undef lrint
|
|
|
147e83 |
+#undef __lrint
|
|
|
147e83 |
+#include <shlib-compat.h>
|
|
|
147e83 |
+#include "init-arch.h"
|
|
|
147e83 |
+
|
|
|
147e83 |
+extern __typeof (__llrint) __llrint_ppc64 attribute_hidden;
|
|
|
147e83 |
+extern __typeof (__llrint) __llrint_power6x attribute_hidden;
|
|
|
147e83 |
+
|
|
|
147e83 |
+libc_ifunc (__llrint,
|
|
|
147e83 |
+ (hwcap & PPC_FEATURE_POWER6_EXT)
|
|
|
147e83 |
+ ? __llrint_power6x
|
|
|
147e83 |
+ : __llrint_ppc64);
|
|
|
147e83 |
+
|
|
|
147e83 |
+weak_alias (__llrint, llrint)
|
|
|
147e83 |
+#ifdef NO_LONG_DOUBLE
|
|
|
147e83 |
+strong_alias (__llrint, __llrintl)
|
|
|
147e83 |
+weak_alias (__llrint, llrintl)
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
|
|
|
147e83 |
+compat_symbol (libm, __llrint, llrintl, GLIBC_2_1);
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+
|
|
|
147e83 |
+/* long has the same width as long long on PowerPC64. */
|
|
|
147e83 |
+strong_alias (__llrint, __lrint)
|
|
|
147e83 |
+weak_alias (__lrint, lrint)
|
|
|
147e83 |
+#ifdef NO_LONG_DOUBLE
|
|
|
147e83 |
+strong_alias (__lrint, __lrintl)
|
|
|
147e83 |
+weak_alias (__lrint, lrintl)
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
|
|
|
147e83 |
+compat_symbol (libm, __lrint, lrintl, GLIBC_2_1);
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c
|
|
|
147e83 |
new file mode 100644
|
|
|
147e83 |
index 0000000..d092862
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c
|
|
|
147e83 |
@@ -0,0 +1 @@
|
|
|
147e83 |
+ /* __lrint is in s_llrint.c */
|
|
|
147e83 |
--
|
|
|
147e83 |
1.8.3.1
|
|
|
147e83 |
|