diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:06 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:06 +0100 |
| commit | df3eb8de31a530f285f54f3c41cd7b636816c062 (patch) | |
| tree | 4fb88ad41349d2ac228d07e63a7c3f355ca79dc0 /sysdeps/s390/multiarch/Makefile | |
| parent | b7e024a838452a85870256d8f1ab946dc8f931cd (diff) | |
| download | glibc-df3eb8de31a530f285f54f3c41cd7b636816c062.tar.gz glibc-df3eb8de31a530f285f54f3c41cd7b636816c062.tar.xz glibc-df3eb8de31a530f285f54f3c41cd7b636816c062.zip | |
S390: Unify 31/64bit memcpy.
The implementation of memcpy/mempcpy for s390-32 (31bit) and s390-64 (64bit) is nearly the same. This patch unifies it for maintability reasons. __mem[p]cpy_z10 and __mem[p]cpy_z196 differs between 31 and 64bit: -31bit needs .machinemode "zarch_nohighgprs" and llgfr %r4,%r4 -lr vs lgr; lgr can be also used on 31bit as this ifunc variant is only called if we are on a zarch machine. __mem[p]cpy_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__. __memcpy_mvcle differs between 31 and 64bit: -lr vs lgr; ahi vs aghi; Solved with 31/64bit specific instruction macros. Otherwise 31/64bit implementation has the same structure of the code. ChangeLog: * sysdeps/s390/s390-64/memcpy.S: Move to ... * sysdeps/s390/memcpy.S: ... here. Adjust to be usable for 31/64bit. * sysdeps/s390/s390-32/memcpy.S: Delete File. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add memcpy. * sysdeps/s390/s390-32/multiarch/Makefile: Delete file. * sysdeps/s390/s390-64/multiarch/Makefile: Likewise. * sysdeps/s390/s390-64/multiarch/memcpy-s390x.S: Move to ... * sysdeps/s390/multiarch/memcpy-s390x.S: ... here. Adjust to be usable for 31/64bit. * sysdeps/s390/s390-32/multiarch/memcpy-s390.S: Delete File. * sysdeps/s390/s390-64/multiarch/memcpy.c: Move to ... * sysdeps/s390/multiarch/memcpy.c: ... here. * sysdeps/s390/s390-32/multiarch/memcpy.c: Delete File.
Diffstat (limited to 'sysdeps/s390/multiarch/Makefile')
| -rw-r--r-- | sysdeps/s390/multiarch/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index c893ebc565..3cbd5fad69 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -19,7 +19,7 @@ sysdep_routines += strlen strlen-vx strlen-c \ rawmemchr rawmemchr-vx rawmemchr-c \ memccpy memccpy-vx memccpy-c \ memrchr memrchr-vx memrchr-c \ - mempcpy + mempcpy memcpy memcpy-s390x endif ifeq ($(subdir),wcsmbs) |