about summary refs log tree commit diff
path: root/sysdeps/s390/strpbrk-c.c
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:15 +0100
committerStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:15 +0100
commit572cca93fafa59d641c11372a9556722d95b038c (patch)
treee5ae1e9e49baee47666af9423b2c83825fdb5a95 /sysdeps/s390/strpbrk-c.c
parent483fc56978d11c7118326f92ea678bea2f092300 (diff)
downloadglibc-572cca93fafa59d641c11372a9556722d95b038c.tar.gz
glibc-572cca93fafa59d641c11372a9556722d95b038c.tar.xz
glibc-572cca93fafa59d641c11372a9556722d95b038c.zip
S390: Refactor strpbrk ifunc handling.
The ifunc handling for strpbrk 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 strpbrk variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add strpbrk variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for strpbrk.
	* sysdeps/s390/multiarch/strpbrk-c.c: Move to ...
	* sysdeps/s390/strpbrk-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strpbrk-vx.S: Move to ...
	* sysdeps/s390/strpbrk-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/strpbrk.c: Move to ...
	* sysdeps/s390/strpbrk.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-strpbrk.h: New file.
Diffstat (limited to 'sysdeps/s390/strpbrk-c.c')
-rw-r--r--sysdeps/s390/strpbrk-c.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/sysdeps/s390/strpbrk-c.c b/sysdeps/s390/strpbrk-c.c
new file mode 100644
index 0000000000..70cc5db672
--- /dev/null
+++ b/sysdeps/s390/strpbrk-c.c
@@ -0,0 +1,32 @@
+/* Default strpbrk 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <ifunc-strpbrk.h>
+
+#if HAVE_STRPBRK_C
+# if HAVE_STRPBRK_IFUNC
+#  define STRPBRK STRPBRK_C
+#  if defined SHARED && IS_IN (libc)
+#   undef libc_hidden_builtin_def
+#   define libc_hidden_builtin_def(name)			\
+  __hidden_ver1 (__strpbrk_c, __GI_strpbrk, __strpbrk_c);
+#  endif
+# endif
+
+# include <string/strpbrk.c>
+#endif