From c3081bcbd91a619115f047c2ceea90a9090d5216 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:19 +0100 Subject: S390: Refactor wcpncpy ifunc handling. The ifunc handling for wcpncpy is adjusted in order to omit ifunc if the minimum architecture level already supports newer CPUs by default. Unfortunately the c ifunc variant can't be omitted at all as it is used by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcpncpy variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcpncpy variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcpncpy. * sysdeps/s390/multiarch/wcpncpy-c.c: Move to ... * sysdeps/s390/wcpncpy-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcpncpy-vx.S: Move to ... * sysdeps/s390/wcpncpy-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcpncpy.c: Move to ... * sysdeps/s390/wcpncpy.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcpncpy.h: New file. --- sysdeps/s390/wcpncpy-c.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 sysdeps/s390/wcpncpy-c.c (limited to 'sysdeps/s390/wcpncpy-c.c') diff --git a/sysdeps/s390/wcpncpy-c.c b/sysdeps/s390/wcpncpy-c.c new file mode 100644 index 0000000000..d03359217e --- /dev/null +++ b/sysdeps/s390/wcpncpy-c.c @@ -0,0 +1,27 @@ +/* Default wcsncpy implementation for S/390. + 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 + . */ + +#include + +#if HAVE_WCPNCPY_C +# if HAVE_WCPNCPY_IFUNC || HAVE_WCPNCPY_Z13 +# define WCPNCPY WCPNCPY_C +# endif + +# include +#endif -- cgit v1.2.3