olga / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-rh731837-17.patch

ce426f
From 21ee17d9e36c21d0c143287cc678a373893e94cc Mon Sep 17 00:00:00 2001
ce426f
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
ce426f
Date: Wed, 30 Jul 2014 07:45:17 -0500
ce426f
Subject: [PATCH] PowerPC: multiarch wcscpy for PowerPC64
ce426f
ce426f
commit 92cacfce7d40cb331009fdcd79d83b075a1a8785
ce426f
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
ce426f
Date:   Fri Dec 13 14:53:25 2013 -0500
ce426f
ce426f
Added the following files apart from original commit.   .
ce426f
sysdeps/powerpc/power6/wcscpy.c
ce426f
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c
ce426f
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c
ce426f
sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
ce426f
sysdeps/powerpc/powerpc64/power6/wcscpy.c
ce426f
wcsmbs/wcscpy.c
ce426f
---
ce426f
 sysdeps/powerpc/power6/wcscpy.c                    | 105 +++++++++++++++++++++
ce426f
 .../powerpc32/power4/multiarch/wcscpy-power6.c     |  22 +++++
ce426f
 .../powerpc32/power4/multiarch/wcscpy-power7.c     |  22 +++++
ce426f
 .../powerpc32/power4/multiarch/wcscpy-ppc32.c      |  26 +++++
ce426f
 sysdeps/powerpc/powerpc64/multiarch/Makefile       |   4 +-
ce426f
 .../powerpc/powerpc64/multiarch/ifunc-impl-list.c  |  11 +++
ce426f
 .../powerpc/powerpc64/multiarch/wcscpy-power6.c    |  19 ++++
ce426f
 .../powerpc/powerpc64/multiarch/wcscpy-power7.c    |  19 ++++
ce426f
 sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c |  18 ++++
ce426f
 sysdeps/powerpc/powerpc64/multiarch/wcscpy.c       |  36 +++++++
ce426f
 sysdeps/powerpc/powerpc64/power6/wcscpy.c          |   2 +-
ce426f
 wcsmbs/wcscpy.c                                    |   5 +-
ce426f
 12 files changed, 286 insertions(+), 3 deletions(-)
ce426f
 create mode 100644 sysdeps/powerpc/power6/wcscpy.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c
ce426f
 create mode 100644 sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
ce426f
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/power6/wcscpy.c glibc-2.17-c758a686/sysdeps/powerpc/power6/wcscpy.c
ce426f
new file mode 100644
ce426f
index 0000000..417ec72
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/power6/wcscpy.c
ce426f
@@ -0,0 +1,105 @@
ce426f
+/* wcscpy.c - Wide Character Copy for POWER6+.
ce426f
+   Copyright (C) 2012-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; see the file COPYING.LIB.  If
ce426f
+   not, see <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <stddef.h>
ce426f
+#include <wchar.h>
ce426f
+
ce426f
+#ifndef WCSCPY
ce426f
+# define WCSCPY wcscpy
ce426f
+#endif
ce426f
+
ce426f
+/* Copy SRC to DEST.  */
ce426f
+wchar_t *
ce426f
+WCSCPY (wchar_t *dest, const wchar_t *src)
ce426f
+{
ce426f
+  wint_t c,d;
ce426f
+  wchar_t *wcp, *wcp2;
ce426f
+
ce426f
+  if (__alignof__ (wchar_t) >= sizeof (wchar_t))
ce426f
+    {
ce426f
+      const ptrdiff_t off = dest - src;
ce426f
+
ce426f
+      wcp = (wchar_t *) src;
ce426f
+      wcp2 = wcp + 1 ;
ce426f
+
ce426f
+      do
ce426f
+        {
ce426f
+          d = *wcp;
ce426f
+          wcp[off] = d;
ce426f
+          if (d == L'\0')
ce426f
+            return dest;
ce426f
+          wcp += 2;
ce426f
+
ce426f
+          c = *wcp2;
ce426f
+          wcp2[off] = c;
ce426f
+          if (c == L'\0')
ce426f
+            return dest;
ce426f
+          wcp2 += 2;
ce426f
+
ce426f
+          d = *wcp;
ce426f
+          wcp[off] = d;
ce426f
+          if (d == L'\0')
ce426f
+            return dest;
ce426f
+          wcp += 2;
ce426f
+
ce426f
+          c = *wcp2;
ce426f
+          wcp2[off] = c;
ce426f
+          if (c == L'\0')
ce426f
+            return dest;
ce426f
+          wcp2 += 2;
ce426f
+
ce426f
+          d = *wcp;
ce426f
+          wcp[off] = d;
ce426f
+          if (d == L'\0')
ce426f
+            return dest;
ce426f
+          wcp += 2;
ce426f
+
ce426f
+          c = *wcp2;
ce426f
+          wcp2[off] = c;
ce426f
+          if (c == L'\0')
ce426f
+            return dest;
ce426f
+          wcp2 += 2;
ce426f
+
ce426f
+          d = *wcp;
ce426f
+          wcp[off] = d;
ce426f
+          if (d == L'\0')
ce426f
+            return dest;
ce426f
+          wcp += 2;
ce426f
+
ce426f
+          c = *wcp2;
ce426f
+          wcp2[off] = c;
ce426f
+          if (c == L'\0')
ce426f
+            return dest;
ce426f
+          wcp2 += 2;
ce426f
+        }
ce426f
+      while (c != L'\0');
ce426f
+
ce426f
+    }
ce426f
+  else
ce426f
+    {
ce426f
+      wcp = dest;
ce426f
+
ce426f
+      do
ce426f
+        {
ce426f
+          c = *src++;
ce426f
+          *wcp++ = c;
ce426f
+        }
ce426f
+      while (c != L'\0');
ce426f
+    }
ce426f
+  return dest;
ce426f
+}
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c
ce426f
new file mode 100644
ce426f
index 0000000..6c86baa
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c
ce426f
@@ -0,0 +1,22 @@
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 <wchar.h>
ce426f
+
ce426f
+#define WCSCPY __wcscpy_power6
ce426f
+
ce426f
+#include <sysdeps/powerpc/power6/wcscpy.c>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c
ce426f
new file mode 100644
ce426f
index 0000000..dad0e70
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c
ce426f
@@ -0,0 +1,22 @@
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 <wchar.h>
ce426f
+
ce426f
+#define WCSCPY __wcscpy_power7
ce426f
+
ce426f
+#include <sysdeps/powerpc/power6/wcscpy.c>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
ce426f
new file mode 100644
ce426f
index 0000000..c135835
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
ce426f
@@ -0,0 +1,26 @@
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 <wchar.h>
ce426f
+
ce426f
+#ifndef NOT_IN_libc
ce426f
+# define WCSCPY  __wcscpy_ppc
ce426f
+#endif
ce426f
+
ce426f
+extern __typeof (wcscpy) __wcscpy_ppc;
ce426f
+
ce426f
+#include <wcsmbs/wcscpy.c>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
ce426f
index b4504b7..7113212 100644
ce426f
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/Makefile
ce426f
@@ -11,7 +11,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
ce426f
                   strncmp-power4 strncmp-ppc64 strchr-power7 strchr-ppc64 \
ce426f
                   strchrnul-power7 strchrnul-ppc64 wcschr-power7 \
ce426f
                   wcschr-power6 wcschr-ppc64 wcsrchr-power7 wcsrchr-power6 \
ce426f
-                  wcsrchr-ppc64
ce426f
+                  wcsrchr-ppc64 wcscpy-power7 wcscpy-power6 wcscpy-ppc64
ce426f
 
ce426f
 CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
ce426f
 CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops
ce426f
@@ -19,4 +19,6 @@ CFLAGS-wcschr-power7.c += -mcpu=power7
ce426f
 CFLAGS-wcschr-power6.c += -mcpu=power6
ce426f
 CFLAGS-wcsrchr-power7.c += -mcpu=power7
ce426f
 CFLAGS-wcsrchr-power6.c += -mcpu=power6
ce426f
+CFLAGS-wcscpy-power7.c += -mcpu=power7
ce426f
+CFLAGS-wcscpy-power6.c += -mcpu=power6
ce426f
 endif
ce426f
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
ce426f
index 6c7422c..2d21ce1 100644
ce426f
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
ce426f
@@ -213,5 +213,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
ce426f
              IFUNC_IMPL_ADD (array, i, wcsrchr, 1,
ce426f
                              __wcsrchr_ppc))
ce426f
 
ce426f
+  /* Support sysdeps/powerpc/powerpc64/multiarch/wcscpy.c.  */
ce426f
+  IFUNC_IMPL (i, name, wcscpy,
ce426f
+             IFUNC_IMPL_ADD (array, i, wcscpy,
ce426f
+                             hwcap & PPC_FEATURE_HAS_VSX,
ce426f
+                             __wcscpy_power7)
ce426f
+             IFUNC_IMPL_ADD (array, i, wcscpy,
ce426f
+                             hwcap & PPC_FEATURE_ARCH_2_05,
ce426f
+                             __wcscpy_power6)
ce426f
+             IFUNC_IMPL_ADD (array, i, wcscpy, 1,
ce426f
+                             __wcscpy_ppc))
ce426f
+
ce426f
   return i;
ce426f
 }
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c
ce426f
new file mode 100644
ce426f
index 0000000..9f4bc41
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c
ce426f
@@ -0,0 +1,19 @@
ce426f
+/* wcscpy.c - Wide Character Search for powerpc64/power6.
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; see the file COPYING.LIB.  If
ce426f
+   not, see <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c
ce426f
new file mode 100644
ce426f
index 0000000..0f37ad4
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c
ce426f
@@ -0,0 +1,19 @@
ce426f
+/* wcscpy.c - Wide Character Search for powerpc64/power7.
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; see the file COPYING.LIB.  If
ce426f
+   not, see <http://www.gnu.org/licenses/>.  */
ce426f
+
ce426f
+#include <sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c
ce426f
new file mode 100644
ce426f
index 0000000..4559569
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c
ce426f
@@ -0,0 +1,18 @@
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/multiarch/wcscpy-ppc32.c>
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
ce426f
new file mode 100644
ce426f
index 0000000..5c0a6d3
ce426f
--- /dev/null
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
ce426f
@@ -0,0 +1,36 @@
ce426f
+/* Multiple versions of wcscpy.
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
+#ifndef NOT_IN_libc
ce426f
+# include <wchar.h>
ce426f
+# include <shlib-compat.h>
ce426f
+# include "init-arch.h"
ce426f
+
ce426f
+extern __typeof (wcscpy) __wcscpy_ppc attribute_hidden;
ce426f
+extern __typeof (wcscpy) __wcscpy_power6 attribute_hidden;
ce426f
+extern __typeof (wcscpy) __wcscpy_power7 attribute_hidden;
ce426f
+
ce426f
+libc_ifunc (wcscpy,
ce426f
+	     (hwcap & PPC_FEATURE_HAS_VSX)
ce426f
+             ? __wcscpy_power7 :
ce426f
+	       (hwcap & PPC_FEATURE_ARCH_2_05)
ce426f
+	       ? __wcscpy_power6
ce426f
+             : __wcscpy_ppc);
ce426f
+#else
ce426f
+#include <wcsmbs/wcscpy.c>
ce426f
+#endif
ce426f
diff --git glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcscpy.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcscpy.c
ce426f
index 57b706a..722c8f9 100644
ce426f
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcscpy.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/power6/wcscpy.c
ce426f
@@ -1 +1 @@
ce426f
-#include "../../powerpc32/power6/wcscpy.c"
ce426f
+#include <sysdeps/powerpc/power6/wcscpy.c>
ce426f
diff --git glibc-2.17-c758a686/wcsmbs/wcscpy.c glibc-2.17-c758a686/wcsmbs/wcscpy.c
ce426f
index 6dea24d..cec1249 100644
ce426f
--- glibc-2.17-c758a686/wcsmbs/wcscpy.c
ce426f
+++ glibc-2.17-c758a686/wcsmbs/wcscpy.c
ce426f
@@ -19,10 +19,13 @@
ce426f
 #include <stddef.h>
ce426f
 #include <wchar.h>
ce426f
 
ce426f
+#ifndef WCSCPY
ce426f
+# define WCSCPY wcscpy
ce426f
+#endif
ce426f
 
ce426f
 /* Copy SRC to DEST.  */
ce426f
 wchar_t *
ce426f
-wcscpy (dest, src)
ce426f
+WCSCPY (dest, src)
ce426f
      wchar_t *dest;
ce426f
      const wchar_t *src;
ce426f
 {
ce426f
-- 
ce426f
1.8.3.1
ce426f