5de29b
From defecce61df9fb5579cefdc26201d2be12b8c72a Mon Sep 17 00:00:00 2001
5de29b
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
5de29b
Date: Wed, 30 Jul 2014 11:20:40 -0500
5de29b
Subject: [PATCH] PowerPC: multiarch round/roundf for PowerPC64
5de29b
5de29b
commit 59a3e194f75c4845b15caa1ae16b0264f9c7cf0c
5de29b
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
5de29b
Date:   Fri Dec 13 15:06:01 2013 -0500
5de29b
---
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile   |  3 +-
5de29b
 .../powerpc64/fpu/multiarch/s_round-power5+.S      | 31 +++++++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/s_round-ppc64.S        | 31 +++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c  | 40 ++++++++++++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/s_roundf-power5+.S     | 26 ++++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/s_roundf-ppc64.S       | 26 ++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c | 32 +++++++++++++++++
5de29b
 7 files changed, 188 insertions(+), 1 deletion(-)
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.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 d3d230d..303cd0f 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
5de29b
@@ -7,5 +7,6 @@ libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
5de29b
                        s_llround-power5+ s_llround-ppc64 s_ceil-power5+ \
5de29b
                        s_ceil-ppc64 s_ceilf-power5+ s_ceilf-ppc64 \
5de29b
                        s_floor-power5+ s_floor-ppc64 s_floorf-power5+ \
5de29b
-                       s_floorf-ppc64
5de29b
+                       s_floorf-ppc64 s_round-power5+ s_round-ppc64 \
5de29b
+                       s_roundf-power5+ s_roundf-ppc64
5de29b
 endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
5de29b
new file mode 100644
5de29b
index 0000000..c2afb4f
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S
5de29b
@@ -0,0 +1,31 @@
5de29b
+/* round function.  PowerPC64/power5+ 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(a,b)
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(a,b)
5de29b
+#undef compat_symbol
5de29b
+#define compat_symbol(a,b,c,d)
5de29b
+
5de29b
+#define __round __round_power5plus
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
5de29b
new file mode 100644
5de29b
index 0000000..76c96b6
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S
5de29b
@@ -0,0 +1,31 @@
5de29b
+/* round function.  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(a,b)
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(a,b)
5de29b
+#undef compat_symbol
5de29b
+#define compat_symbol(a,b,c,d)
5de29b
+
5de29b
+#define __round __round_ppc64
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/fpu/s_round.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c
5de29b
new file mode 100644
5de29b
index 0000000..5818411
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c
5de29b
@@ -0,0 +1,40 @@
5de29b
+/* Multiple versions of round.
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 <math.h>
5de29b
+#include <math_ldbl_opt.h>
5de29b
+#include <shlib-compat.h>
5de29b
+#include "init-arch.h"
5de29b
+
5de29b
+extern __typeof (__round) __round_ppc64 attribute_hidden;
5de29b
+extern __typeof (__round) __round_power5plus attribute_hidden;
5de29b
+
5de29b
+libc_ifunc (__round,
5de29b
+	    (hwcap & PPC_FEATURE_POWER5_PLUS)
5de29b
+	    ? __round_power5plus
5de29b
+            : __round_ppc64);
5de29b
+
5de29b
+weak_alias (__round, round)
5de29b
+
5de29b
+#ifdef NO_LONG_DOUBLE
5de29b
+strong_alias (__round, __roundl)
5de29b
+weak_alias (__round, roundl)
5de29b
+#endif
5de29b
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
5de29b
+compat_symbol (libm, __round, roundl, GLIBC_2_0);
5de29b
+#endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
5de29b
new file mode 100644
5de29b
index 0000000..8fbef39
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* roundf function.  PowerPC64/power5+ 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
+
5de29b
+#undef weak_alias
5de29b
+#define weak_alias(a,b)
5de29b
+
5de29b
+#define __roundf __roundf_power5plus
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
5de29b
new file mode 100644
5de29b
index 0000000..bc51fdd
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* roundf function.  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
+
5de29b
+#undef weak_alias
5de29b
+#define weak_alias(a,b)
5de29b
+
5de29b
+#define __roundf __roundf_ppc64
5de29b
+
5de29b
+#include <sysdeps/powerpc/powerpc64/fpu/s_roundf.S>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c
5de29b
new file mode 100644
5de29b
index 0000000..34c5bc7
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c
5de29b
@@ -0,0 +1,32 @@
5de29b
+/* Multiple versions of roundf.
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 <math.h>
5de29b
+#include <math_ldbl_opt.h>
5de29b
+#include <shlib-compat.h>
5de29b
+#include "init-arch.h"
5de29b
+
5de29b
+extern __typeof (__roundf) __roundf_ppc64 attribute_hidden;
5de29b
+extern __typeof (__roundf) __roundf_power5plus attribute_hidden;
5de29b
+
5de29b
+libc_ifunc (__roundf,
5de29b
+	    (hwcap & PPC_FEATURE_POWER5_PLUS)
5de29b
+	    ? __roundf_power5plus
5de29b
+            : __roundf_ppc64);
5de29b
+
5de29b
+weak_alias (__roundf, roundf)
5de29b
-- 
5de29b
1.8.3.1
5de29b