ce426f
From 02a611b03a24e6b67e3f683d05ea374443c7523d Mon Sep 17 00:00:00 2001
ce426f
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
ce426f
Date: Wed, 30 Jul 2014 10:49:57 -0500
ce426f
Subject: [PATCH] PowerPC: multiarch floor/floorf for PowerPC64
ce426f
ce426f
commit 357fd3b40a59df16191df23439411c1342cc1ba5
ce426f
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
ce426f
Date:   Fri Dec 13 15:04:04 2013 -0500
ce426f
---
ce426f
 sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile   |  4 ++-
ce426f
 .../powerpc64/fpu/multiarch/s_floor-power5+.S      | 31 +++++++++++++++++
ce426f
 .../powerpc64/fpu/multiarch/s_floor-ppc64.S        | 31 +++++++++++++++++
ce426f
 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c  | 40 ++++++++++++++++++++++
ce426f
 .../powerpc64/fpu/multiarch/s_floorf-power5+.S     | 26 ++++++++++++++
ce426f
 .../powerpc64/fpu/multiarch/s_floorf-ppc64.S       | 27 +++++++++++++++
ce426f
 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c | 32 +++++++++++++++++
ce426f
 7 files changed, 190 insertions(+), 1 deletion(-)
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c
ce426f
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
ce426f
index 9eb69af..d3d230d 100644
ce426f
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
ce426f
@@ -5,5 +5,7 @@ sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
ce426f
 libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
ce426f
                        s_isnan-power5 s_isnan-ppc64 s_llround-power6x \
ce426f
                        s_llround-power5+ s_llround-ppc64 s_ceil-power5+ \
ce426f
-                       s_ceil-ppc64 s_ceilf-power5+ s_ceilf-ppc64
ce426f
+                       s_ceil-ppc64 s_ceilf-power5+ s_ceilf-ppc64 \
ce426f
+                       s_floor-power5+ s_floor-ppc64 s_floorf-power5+ \
ce426f
+                       s_floorf-ppc64
ce426f
 endif
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
ce426f
new file mode 100644
ce426f
index 0000000..a1550e9
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S
ce426f
@@ -0,0 +1,31 @@
ce426f
+/* floor function.  PowerPC64/power5+ version.
ce426f
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
ce426f
+   This file is part of the GNU C Library.
ce426f
+
ce426f
+   The GNU C Library is free software; you can redistribute it and/or
ce426f
+   modify it under the terms of the GNU Lesser General Public
ce426f
+   License as published by the Free Software Foundation; either
ce426f
+   version 2.1 of the License, or (at your option) any later version.
ce426f
+
ce426f
+   The GNU C Library is distributed in the hope that it will be useful,
ce426f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ce426f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
ce426f
+   Lesser General Public License for more details.
ce426f
+
ce426f
+   You should have received a copy of the GNU Lesser General Public
ce426f
+   License along with the GNU C Library; if not, see
ce426f
+   <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <sysdep.h>
ce426f
+#include <math_ldbl_opt.h>
ce426f
+
ce426f
+#undef weak_alias
ce426f
+#define weak_alias(a,b)
ce426f
+#undef strong_alias
ce426f
+#define strong_alias(a,b)
ce426f
+#undef compat_symbol
ce426f
+#define compat_symbol(a,b,c,d)
ce426f
+
ce426f
+#define __floor __floor_power5plus
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
ce426f
new file mode 100644
ce426f
index 0000000..b5c232c
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S
ce426f
@@ -0,0 +1,31 @@
ce426f
+/* floor function.  PowerPC64 default version.
ce426f
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
ce426f
+   This file is part of the GNU C Library.
ce426f
+
ce426f
+   The GNU C Library is free software; you can redistribute it and/or
ce426f
+   modify it under the terms of the GNU Lesser General Public
ce426f
+   License as published by the Free Software Foundation; either
ce426f
+   version 2.1 of the License, or (at your option) any later version.
ce426f
+
ce426f
+   The GNU C Library is distributed in the hope that it will be useful,
ce426f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ce426f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
ce426f
+   Lesser General Public License for more details.
ce426f
+
ce426f
+   You should have received a copy of the GNU Lesser General Public
ce426f
+   License along with the GNU C Library; if not, see
ce426f
+   <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <sysdep.h>
ce426f
+#include <math_ldbl_opt.h>
ce426f
+
ce426f
+#undef weak_alias
ce426f
+#define weak_alias(a,b)
ce426f
+#undef strong_alias
ce426f
+#define strong_alias(a,b)
ce426f
+#undef compat_symbol
ce426f
+#define compat_symbol(a,b,c,d)
ce426f
+
ce426f
+#define __floor __floor_ppc64
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc64/fpu/s_floor.S>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c
ce426f
new file mode 100644
ce426f
index 0000000..f43976a
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c
ce426f
@@ -0,0 +1,40 @@
ce426f
+/* Multiple versions of floor.
ce426f
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
ce426f
+   This file is part of the GNU C Library.
ce426f
+
ce426f
+   The GNU C Library is free software; you can redistribute it and/or
ce426f
+   modify it under the terms of the GNU Lesser General Public
ce426f
+   License as published by the Free Software Foundation; either
ce426f
+   version 2.1 of the License, or (at your option) any later version.
ce426f
+
ce426f
+   The GNU C Library is distributed in the hope that it will be useful,
ce426f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ce426f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
ce426f
+   Lesser General Public License for more details.
ce426f
+
ce426f
+   You should have received a copy of the GNU Lesser General Public
ce426f
+   License along with the GNU C Library; if not, see
ce426f
+   <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <math.h>
ce426f
+#include <math_ldbl_opt.h>
ce426f
+#include <shlib-compat.h>
ce426f
+#include "init-arch.h"
ce426f
+
ce426f
+extern __typeof (__floor) __floor_ppc64 attribute_hidden;
ce426f
+extern __typeof (__floor) __floor_power5plus attribute_hidden;
ce426f
+
ce426f
+libc_ifunc (__floor,
ce426f
+	    (hwcap & PPC_FEATURE_POWER5_PLUS)
ce426f
+	    ? __floor_power5plus
ce426f
+            : __floor_ppc64);
ce426f
+
ce426f
+weak_alias (__floor, floor)
ce426f
+
ce426f
+#ifdef NO_LONG_DOUBLE
ce426f
+strong_alias (__floor, __floorl)
ce426f
+weak_alias (__floor, floorl)
ce426f
+#endif
ce426f
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
ce426f
+compat_symbol (libm, __floor, floorl, GLIBC_2_0);
ce426f
+#endif
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
ce426f
new file mode 100644
ce426f
index 0000000..d371708
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S
ce426f
@@ -0,0 +1,26 @@
ce426f
+/* floorf function.  PowerPC64/power5+ version.
ce426f
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
ce426f
+   This file is part of the GNU C Library.
ce426f
+
ce426f
+   The GNU C Library is free software; you can redistribute it and/or
ce426f
+   modify it under the terms of the GNU Lesser General Public
ce426f
+   License as published by the Free Software Foundation; either
ce426f
+   version 2.1 of the License, or (at your option) any later version.
ce426f
+
ce426f
+   The GNU C Library is distributed in the hope that it will be useful,
ce426f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ce426f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
ce426f
+   Lesser General Public License for more details.
ce426f
+
ce426f
+   You should have received a copy of the GNU Lesser General Public
ce426f
+   License along with the GNU C Library; if not, see
ce426f
+   <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <sysdep.h>
ce426f
+
ce426f
+#undef weak_alias
ce426f
+#define weak_alias(a,b)
ce426f
+
ce426f
+#define __floorf __floorf_power5plus
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
ce426f
new file mode 100644
ce426f
index 0000000..dc81dea
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S
ce426f
@@ -0,0 +1,27 @@
ce426f
+/* floorf function.  PowerPC64 default version.
ce426f
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
ce426f
+   This file is part of the GNU C Library.
ce426f
+
ce426f
+   The GNU C Library is free software; you can redistribute it and/or
ce426f
+   modify it under the terms of the GNU Lesser General Public
ce426f
+   License as published by the Free Software Foundation; either
ce426f
+   version 2.1 of the License, or (at your option) any later version.
ce426f
+
ce426f
+   The GNU C Library is distributed in the hope that it will be useful,
ce426f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ce426f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
ce426f
+   Lesser General Public License for more details.
ce426f
+
ce426f
+   You should have received a copy of the GNU Lesser General Public
ce426f
+   License along with the GNU C Library; if not, see
ce426f
+   <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <sysdep.h>
ce426f
+#include <math_ldbl_opt.h>
ce426f
+
ce426f
+#undef weak_alias
ce426f
+#define weak_alias(a,b)
ce426f
+
ce426f
+#define __floorf __floorf_ppc64
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc64/fpu/s_floorf.S>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c
ce426f
new file mode 100644
ce426f
index 0000000..08fc95e
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c
ce426f
@@ -0,0 +1,32 @@
ce426f
+/* Multiple versions of floorf.
ce426f
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
ce426f
+   This file is part of the GNU C Library.
ce426f
+
ce426f
+   The GNU C Library is free software; you can redistribute it and/or
ce426f
+   modify it under the terms of the GNU Lesser General Public
ce426f
+   License as published by the Free Software Foundation; either
ce426f
+   version 2.1 of the License, or (at your option) any later version.
ce426f
+
ce426f
+   The GNU C Library is distributed in the hope that it will be useful,
ce426f
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ce426f
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
ce426f
+   Lesser General Public License for more details.
ce426f
+
ce426f
+   You should have received a copy of the GNU Lesser General Public
ce426f
+   License along with the GNU C Library; if not, see
ce426f
+   <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <math.h>
ce426f
+#include <math_ldbl_opt.h>
ce426f
+#include <shlib-compat.h>
ce426f
+#include "init-arch.h"
ce426f
+
ce426f
+extern __typeof (__floorf) __floorf_ppc64 attribute_hidden;
ce426f
+extern __typeof (__floorf) __floorf_power5plus attribute_hidden;
ce426f
+
ce426f
+libc_ifunc (__floorf,
ce426f
+	    (hwcap & PPC_FEATURE_POWER5_PLUS)
ce426f
+	    ? __floorf_power5plus
ce426f
+            : __floorf_ppc64);
ce426f
+
ce426f
+weak_alias (__floorf, floorf)
ce426f
-- 
ce426f
1.8.3.1
ce426f