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