diff options
Diffstat (limited to 'sysdeps/s390/s390-64')
| -rw-r--r-- | sysdeps/s390/s390-64/multiarch/strncpy.c | 21 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/strncpy-z900.S (renamed from sysdeps/s390/s390-64/strncpy.S) | 16 |
2 files changed, 13 insertions, 24 deletions
diff --git a/sysdeps/s390/s390-64/multiarch/strncpy.c b/sysdeps/s390/s390-64/multiarch/strncpy.c deleted file mode 100644 index 57f9df18d1..0000000000 --- a/sysdeps/s390/s390-64/multiarch/strncpy.c +++ /dev/null @@ -1,21 +0,0 @@ -/* 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/>. */ - -/* This wrapper-file is needed, because otherwise file - sysdeps/s390/s390-[32|64]/strncpy.S will be used. */ -#include <sysdeps/s390/multiarch/strncpy.c> diff --git a/sysdeps/s390/s390-64/strncpy.S b/sysdeps/s390/s390-64/strncpy-z900.S index be40aa32d5..5732e6d83b 100644 --- a/sysdeps/s390/s390-64/strncpy.S +++ b/sysdeps/s390/s390-64/strncpy-z900.S @@ -23,10 +23,12 @@ %r3 = address of source (src) %r4 = max of bytes to copy. */ +#include <ifunc-strncpy.h> #include "sysdep.h" #include "asm-syntax.h" -ENTRY(strncpy) +#if HAVE_STRNCPY_Z900_G5 +ENTRY(STRNCPY_Z900_G5) .text stg %r2,48(%r15) # save dst pointer slgr %r2,%r3 # %r3 points to src, %r2+%r3 to dst @@ -86,5 +88,13 @@ ENTRY(strncpy) jo .L13 .Lexit: lg %r2,48(%r15) # return dst pointer br %r14 -END(strncpy) -libc_hidden_builtin_def (strncpy) +END(STRNCPY_Z900_G5) + +# if ! HAVE_STRNCPY_IFUNC +strong_alias (STRNCPY_Z900_G5, strncpy) +# endif + +# if defined SHARED && IS_IN (libc) +strong_alias (STRNCPY_Z900_G5, __GI_strncpy) +# endif +#endif |