diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:11 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:11 +0100 |
| commit | d1bdbf380908c34f31ba145ec9afebade3f1418f (patch) | |
| tree | 5b67b9d19909a6dbfbbd3fc9e01a447c83513de6 /sysdeps/s390/strncpy.c | |
| parent | 970449311ded3cacb6058c96143dd4c057900589 (diff) | |
| download | glibc-d1bdbf380908c34f31ba145ec9afebade3f1418f.tar.gz glibc-d1bdbf380908c34f31ba145ec9afebade3f1418f.tar.xz glibc-d1bdbf380908c34f31ba145ec9afebade3f1418f.zip | |
S390: Refactor strncpy ifunc handling.
The ifunc handling for strncpy is adjusted in order to omit ifunc variants if those will never be used as the minimum architecture level already supports newer CPUs by default. Glibc internal calls will then also use the "newer" ifunc variant. Note: The fallback s390-32/s390-64 ifunc variants are now moved to the strncpy-z900.S files. The s390-32/s390-64 files multiarch/strncpy.c and strncpy.S are deleted. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove strncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add strncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for strncpy. * sysdeps/s390/multiarch/strncpy-vx.S: Move to ... * sysdeps/s390/strncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/strncpy.c: Move to ... * sysdeps/s390/strncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-strncpy.h: New file. * sysdeps/s390/s390-64/strncpy.S: Move to ... * sysdeps/s390/s390-64/strncpy-z900.S: ... here and adjust ifunc handling. * sysdeps/s390/s390-32/strncpy.S: Move to ... * sysdeps/s390/s390-32/strncpy-z900.S: ... here and adjust ifunc handling. * sysdeps/s390/s390-32/multiarch/strncpy.c: Delete file. * sysdeps/s390/s390-64/multiarch/strncpy.c: Likewise.
Diffstat (limited to 'sysdeps/s390/strncpy.c')
| -rw-r--r-- | sysdeps/s390/strncpy.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/sysdeps/s390/strncpy.c b/sysdeps/s390/strncpy.c new file mode 100644 index 0000000000..ec8a26471b --- /dev/null +++ b/sysdeps/s390/strncpy.c @@ -0,0 +1,42 @@ +/* Multiple versions of strncpy. + Copyright (C) 2015-2018 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 <ifunc-strncpy.h> + +#if HAVE_STRNCPY_IFUNC +# define strncpy __redirect_strncpy +/* Omit the strncpy inline definitions because it would redefine strncpy. */ +# define __NO_STRING_INLINES +# include <string.h> +# undef strncpy +# include <ifunc-resolve.h> + +# if HAVE_STRNCPY_Z900_G5 +extern __typeof (__redirect_strncpy) STRNCPY_Z900_G5 attribute_hidden; +# endif + +# if HAVE_STRNCPY_Z13 +extern __typeof (__redirect_strncpy) STRNCPY_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect_strncpy, strncpy, + (HAVE_STRNCPY_Z13 && (hwcap & HWCAP_S390_VX)) + ? STRNCPY_Z13 + : STRNCPY_DEFAULT + ) +#endif |