PowerPC: multiarch wcscpy for PowerPC32

This commit is contained in:
Adhemerval Zanella 2013-10-14 09:43:31 -05:00
parent bb04e529f6
commit 93be09e725
10 changed files with 150 additions and 7 deletions

View File

@ -1,3 +1,23 @@
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* wcsmbs/wcscpy.c (wcscpy): Using macro to redefine symbol name
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power6.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-power7.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c: New
file.
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: New file:
multiarch wcscpy for PPC32.
* sysdeps/powerpc/powerpc32/power4/multiarch/Makefile: Added wcscpy
multiarch objects.
* sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list
(__libc_ifunc_impl_list): Likewise.
* sysdeps/powerpc/powerpc32/power6/wcsrchr.c: Move ...
* sysdeps/powerpc/power6/wcsrchr.c: ... to here.
* sysdeps/powerpc/powerpc64/power6/wcscpy.c: Adjust to use
sysdeps/powerpc/power6/wcscpy.c.
2013-12-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* wcsmbs/wcsrchr.c (wcsrchr): Using macro to redefine symbol name

View File

@ -1,4 +1,4 @@
/* wcscpy.c - Wide Character Copy for powerpc32/power6.
/* wcscpy.c - Wide Character Copy for POWER6+.
Copyright (C) 2012-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -19,12 +19,13 @@
#include <stddef.h>
#include <wchar.h>
#ifndef WCSCPY
# define WCSCPY wcscpy
#endif
/* Copy SRC to DEST. */
wchar_t *
wcscpy (dest, src)
wchar_t *dest;
const wchar_t *src;
WCSCPY (wchar_t *dest, const wchar_t *src)
{
wint_t c,d;
wchar_t *wcp, *wcp2;

View File

@ -9,7 +9,8 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \
strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \
strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \
wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32
wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \
wcscpy-power7 wcscpy-power6 wcscpy-ppc32
CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops
CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops

View File

@ -203,5 +203,16 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
IFUNC_IMPL_ADD (array, i, wcsrchr, 1,
__wcsrchr_ppc))
/* Support sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c. */
IFUNC_IMPL (i, name, wcscpy,
IFUNC_IMPL_ADD (array, i, wcscpy,
hwcap & PPC_FEATURE_HAS_VSX,
__wcscpy_power7)
IFUNC_IMPL_ADD (array, i, wcscpy,
hwcap & PPC_FEATURE_ARCH_2_05,
__wcscpy_power6)
IFUNC_IMPL_ADD (array, i, wcscpy, 1,
__wcscpy_ppc))
return i;
}

View File

@ -0,0 +1,22 @@
/* Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <wchar.h>
#define WCSCPY __wcscpy_power6
#include <sysdeps/powerpc/power6/wcscpy.c>

View File

@ -0,0 +1,22 @@
/* Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <wchar.h>
#define WCSCPY __wcscpy_power7
#include <sysdeps/powerpc/power6/wcscpy.c>

View File

@ -0,0 +1,26 @@
/* Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <wchar.h>
#ifndef NOT_IN_libc
# define WCSCPY __wcscpy_ppc
#endif
extern __typeof (wcscpy) __wcscpy_ppc;
#include <wcsmbs/wcscpy.c>

View File

@ -0,0 +1,36 @@
/* Multiple versions of wcscpy
Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#ifndef NOT_IN_libc
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
extern __typeof (wcscpy) __wcscpy_ppc attribute_hidden;
extern __typeof (wcscpy) __wcscpy_power6 attribute_hidden;
extern __typeof (wcscpy) __wcscpy_power7 attribute_hidden;
libc_ifunc (wcscpy,
(hwcap & PPC_FEATURE_HAS_VSX)
? __wcscpy_power7 :
(hwcap & PPC_FEATURE_ARCH_2_05)
? __wcscpy_power6
: __wcscpy_ppc);
#else
#include <wcsmbs/wcscpy.c>
#endif

View File

@ -1 +1 @@
#include "../../powerpc32/power6/wcscpy.c"
#include <sysdeps/powerpc/power6/wcscpy.c>

View File

@ -20,9 +20,13 @@
#include <wchar.h>
#ifndef WCSCPY
# define WCSCPY wcscpy
#endif
/* Copy SRC to DEST. */
wchar_t *
wcscpy (dest, src)
WCSCPY (dest, src)
wchar_t *dest;
const wchar_t *src;
{