diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:16 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:16 +0100 |
| commit | 4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc (patch) | |
| tree | 7d005e54610905bec43065c70af261177ae5dc2f /sysdeps/s390/rawmemchr.c | |
| parent | 581a051c2e09a847332d4750f6132de0f0ad15b6 (diff) | |
| download | glibc-4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc.tar glibc-4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc.tar.gz glibc-4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc.tar.bz2 glibc-4c7b3cec113d9bb7dfc004e22c7a98e310ab9bcc.zip | |
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.
Diffstat (limited to 'sysdeps/s390/rawmemchr.c')
| -rw-r--r-- | sysdeps/s390/rawmemchr.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sysdeps/s390/rawmemchr.c b/sysdeps/s390/rawmemchr.c new file mode 100644 index 0000000000..d9263ce208 --- /dev/null +++ b/sysdeps/s390/rawmemchr.c @@ -0,0 +1,41 @@ +/* Multiple versions of rawmemchr. + 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-rawmemchr.h> + +#if HAVE_RAWMEMCHR_IFUNC +# define __rawmemchr __redirect___rawmemchr +# include <string.h> +# undef __rawmemchr +# include <ifunc-resolve.h> + +# if HAVE_RAWMEMCHR_C +extern __typeof (__redirect___rawmemchr) RAWMEMCHR_C attribute_hidden; +# endif + +# if HAVE_RAWMEMCHR_Z13 +extern __typeof (__redirect___rawmemchr) RAWMEMCHR_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__redirect___rawmemchr, __rawmemchr, + (HAVE_RAWMEMCHR_Z13 && (hwcap & HWCAP_S390_VX)) + ? RAWMEMCHR_Z13 + : RAWMEMCHR_DEFAULT + ) +weak_alias (__rawmemchr, rawmemchr) +#endif /* HAVE_RAWMEMCHR_IFUNC */ |