diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c | 23 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c | 14 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c | 86 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c | 4 |
8 files changed, 44 insertions, 119 deletions
diff --git a/ChangeLog b/ChangeLog index e8496064b1..3e7ce52ee3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,18 @@ 2015-02-09 Adhemerval Zanellla <azanella@linux.vnet.ibm.com> * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile + [sysdep_routines]: Remove wordcopy-power6 object. + * sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c + (__memmove_power7): Use local call for wordcopy and memcpy symbols. + * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c + (__memmove_ppc32): Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c: Remove + file. + * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c: Remove file. + * sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c [IS_IN (libc)]: + Remove preprocessor. + + * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile [sysdep_routines]: Remove wide chars objects. [wcsmbs]: New rule for wide char objects. diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile index 2271d57b13..bd9d360efa 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile @@ -9,7 +9,7 @@ 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 \ - wordcopy-power7 wordcopy-power6 wordcopy-ppc32 \ + wordcopy-power7 wordcopy-ppc32 \ memmove-power7 memmove-ppc CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c index 8f2614daa5..5a7fc5f46f 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-power7.c @@ -17,6 +17,17 @@ not, see <http://www.gnu.org/licenses/>. */ #include <string.h> +#include <memcopy.h> + +extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7; +extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7; +extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7; +extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7; + +#define _wordcopy_fwd_aligned _wordcopy_fwd_aligned_power7 +#define _wordcopy_fwd_dest_aligned _wordcopy_fwd_dest_aligned_power7 +#define _wordcopy_bwd_aligned _wordcopy_bwd_aligned_power7 +#define _wordcopy_bwd_dest_aligned _wordcopy_bwd_dest_aligned_power7 extern __typeof (memcpy) __memcpy_power7; #define memcpy __memcpy_power7 diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c index d7ba5a8489..b543a8a1fd 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove-ppc.c @@ -17,6 +17,17 @@ not, see <http://www.gnu.org/licenses/>. */ #include <string.h> +#include <memcopy.h> + +extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc; +extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc; +extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc; +extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc; + +#define _wordcopy_fwd_aligned _wordcopy_fwd_aligned_ppc +#define _wordcopy_fwd_dest_aligned _wordcopy_fwd_dest_aligned_ppc +#define _wordcopy_bwd_aligned _wordcopy_bwd_aligned_ppc +#define _wordcopy_bwd_dest_aligned _wordcopy_bwd_dest_aligned_ppc extern __typeof (memcpy) __memcpy_ppc; #define memcpy __memcpy_ppc diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c deleted file mode 100644 index 65dd8c8235..0000000000 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-power6.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2013-2015 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/>. */ - -#define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_power6 -#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_power6 -#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_power6 -#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_power6 - -#include <sysdeps/powerpc/power6/wordcopy.c> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c index 41e4118d92..82af17cd2c 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c @@ -15,9 +15,13 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_ppc -#define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_ppc -#define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_ppc -#define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_ppc +#if IS_IN (libc) +# define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_aligned_ppc +# define WORDCOPY_FWD_DEST_ALIGNED _wordcopy_fwd_dest_aligned_ppc +# define WORDCOPY_BWD_ALIGNED _wordcopy_bwd_aligned_ppc +# define WORDCOPY_BWD_DEST_ALIGNED _wordcopy_bwd_dest_aligned_ppc -#include <sysdeps/powerpc/power4/wordcopy.c> +# include <sysdeps/powerpc/power4/wordcopy.c> +#else +# include <string/wordcopy.c> +#endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c deleted file mode 100644 index cc27540a85..0000000000 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c +++ /dev/null @@ -1,86 +0,0 @@ -/* Multiple versions of wordcopy functions. - Copyright (C) 2013-2015 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/>. */ - -#if IS_IN (libc) -# include <stddef.h> -# include <memcopy.h> -# include <shlib-compat.h> -# include "init-arch.h" - -extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc -attribute_hidden; -extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6 -attribute_hidden; -extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7 -attribute_hidden; - -libc_ifunc (_wordcopy_fwd_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_fwd_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_fwd_aligned_power6 - : _wordcopy_fwd_aligned_ppc); - - -extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc -attribute_hidden; -extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6 -attribute_hidden; -extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7 -attribute_hidden; - -libc_ifunc (_wordcopy_fwd_dest_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_fwd_dest_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_fwd_dest_aligned_power6 - : _wordcopy_fwd_dest_aligned_ppc); - - -extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc -attribute_hidden; -extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6 -attribute_hidden; -extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7 -attribute_hidden; - -libc_ifunc (_wordcopy_bwd_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_bwd_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_bwd_aligned_power6 - : _wordcopy_bwd_aligned_ppc); - - -extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc -attribute_hidden; -extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6 -attribute_hidden; -extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7 -attribute_hidden; - -libc_ifunc (_wordcopy_bwd_dest_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_bwd_dest_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_bwd_dest_aligned_power6 - : _wordcopy_bwd_dest_aligned_ppc); - -#else -#include <sysdeps/powerpc/power4/wordcopy.c> -#endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c index b8ecda7bb3..5d7b9fdcc2 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c @@ -15,8 +15,4 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if IS_IN (libc) #include <sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy-ppc32.c> -#else -#include <string/wordcopy.c> -#endif |