about summary refs log tree commit diff
path: root/sysdeps/s390/multiarch/Makefile
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:22 +0100
committerStefan Liebler <stli@linux.ibm.com>2018-12-18 13:57:22 +0100
commitcf3ccc31a3d76a9b4db410d3087055c3aff2b71b (patch)
treebda4472e79d7bfbc3cf1c9d4d37bb88eb63e6529 /sysdeps/s390/multiarch/Makefile
parente9873e1d47c870d707117ada91c9be21e3bf1537 (diff)
downloadglibc-cf3ccc31a3d76a9b4db410d3087055c3aff2b71b.tar.gz
glibc-cf3ccc31a3d76a9b4db410d3087055c3aff2b71b.tar.xz
glibc-cf3ccc31a3d76a9b4db410d3087055c3aff2b71b.zip
S390: Refactor wcschr ifunc handling.
The ifunc handling for wcschr 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.
Glibc internal calls will use the "newer" ifunc variant.

ChangeLog:

	* sysdeps/s390/multiarch/Makefile
	(sysdep_routines): Remove wcschr variants.
	* sysdeps/s390/Makefile (sysdep_routines): Add wcschr variants.
	* sysdeps/s390/multiarch/ifunc-impl-list.c
	(__libc_ifunc_impl_list): Refactor ifunc handling for wcschr.
	* sysdeps/s390/multiarch/wcschr-c.c: Move to ...
	* sysdeps/s390/wcschr-c.c: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcschr-vx.S: Move to ...
	* sysdeps/s390/wcschr-vx.S: ... here and adjust ifunc handling.
	* sysdeps/s390/multiarch/wcschr.c: Move to ...
	* sysdeps/s390/wcschr.c: ... here and adjust ifunc handling.
	* sysdeps/s390/ifunc-wcschr.h: New file.
Diffstat (limited to 'sysdeps/s390/multiarch/Makefile')
-rw-r--r--sysdeps/s390/multiarch/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile
index d1740fa8e4..b282613b47 100644
--- a/sysdeps/s390/multiarch/Makefile
+++ b/sysdeps/s390/multiarch/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),wcsmbs)
-sysdep_routines += wcschr wcschr-vx wcschr-c \
-		   wcschrnul wcschrnul-vx wcschrnul-c \
+sysdep_routines += wcschrnul wcschrnul-vx wcschrnul-c \
 		   wcsrchr wcsrchr-vx wcsrchr-c \
 		   wcsspn wcsspn-vx wcsspn-c \
 		   wcspbrk wcspbrk-vx wcspbrk-c \