ce426f
From 7560c8b2254c082f754f1e8fd390d4b50146dcdd Mon Sep 17 00:00:00 2001
ce426f
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
ce426f
Date: Wed, 30 Jul 2014 11:30:28 -0500
ce426f
Subject: [PATCH] PowerPC: multiarch copysign/copysignf for PowerPC64
ce426f
ce426f
commit 2568f3fa69bbf70d0bea457cb7cbbf3bee45bfe5
ce426f
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
ce426f
Date:   Fri Dec 13 15:32:58 2013 -0500
ce426f
---
ce426f
 sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile   |  6 ++-
ce426f
 .../powerpc64/fpu/multiarch/s_copysign-power6.S    | 33 ++++++++++++++
ce426f
 .../powerpc64/fpu/multiarch/s_copysign-ppc64.S     | 35 +++++++++++++++
ce426f
 .../powerpc/powerpc64/fpu/multiarch/s_copysign.c   | 51 ++++++++++++++++++++++
ce426f
 .../powerpc/powerpc64/fpu/multiarch/s_copysignf.c  | 32 ++++++++++++++
ce426f
 5 files changed, 155 insertions(+), 2 deletions(-)
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.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 4cdb383..3af4ac3 100644
ce426f
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
ce426f
@@ -1,6 +1,7 @@
ce426f
 ifeq ($(subdir),math)
ce426f
 sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
ce426f
-                  s_isnan-power5 s_isnan-ppc64
ce426f
+                  s_isnan-power5 s_isnan-ppc64 s_copysign-power6 \
ce426f
+                  s_copysign-ppc64
ce426f
 
ce426f
 libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
ce426f
                        s_isnan-power5 s_isnan-ppc64 s_llround-power6x \
ce426f
@@ -9,5 +10,6 @@ libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
ce426f
                        s_floor-power5+ s_floor-ppc64 s_floorf-power5+ \
ce426f
                        s_floorf-ppc64 s_round-power5+ s_round-ppc64 \
ce426f
                        s_roundf-power5+ s_roundf-ppc64 s_trunc-power5+ \
ce426f
-                       s_trunc-ppc64 s_truncf-power5+ s_truncf-ppc64
ce426f
+                       s_trunc-ppc64 s_truncf-power5+ s_truncf-ppc64 \
ce426f
+                       s_copysign-power6 s_copysign-ppc64
ce426f
 endif
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
ce426f
new file mode 100644
ce426f
index 0000000..4fa34a6
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S
ce426f
@@ -0,0 +1,33 @@
ce426f
+/* copysign().  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
+#undef hidden_def
ce426f
+#define hidden_def(name)
ce426f
+
ce426f
+#define __copysign __copysign_power6
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc64/fpu/s_copysign.S>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
ce426f
new file mode 100644
ce426f
index 0000000..a5cdfc2
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S
ce426f
@@ -0,0 +1,35 @@
ce426f
+/* copysign().  PowerPC64 default version.
ce426f
+   Copyright (C) 2010-2014 Free Software Foundation, Inc.
ce426f
+   Contributed by Luis Machado <luisgpm@br.ibm.com>.
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 __copysign __copysign_ppc64
ce426f
+#undef hidden_def
ce426f
+#define hidden_def(name)				\
ce426f
+  strong_alias (__copysign_ppc64, __GI___copysign)
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc64/fpu/s_copysign.S>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
ce426f
new file mode 100644
ce426f
index 0000000..f3e6b3a
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
ce426f
@@ -0,0 +1,51 @@
ce426f
+/* Multiple versions of copysign.
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
+/* Redefine copysign so that the compiler won't complain about the type
ce426f
+   mismatch with the IFUNC selector in strong_alias below.  */
ce426f
+#undef __copysign
ce426f
+#define __copysign __redirect_copysign
ce426f
+#include <math.h>
ce426f
+#include <math_ldbl_opt.h>
ce426f
+#undef __copysign
ce426f
+#include <shlib-compat.h>
ce426f
+#include "init-arch.h"
ce426f
+
ce426f
+extern __typeof (__redirect_copysign) __copysign_ppc64 attribute_hidden;
ce426f
+extern __typeof (__redirect_copysign) __copysign_power6 attribute_hidden;
ce426f
+
ce426f
+extern __typeof (__redirect_copysign) __libm_copysign;
ce426f
+libc_ifunc (__libm_copysign,
ce426f
+	    (hwcap & PPC_FEATURE_ARCH_2_05)
ce426f
+	    ? __copysign_power6
ce426f
+            : __copysign_ppc64);
ce426f
+
ce426f
+strong_alias (__libm_copysign, __copysign)
ce426f
+weak_alias (__copysign, copysign)
ce426f
+
ce426f
+#ifdef NO_LONG_DOUBLE
ce426f
+weak_alias (__copysign,copysignl)
ce426f
+strong_alias(__copysign,__copysignl)
ce426f
+#endif
ce426f
+#ifdef IS_IN_libm
ce426f
+# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
ce426f
+compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
ce426f
+# endif
ce426f
+#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
ce426f
+compat_symbol (libc, __copysign, copysignl, GLIBC_2_0);
ce426f
+#endif
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c
ce426f
new file mode 100644
ce426f
index 0000000..55cc272
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c
ce426f
@@ -0,0 +1,32 @@
ce426f
+/* Multiple versions of copysignf.
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 <shlib-compat.h>
ce426f
+#include "init-arch.h"
ce426f
+
ce426f
+/* It's safe to use double-precision implementation for single-precision. */
ce426f
+extern __typeof (__copysignf) __copysign_ppc64 attribute_hidden;
ce426f
+extern __typeof (__copysignf) __copysign_power6 attribute_hidden;
ce426f
+
ce426f
+libc_ifunc (__copysignf,
ce426f
+	    (hwcap & PPC_FEATURE_ARCH_2_05)
ce426f
+	    ? __copysign_power6
ce426f
+            : __copysign_ppc64);
ce426f
+
ce426f
+weak_alias (__copysignf, copysignf)
ce426f
-- 
ce426f
1.8.3.1
ce426f