mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 06:50:07 +00:00
5f1743d118
The implementation of memset for s390-32 (31bit) and s390-64 (64bit) is nearly the same. This patch unifies it for maintability reasons. __memset_z10 and __memset_z196 differs between 31 and 64bit: -31bit needs .machinemode "zarch_nohighgprs" and llgfr %r4,%r4 -lr vs lgr and some other instructions: But lgr and co can be also used on 31bit as this ifunc variant is only called if we are on a zarch machine. __memset_default differs between 31 and 64bit: -Some 31bit vs 64bit instructions (e.g. ltr vs ltgr. Solved with 31/64 specific instruction macros). -The address of mvc instruction is setup in different ways (larl vs bras). Solved with #if defined __s390x__. Otherwise 31/64bit implementation has the same structure of the code. ChangeLog: * sysdeps/s390/s390-64/memset.S: Move to ... * sysdeps/s390/memset.S: ... here. Adjust to be usable for 31/64bit. * sysdeps/s390/s390-32/memset.S: Delete File. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add memset. * sysdeps/s390/s390-32/multiarch/Makefile (sysdep_routines): Remove memset. * sysdeps/s390/s390-64/multiarch/Makefile: Likewise. * sysdeps/s390/s390-64/multiarch/memset-s390x.S: Move to ... * sysdeps/s390/multiarch/memset-s390x.S: ... here. Adjust to be usable for 31/64bit. * sysdeps/s390/s390-32/multiarch/memset-s390.S: Delete File. * sysdeps/s390/s390-64/multiarch/memset.c: Move to ... * sysdeps/s390/multiarch/memset.c: ... here. * sysdeps/s390/s390-32/multiarch/memset.c: Delete File.
61 lines
1.8 KiB
Makefile
61 lines
1.8 KiB
Makefile
ifeq ($(subdir),string)
|
|
sysdep_routines += strlen strlen-vx strlen-c \
|
|
strnlen strnlen-vx strnlen-c \
|
|
strcpy strcpy-vx \
|
|
stpcpy stpcpy-vx stpcpy-c \
|
|
strncpy strncpy-vx \
|
|
stpncpy stpncpy-vx stpncpy-c \
|
|
strcat strcat-vx strcat-c \
|
|
strncat strncat-vx strncat-c \
|
|
strcmp strcmp-vx \
|
|
strncmp strncmp-vx strncmp-c \
|
|
strchr strchr-vx strchr-c \
|
|
strchrnul strchrnul-vx strchrnul-c \
|
|
strrchr strrchr-vx strrchr-c \
|
|
strspn strspn-vx strspn-c \
|
|
strpbrk strpbrk-vx strpbrk-c \
|
|
strcspn strcspn-vx strcspn-c \
|
|
memchr memchr-vx \
|
|
rawmemchr rawmemchr-vx rawmemchr-c \
|
|
memccpy memccpy-vx memccpy-c \
|
|
memrchr memrchr-vx memrchr-c \
|
|
mempcpy \
|
|
memset memset-s390x
|
|
endif
|
|
|
|
ifeq ($(subdir),wcsmbs)
|
|
sysdep_routines += wcslen wcslen-vx wcslen-c \
|
|
wcsnlen wcsnlen-vx wcsnlen-c \
|
|
wcscpy wcscpy-vx wcscpy-c \
|
|
wcpcpy wcpcpy-vx wcpcpy-c \
|
|
wcsncpy wcsncpy-vx wcsncpy-c \
|
|
wcpncpy wcpncpy-vx wcpncpy-c \
|
|
wcscat wcscat-vx wcscat-c \
|
|
wcsncat wcsncat-vx wcsncat-c \
|
|
wcscmp wcscmp-vx wcscmp-c \
|
|
wcsncmp wcsncmp-vx wcsncmp-c \
|
|
wcschr wcschr-vx wcschr-c \
|
|
wcschrnul wcschrnul-vx wcschrnul-c \
|
|
wcsrchr wcsrchr-vx wcsrchr-c \
|
|
wcsspn wcsspn-vx wcsspn-c \
|
|
wcspbrk wcspbrk-vx wcspbrk-c \
|
|
wcscspn wcscspn-vx wcscspn-c \
|
|
wmemchr wmemchr-vx wmemchr-c \
|
|
wmemset wmemset-vx wmemset-c \
|
|
wmemcmp wmemcmp-vx wmemcmp-c
|
|
endif
|
|
|
|
ifeq ($(subdir),iconvdata)
|
|
override define generate-8bit-table
|
|
$(make-target-directory)
|
|
LC_ALL=C $(SHELL) ./gen-8bit.sh $< > $(@:stmp=T)
|
|
LC_ALL=C $(SHELL) ../sysdeps/s390/multiarch/gen-8bit.sh $< >> $(@:stmp=T)
|
|
$(move-if-change) $(@:stmp=T) $(@:stmp=h)
|
|
touch $@
|
|
endef
|
|
endif
|
|
|
|
ifeq ($(subdir),iconv)
|
|
sysdep_routines += gconv_simple
|
|
endif
|