5de29b
From 925c1856c2c73401df1bed739f2f3e89b62bee89 Mon Sep 17 00:00:00 2001
5de29b
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
5de29b
Date: Wed, 30 Jul 2014 10:45:21 -0500
5de29b
Subject: [PATCH] PowerPC: multiarch llround/lround for PowerPC64
5de29b
5de29b
commit c3627f6e965834c7998184a55653ca016b1ff663
5de29b
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
5de29b
Date:   Fri Dec 13 15:01:54 2013 -0500
5de29b
---
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile   |  3 +-
5de29b
 .../powerpc64/fpu/multiarch/s_llround-power5+.S    | 32 ++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/s_llround-power6x.S    | 32 ++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/s_llround-ppc64.S      | 28 ++++++++++
5de29b
 .../powerpc/powerpc64/fpu/multiarch/s_llround.c    | 60 ++++++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c |  1 +
5de29b
 6 files changed, 155 insertions(+), 1 deletion(-)
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c
5de29b
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
5de29b
index b57ddc9..a4636b0 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
5de29b
@@ -3,5 +3,6 @@ sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
5de29b
                   s_isnan-power5 s_isnan-ppc64
5de29b
 
5de29b
 libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
5de29b
-                       s_isnan-power5 s_isnan-ppc64
5de29b
+                       s_isnan-power5 s_isnan-ppc64 s_llround-power6x \
5de29b
+                       s_llround-power5+ s_llround-ppc64
5de29b
 endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
5de29b
new file mode 100644
5de29b
index 0000000..ba0b65c
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S
5de29b
@@ -0,0 +1,32 @@
5de29b
+/* llround().  PowerPC64 default version.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#include <sysdep.h>
5de29b
+#include <math_ldbl_opt.h>
5de29b
+
5de29b
+#undef weak_alias
5de29b
+#define weak_alias(name, alias)
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(name, alias)
5de29b
+#undef compat_symbol
5de29b
+#define compat_symbol(a,b,c,d)
5de29b
+
5de29b
+#define __llround __llround_power5plus
5de29b
+#define __lround __lround_power5plus
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
5de29b
new file mode 100644
5de29b
index 0000000..bd1c22a
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S
5de29b
@@ -0,0 +1,32 @@
5de29b
+/* llround().  PowerPC64 default version.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#include <sysdep.h>
5de29b
+#include <math_ldbl_opt.h>
5de29b
+
5de29b
+#undef weak_alias
5de29b
+#define weak_alias(name, alias)
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(name, alias)
5de29b
+#undef compat_symbol
5de29b
+#define compat_symbol(lib, name, alias, ver)
5de29b
+
5de29b
+#define __llround __llround_power6x
5de29b
+#define __lround __lround_power6x
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
5de29b
new file mode 100644
5de29b
index 0000000..2316da2
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S
5de29b
@@ -0,0 +1,28 @@
5de29b
+/* llround().  PowerPC64 default version.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#include <sysdep.h>
5de29b
+#include <math_ldbl_opt.h>
5de29b
+
5de29b
+#undef compat_symbol
5de29b
+#define compat_symbol(a,b,c,d)
5de29b
+
5de29b
+#define __llround __llround_ppc64
5de29b
+#define __lround __lround_ppc64
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/fpu/s_llround.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c
5de29b
new file mode 100644
5de29b
index 0000000..a4d1bf3
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c
5de29b
@@ -0,0 +1,60 @@
5de29b
+/* Multiple versions of llround.
5de29b
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
5de29b
+   This file is part of the GNU C Library.
5de29b
+
5de29b
+   The GNU C Library is free software; you can redistribute it and/or
5de29b
+   modify it under the terms of the GNU Lesser General Public
5de29b
+   License as published by the Free Software Foundation; either
5de29b
+   version 2.1 of the License, or (at your option) any later version.
5de29b
+
5de29b
+   The GNU C Library is distributed in the hope that it will be useful,
5de29b
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
5de29b
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
5de29b
+   Lesser General Public License for more details.
5de29b
+
5de29b
+   You should have received a copy of the GNU Lesser General Public
5de29b
+   License along with the GNU C Library; if not, see
5de29b
+   <http://www.gnu.org/licenses/>.  */
5de29b
+
5de29b
+#define lround __hidden_lround
5de29b
+#define __lround __hidden___lround
5de29b
+
5de29b
+#include <math.h>
5de29b
+#include <math_ldbl_opt.h>
5de29b
+#include <shlib-compat.h>
5de29b
+#include "init-arch.h"
5de29b
+
5de29b
+extern __typeof (__llround) __llround_ppc64 attribute_hidden;
5de29b
+extern __typeof (__llround) __llround_power5plus attribute_hidden;
5de29b
+extern __typeof (__llround) __llround_power6x attribute_hidden;
5de29b
+
5de29b
+libc_ifunc (__llround,
5de29b
+	    (hwcap & PPC_FEATURE_POWER6_EXT)
5de29b
+	    ? __llround_power6x :
5de29b
+	      (hwcap & PPC_FEATURE_POWER5_PLUS)
5de29b
+	      ? __llround_power5plus
5de29b
+            : __llround_ppc64);
5de29b
+
5de29b
+weak_alias (__llround, llround)
5de29b
+
5de29b
+#ifdef NO_LONG_DOUBLE
5de29b
+weak_alias (__llround, llroundl)
5de29b
+strong_alias (__llround, __llroundl)
5de29b
+#endif
5de29b
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
5de29b
+compat_symbol (libm, __llround, llroundl, GLIBC_2_1);
5de29b
+compat_symbol (libm, llround, lroundl, GLIBC_2_1);
5de29b
+#endif
5de29b
+
5de29b
+/* long has the same width as long long on PPC64.  */
5de29b
+#undef lround
5de29b
+#undef __lround
5de29b
+strong_alias (__llround, __lround)
5de29b
+weak_alias (__llround, lround)
5de29b
+#ifdef NO_LONG_DOUBLE
5de29b
+strong_alias (__llround, __llroundl)
5de29b
+weak_alias (__llround, llroundl)
5de29b
+#endif
5de29b
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
5de29b
+compat_symbol (libm, __lround, lroundl, GLIBC_2_1);
5de29b
+#endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c
5de29b
new file mode 100644
5de29b
index 0000000..0dab544
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c
5de29b
@@ -0,0 +1 @@
5de29b
+/* __lround is in s_llround.c  */
5de29b
-- 
5de29b
1.8.3.1
5de29b