00db10
From be1d5d1d239883daea876f39e804d87ca028fe2c Mon Sep 17 00:00:00 2001
00db10
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
00db10
Date: Wed, 30 Jul 2014 07:33:06 -0500
00db10
Subject: [PATCH] PowerPC: multiarch wcschr for PowerPC64
00db10
00db10
commit 16fd2ae37cce401aad580d3d6ffae825827231ae
00db10
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
00db10
Date:   Fri Dec 13 14:51:36 2013 -0500
00db10
00db10
Added the following files apart from original commit.
00db10
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c
00db10
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c
00db10
sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
00db10
sysdeps/powerpc/powerpc64/power6/wcschr.c
00db10
sysdeps/powerpc/power6/wcschr.c
00db10
---
00db10
 sysdeps/powerpc/power6/wcschr.c                    | 89 ++++++++++++++++++++++
00db10
 .../powerpc32/power4/multiarch/wcschr-power6.c     | 26 +++++++
00db10
 .../powerpc32/power4/multiarch/wcschr-power7.c     | 26 +++++++
00db10
 .../powerpc32/power4/multiarch/wcschr-ppc32.c      | 31 ++++++++
00db10
 sysdeps/powerpc/powerpc64/multiarch/Makefile       |  5 +-
00db10
 .../powerpc/powerpc64/multiarch/ifunc-impl-list.c  | 11 +++
00db10
 .../powerpc/powerpc64/multiarch/wcschr-power6.c    | 19 +++++
00db10
 .../powerpc/powerpc64/multiarch/wcschr-power7.c    | 19 +++++
00db10
 sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c | 18 +++++
00db10
 sysdeps/powerpc/powerpc64/multiarch/wcschr.c       | 38 +++++++++
00db10
 sysdeps/powerpc/powerpc64/power6/wcschr.c          |  2 +-
00db10
 11 files changed, 282 insertions(+), 2 deletions(-)
00db10
 create mode 100644 sysdeps/powerpc/power6/wcschr.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c
00db10
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcschr.c
00db10
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/power6/wcschr.c glibc-2.17-c758a686/sysdeps/powerpc/power6/wcschr.c
00db10
new file mode 100644
00db10
index 0000000..7045677
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/power6/wcschr.c
00db10
@@ -0,0 +1,89 @@
00db10
+/* wcschr.c - Wide Character Search for POWER6+.
00db10
+   Copyright (C) 2012-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; see the file COPYING.LIB.  If
00db10
+   not, see <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <wchar.h>
00db10
+
00db10
+#ifndef WCSCHR
00db10
+# define WCSCHR wcschr
00db10
+#endif
00db10
+
00db10
+/* Find the first occurrence of WC in WCS.  */
00db10
+wchar_t *
00db10
+WCSCHR (const wchar_t *wcs, const wchar_t wc)
00db10
+{
00db10
+  const wchar_t *wcs2 = wcs + 1;
00db10
+
00db10
+  if (*wcs == wc)
00db10
+    return (wchar_t *) wcs;
00db10
+  if (*wcs == L'\0')
00db10
+    return NULL;
00db10
+
00db10
+  do
00db10
+    {
00db10
+      wcs += 2;
00db10
+
00db10
+      if (*wcs2 == wc)
00db10
+        return (wchar_t *) wcs2;
00db10
+      if (*wcs2 == L'\0')
00db10
+        return NULL;
00db10
+       wcs2 += 2;
00db10
+
00db10
+      if (*wcs == wc)
00db10
+        return (wchar_t *) wcs;
00db10
+      if (*wcs == L'\0')
00db10
+        return NULL;
00db10
+      wcs += 2;
00db10
+
00db10
+      if (*wcs2 == wc)
00db10
+        return (wchar_t *) wcs2;
00db10
+      if (*wcs2 == L'\0')
00db10
+        return NULL;
00db10
+      wcs2 += 2;
00db10
+
00db10
+      if (*wcs == wc)
00db10
+        return (wchar_t *) wcs;
00db10
+      if (*wcs == L'\0')
00db10
+        return NULL;
00db10
+      wcs += 2;
00db10
+
00db10
+      if (*wcs2 == wc)
00db10
+        return (wchar_t *) wcs2;
00db10
+      if (*wcs2 == L'\0')
00db10
+        return NULL;
00db10
+      wcs2 += 2;
00db10
+
00db10
+      if (*wcs == wc)
00db10
+        return (wchar_t *) wcs;
00db10
+      if (*wcs == L'\0')
00db10
+        return NULL;
00db10
+      wcs += 2;
00db10
+
00db10
+      if (*wcs2 == wc)
00db10
+        return (wchar_t *) wcs2;
00db10
+      if (*wcs2 == L'\0')
00db10
+        return NULL;
00db10
+      wcs2 += 2;
00db10
+
00db10
+      if (*wcs == wc)
00db10
+        return (wchar_t *) wcs;
00db10
+    }
00db10
+  while (*wcs != L'\0');
00db10
+
00db10
+  return NULL;
00db10
+}
00db10
+libc_hidden_def (wcschr)
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c
00db10
new file mode 100644
00db10
index 0000000..7c648d8
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c
00db10
@@ -0,0 +1,26 @@
00db10
+/* wcschr.c - Wide Character Search for powerpc32/power6.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; see the file COPYING.LIB.  If
00db10
+   not, see <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <wchar.h>
00db10
+
00db10
+#define WCSCHR __wcschr_power6
00db10
+
00db10
+#undef libc_hidden_def
00db10
+#define libc_hidden_def(name)
00db10
+
00db10
+#include <sysdeps/powerpc/power6/wcschr.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c
00db10
new file mode 100644
00db10
index 0000000..e561ced
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c
00db10
@@ -0,0 +1,26 @@
00db10
+/* wcschr.c - Wide Character Search for powerpc32/power7.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; see the file COPYING.LIB.  If
00db10
+   not, see <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <wchar.h>
00db10
+
00db10
+#define WCSCHR __wcschr_power7
00db10
+
00db10
+#undef libc_hidden_def
00db10
+#define libc_hidden_def(name)
00db10
+
00db10
+#include <sysdeps/powerpc/power6/wcschr.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
00db10
new file mode 100644
00db10
index 0000000..a42f70c
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
00db10
@@ -0,0 +1,31 @@
00db10
+/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <wchar.h>
00db10
+
00db10
+#ifndef NOT_IN_libc
00db10
+# ifdef SHARED
00db10
+#   undef libc_hidden_def
00db10
+#   define libc_hidden_def(name)  \
00db10
+    __hidden_ver1 (__wcschr_ppc, __GI_wcschr, __wcschr_ppc);
00db10
+# endif
00db10
+# define WCSCHR  __wcschr_ppc
00db10
+#endif
00db10
+
00db10
+extern __typeof (wcschr) __wcschr_ppc;
00db10
+
00db10
+#include <wcsmbs/wcschr.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
00db10
index 15b86bd..ff3b8cf 100644
00db10
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
00db10
@@ -9,8 +9,11 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
00db10
                   strnlen-ppc64 strcasecmp-power7 strcasecmp_l-power7 \
00db10
                   strncase-power7 strncase_l-power7 strncmp-power7 \
00db10
                   strncmp-power4 strncmp-ppc64 strchr-power7 strchr-ppc64 \
00db10
-                  strchrnul-power7 strchrnul-ppc64
00db10
+                  strchrnul-power7 strchrnul-ppc64 wcschr-power7 \
00db10
+                  wcschr-power6 wcschr-ppc64
00db10
 
00db10
 CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
00db10
 CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
00db10
+CFLAGS-wcschr-power7.c += -mcpu=power7
00db10
+CFLAGS-wcschr-power6.c += -mcpu=power6
00db10
 endif
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
00db10
index 9e3b89d..cc932c9 100644
00db10
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
00db10
@@ -191,5 +191,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
00db10
              IFUNC_IMPL_ADD (array, i, strncasecmp_l, 1,
00db10
                              __strncasecmp_l_ppc))
00db10
 
00db10
+  /* Support sysdeps/powerpc/powerpc64/multiarch/wcschr.c.  */
00db10
+  IFUNC_IMPL (i, name, wcschr,
00db10
+             IFUNC_IMPL_ADD (array, i, wcschr,
00db10
+                             hwcap & PPC_FEATURE_HAS_VSX,
00db10
+                             __wcschr_power7)
00db10
+             IFUNC_IMPL_ADD (array, i, wcschr,
00db10
+                             hwcap & PPC_FEATURE_ARCH_2_05,
00db10
+                             __wcschr_power6)
00db10
+             IFUNC_IMPL_ADD (array, i, wcschr, 1,
00db10
+                             __wcschr_ppc))
00db10
+
00db10
   return i;
00db10
 }
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c
00db10
new file mode 100644
00db10
index 0000000..21d965a
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c
00db10
@@ -0,0 +1,19 @@
00db10
+/* wcschr.c - Wide Character Search for powerpc64/power6.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; see the file COPYING.LIB.  If
00db10
+   not, see <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power6.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c
00db10
new file mode 100644
00db10
index 0000000..3407219
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c
00db10
@@ -0,0 +1,19 @@
00db10
+/* wcschr.c - Wide Character Search for powerpc64/power7.
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; see the file COPYING.LIB.  If
00db10
+   not, see <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-power7.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c
00db10
new file mode 100644
00db10
index 0000000..3f1f368
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c
00db10
@@ -0,0 +1,18 @@
00db10
+/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c>
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr.c
00db10
new file mode 100644
00db10
index 0000000..216d2bc
00db10
--- /dev/null
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcschr.c
00db10
@@ -0,0 +1,38 @@
00db10
+/* Multiple versions of wcschr
00db10
+   Copyright (C) 2013-2014 Free Software Foundation, Inc.
00db10
+   This file is part of the GNU C Library.
00db10
+
00db10
+   The GNU C Library is free software; you can redistribute it and/or
00db10
+   modify it under the terms of the GNU Lesser General Public
00db10
+   License as published by the Free Software Foundation; either
00db10
+   version 2.1 of the License, or (at your option) any later version.
00db10
+
00db10
+   The GNU C Library is distributed in the hope that it will be useful,
00db10
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
00db10
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
00db10
+   Lesser General Public License for more details.
00db10
+
00db10
+   You should have received a copy of the GNU Lesser General Public
00db10
+   License along with the GNU C Library; if not, see
00db10
+   <http://www.gnu.org/licenses/>.  */
00db10
+
00db10
+#ifndef NOT_IN_libc
00db10
+# include <wchar.h>
00db10
+# include <shlib-compat.h>
00db10
+# include "init-arch.h"
00db10
+
00db10
+extern __typeof (wcschr) __wcschr_ppc attribute_hidden;
00db10
+extern __typeof (wcschr) __wcschr_power6 attribute_hidden;
00db10
+extern __typeof (wcschr) __wcschr_power7 attribute_hidden;
00db10
+
00db10
+libc_ifunc (wcschr,
00db10
+	     (hwcap & PPC_FEATURE_HAS_VSX)
00db10
+             ? __wcschr_power7 :
00db10
+	       (hwcap & PPC_FEATURE_ARCH_2_05)
00db10
+	       ? __wcschr_power6
00db10
+             : __wcschr_ppc);
00db10
+#else
00db10
+#undef libc_hidden_def
00db10
+#define libc_hidden_def(a)
00db10
+#include <wcsmbs/wcschr.c>
00db10
+#endif
00db10
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcschr.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcschr.c
00db10
index 9136c02..ae04a13 100644
00db10
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcschr.c
00db10
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcschr.c
00db10
@@ -1 +1 @@
00db10
-#include "../../powerpc32/power6/wcschr.c"
00db10
+#include <sysdeps/powerpc/power6/wcschr.c>
00db10
-- 
00db10
1.8.3.1
00db10