diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
| commit | 4dd9e35bfd35d3138bc44169baba098005bad51e (patch) | |
| tree | a4939c43a9c3fe00eb27f023e14acc5e1fe8808c /sysdeps/s390/s390-64/multiarch/memcpy.S | |
| parent | bd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (diff) | |
| parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'sysdeps/s390/s390-64/multiarch/memcpy.S')
| -rw-r--r-- | sysdeps/s390/s390-64/multiarch/memcpy.S | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sysdeps/s390/s390-64/multiarch/memcpy.S b/sysdeps/s390/s390-64/multiarch/memcpy.S index 6590f43f27..fc670c7ac4 100644 --- a/sysdeps/s390/s390-64/multiarch/memcpy.S +++ b/sysdeps/s390/s390-64/multiarch/memcpy.S @@ -1,5 +1,5 @@ /* CPU specific memcpy implementations. 64 bit S/390 version. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 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 @@ -27,9 +27,9 @@ .text -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) -ENTRY(memcpy_z196) +ENTRY(__memcpy_z196) .machine "z196" ltgr %r4,%r4 je .L_Z196_4 @@ -44,7 +44,7 @@ ENTRY(memcpy_z196) br %r14 .L_Z196_5: cgfi %r5,262144 # Switch to mvcle for copies >64MB - jh memcpy_mvcle + jh __memcpy_mvcle .L_Z196_2: pfd 1,768(%r3) pfd 2,768(%r1) @@ -56,9 +56,9 @@ ENTRY(memcpy_z196) j .L_Z196_3 .L_Z196_14: mvc 0(1,%r1),0(%r3) -END(memcpy_z196) +END(__memcpy_z196) -ENTRY(memcpy_z10) +ENTRY(__memcpy_z10) .machine "z10" cgije %r4,0,.L_Z10_4 aghi %r4,-1 @@ -71,7 +71,7 @@ ENTRY(memcpy_z10) br %r14 .L_Z10_13: cgfi %r5,65535 # Switch to mvcle for copies >16MB - jh memcpy_mvcle + jh __memcpy_mvcle .L_Z10_12: pfd 1,768(%r3) pfd 2,768(%r1) @@ -82,13 +82,13 @@ ENTRY(memcpy_z10) j .L_Z10_3 .L_Z10_15: mvc 0(1,%r1),0(%r3) -END(memcpy_z10) +END(__memcpy_z10) #endif #include "../memcpy.S" -#if !defined SHARED || defined NOT_IN_libc +#if !defined SHARED || !IS_IN (libc) .globl memcpy -.set memcpy,memcpy_z900 +.set memcpy,__memcpy_z900 #endif |