From 4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 18 Dec 2018 13:57:16 +0100 Subject: S390: Refactor rawmemchr ifunc handling. The ifunc handling for rawmemchr 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. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove rawmemchr variants. * sysdeps/s390/Makefile (sysdep_routines): Add rawmemchr variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for rawmemchr. * sysdeps/s390/multiarch/rawmemchr-c.c: Move to ... * sysdeps/s390/rawmemchr-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/rawmemchr-vx.S: Move to ... * sysdeps/s390/rawmemchr-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/rawmemchr.c: Move to ... * sysdeps/s390/rawmemchr.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-rawmemchr.h: New file. --- sysdeps/s390/ifunc-rawmemchr.h | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 sysdeps/s390/ifunc-rawmemchr.h (limited to 'sysdeps/s390/ifunc-rawmemchr.h') diff --git a/sysdeps/s390/ifunc-rawmemchr.h b/sysdeps/s390/ifunc-rawmemchr.h new file mode 100644 index 0000000000..bfcbeae802 --- /dev/null +++ b/sysdeps/s390/ifunc-rawmemchr.h @@ -0,0 +1,52 @@ +/* rawmemchr variant information on S/390 version. + Copyright (C) 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 + . */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_RAWMEMCHR_IFUNC 1 +#else +# define HAVE_RAWMEMCHR_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_RAWMEMCHR_IFUNC_AND_VX_SUPPORT HAVE_RAWMEMCHR_IFUNC +#else +# define HAVE_RAWMEMCHR_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define RAWMEMCHR_DEFAULT RAWMEMCHR_Z13 +# define HAVE_RAWMEMCHR_C 0 +# define HAVE_RAWMEMCHR_Z13 1 +#else +# define RAWMEMCHR_DEFAULT RAWMEMCHR_C +# define HAVE_RAWMEMCHR_C 1 +# define HAVE_RAWMEMCHR_Z13 HAVE_RAWMEMCHR_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_RAWMEMCHR_C +# define RAWMEMCHR_C __rawmemchr_c +#else +# define RAWMEMCHR_C NULL +#endif + +#if HAVE_RAWMEMCHR_Z13 +# define RAWMEMCHR_Z13 __rawmemchr_vx +#else +# define RAWMEMCHR_Z13 NULL +#endif -- cgit 1.4.1