5de29b
From b5910d4c4976f9e1eb6c96d45dc2b7c04f5f3039 Mon Sep 17 00:00:00 2001
5de29b
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
5de29b
Date: Wed, 30 Jul 2014 12:11:18 -0500
5de29b
Subject: [PATCH] PowerPC: multiarch hypot/hypotf for PowerPC64
5de29b
5de29b
commit 42fcb46ce6dae3a9a55176b4c82e5f07a41ca536
5de29b
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
5de29b
Date:   Fri Dec 13 15:38:01 2013 -0500
5de29b
5de29b
Added the following files apart from the original commit.
5de29b
sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot-power7.c
5de29b
sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf-power7.c
5de29b
---
5de29b
 .../power4/fpu/multiarch/e_hypot-power7.c          | 26 ++++++++++++++++++
5de29b
 .../power4/fpu/multiarch/e_hypotf-power7.c         | 26 ++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile   |  5 +++-
5de29b
 .../powerpc64/fpu/multiarch/e_hypot-power7.c       | 19 +++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/e_hypot-ppc64.c        | 26 ++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c  | 32 ++++++++++++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/e_hypotf-power7.c      | 19 +++++++++++++
5de29b
 .../powerpc64/fpu/multiarch/e_hypotf-ppc64.c       | 26 ++++++++++++++++++
5de29b
 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c | 32 ++++++++++++++++++++++
5de29b
 9 files changed, 210 insertions(+), 1 deletion(-)
5de29b
 create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot-power7.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf-power7.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c
5de29b
 create mode 100644 sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c
5de29b
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot-power7.c
5de29b
new file mode 100644
5de29b
index 0000000..967b923
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot-power7.c
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* __ieee_hypot() POWER7 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 <math.h>
5de29b
+
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(a, b)
5de29b
+
5de29b
+#define __ieee754_hypot __ieee754_hypot_power7
5de29b
+
5de29b
+#include <sysdeps/powerpc/fpu/e_hypot.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf-power7.c
5de29b
new file mode 100644
5de29b
index 0000000..d1da9f2
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf-power7.c
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* __ieee754_hypot POWER7 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 <math.h>
5de29b
+
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(a, b)
5de29b
+
5de29b
+#define __ieee754_hypotf __ieee754_hypotf_power7
5de29b
+
5de29b
+#include <sysdeps/powerpc/fpu/e_hypotf.c>
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 e152bf5..1e04f21 100644
12745e
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile
5de29b
@@ -20,11 +20,14 @@ libm-sysdep_routines += s_isnan-power7 s_isnan-power6x s_isnan-power6 \
5de29b
                        s_isinf-ppc64 s_logb-power7 s_logbf-power7 \
5de29b
                        s_logbl-power7 s_logb-ppc64 s_logbf-ppc64 \
5de29b
                        s_logbl-ppc64 s_modf-power5+ s_modf-ppc64 \
5de29b
-                       s_modff-power5+ s_modff-ppc64
5de29b
+                       s_modff-power5+ s_modff-ppc64 e_hypot-ppc64 \
5de29b
+                       e_hypot-power7 e_hypotf-ppc64 e_hypotf-power7
5de29b
 
5de29b
 CFLAGS-s_logbf-power7.c = -mcpu=power7
5de29b
 CFLAGS-s_logbl-power7.c = -mcpu=power7
5de29b
 CFLAGS-s_logb-power7.c = -mcpu=power7
5de29b
 CFLAGS-s_modf-power5+.c = -mcpu=power5+
5de29b
 CFLAGS-s_modff-power5+.c = -mcpu=power5+
5de29b
+CFLAGS-e_hypot-power7.c = -mcpu=power7
5de29b
+CFLAGS-e_hypotf-power7.c = -mcpu=power7
5de29b
 endif
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c
5de29b
new file mode 100644
5de29b
index 0000000..b153753
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c
5de29b
@@ -0,0 +1,19 @@
5de29b
+/* __ieee_hypot() POWER7 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 <sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypot-power7.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c
5de29b
new file mode 100644
5de29b
index 0000000..c418ae7
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* __ieee_hypot() PowerPC64 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 <math.h>
5de29b
+
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(a, b)
5de29b
+
5de29b
+#define __ieee754_hypot __ieee754_hypot_ppc64
5de29b
+
5de29b
+#include <sysdeps/powerpc/fpu/e_hypot.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c
5de29b
new file mode 100644
5de29b
index 0000000..941b293
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c
5de29b
@@ -0,0 +1,32 @@
5de29b
+/* Multiple versions of ieee754_hypot.
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 (__ieee754_hypot) __ieee754_hypot_ppc64 attribute_hidden;
5de29b
+extern __typeof (__ieee754_hypot) __ieee754_hypot_power7 attribute_hidden;
5de29b
+
5de29b
+libc_ifunc (__ieee754_hypot,
5de29b
+	    (hwcap & PPC_FEATURE_ARCH_2_06)
5de29b
+	    ? __ieee754_hypot_power7
5de29b
+            : __ieee754_hypot_ppc64);
5de29b
+
5de29b
+strong_alias (__ieee754_hypot, __hypot_finite)
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c
5de29b
new file mode 100644
5de29b
index 0000000..2d67ee9
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c
5de29b
@@ -0,0 +1,19 @@
5de29b
+/* __ieee_hypotf() POWER7 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 <sysdeps/powerpc/powerpc32/power4/fpu/multiarch/e_hypotf-power7.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c
5de29b
new file mode 100644
5de29b
index 0000000..8335e19
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c
5de29b
@@ -0,0 +1,26 @@
5de29b
+/* __ieee_hypot() PowerPC64 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 <math.h>
5de29b
+
5de29b
+#undef strong_alias
5de29b
+#define strong_alias(a, b)
5de29b
+
5de29b
+#define __ieee754_hypotf __ieee754_hypotf_ppc64
5de29b
+
5de29b
+#include <sysdeps/powerpc/fpu/e_hypotf.c>
12745e
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c
5de29b
new file mode 100644
5de29b
index 0000000..3c418d3
5de29b
--- /dev/null
12745e
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c
5de29b
@@ -0,0 +1,32 @@
5de29b
+/* Multiple versions of ieee754_hypot.
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 (__ieee754_hypotf) __ieee754_hypotf_ppc64 attribute_hidden;
5de29b
+extern __typeof (__ieee754_hypotf) __ieee754_hypotf_power7 attribute_hidden;
5de29b
+
5de29b
+libc_ifunc (__ieee754_hypotf,
5de29b
+	    (hwcap & PPC_FEATURE_ARCH_2_06)
5de29b
+	    ? __ieee754_hypotf_power7
5de29b
+            : __ieee754_hypotf_ppc64);
5de29b
+
5de29b
+strong_alias (__ieee754_hypotf, __hypotf_finite)
5de29b
-- 
5de29b
1.8.3.1
5de29b