|
 |
147e83 |
From 6b9ad27fafd9c09aee186f2630b1c54348335040 Mon Sep 17 00:00:00 2001
|
|
|
147e83 |
From: Stefan Liebler <stli@linux.vnet.ibm.com>
|
|
|
147e83 |
Date: Thu, 8 Oct 2015 10:29:17 +0200
|
|
|
147e83 |
Subject: [PATCH 03/30] S390: Get rid of linknamespace failures for string
|
|
|
147e83 |
functions.
|
|
|
147e83 |
|
|
|
147e83 |
upstream-commit-id: 1d53248326dbd3c620a2bca16d35eff3019d900a
|
|
|
147e83 |
https://www.sourceware.org/ml/libc-alpha/2015-01/msg00310.html
|
|
|
147e83 |
|
|
|
147e83 |
This patch is needed to prepare for the optimized string function patchset.
|
|
|
147e83 |
This patch prefixes the ifunc-resolvers, the specific functions
|
|
|
147e83 |
and helper functions with '__' on s390-32/s390-64.
|
|
|
147e83 |
---
|
|
|
147e83 |
sysdeps/s390/s390-32/memcmp.S | 4 ++--
|
|
|
147e83 |
sysdeps/s390/s390-32/memcpy.S | 10 +++++-----
|
|
|
147e83 |
sysdeps/s390/s390-32/memset.S | 4 ++--
|
|
|
147e83 |
sysdeps/s390/s390-32/multiarch/ifunc-resolve.c | 16 ++++++++--------
|
|
|
147e83 |
sysdeps/s390/s390-32/multiarch/memcmp.S | 12 ++++++------
|
|
|
147e83 |
sysdeps/s390/s390-32/multiarch/memcpy.S | 14 +++++++-------
|
|
|
147e83 |
sysdeps/s390/s390-32/multiarch/memset.S | 18 +++++++++---------
|
|
|
147e83 |
sysdeps/s390/s390-64/memcmp.S | 4 ++--
|
|
|
147e83 |
sysdeps/s390/s390-64/memcpy.S | 10 +++++-----
|
|
|
147e83 |
sysdeps/s390/s390-64/memset.S | 4 ++--
|
|
|
147e83 |
sysdeps/s390/s390-64/multiarch/ifunc-resolve.c | 18 +++++++++---------
|
|
|
147e83 |
sysdeps/s390/s390-64/multiarch/memcmp.S | 12 ++++++------
|
|
|
147e83 |
sysdeps/s390/s390-64/multiarch/memcpy.S | 14 +++++++-------
|
|
|
147e83 |
sysdeps/s390/s390-64/multiarch/memset.S | 18 +++++++++---------
|
|
|
147e83 |
14 files changed, 79 insertions(+), 79 deletions(-)
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/memcmp.S b/sysdeps/s390/s390-32/memcmp.S
|
|
|
147e83 |
index 9ff84a3..b6eabe5 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/memcmp.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/memcmp.S
|
|
|
147e83 |
@@ -27,7 +27,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
.text
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-ENTRY(memcmp_g5)
|
|
|
147e83 |
+ENTRY(__memcmp_g5)
|
|
|
147e83 |
#else
|
|
|
147e83 |
ENTRY(memcmp)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
@@ -58,7 +58,7 @@ ENTRY(memcmp)
|
|
|
147e83 |
.L_G5_17:
|
|
|
147e83 |
clc 0(1,%r3),0(%r2)
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-END(memcmp_g5)
|
|
|
147e83 |
+END(__memcmp_g5)
|
|
|
147e83 |
#else
|
|
|
147e83 |
END(memcmp)
|
|
|
147e83 |
libc_hidden_builtin_def (memcmp)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/memcpy.S b/sysdeps/s390/s390-32/memcpy.S
|
|
|
147e83 |
index 90cc4cb..a3b1ace 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/memcpy.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/memcpy.S
|
|
|
147e83 |
@@ -26,7 +26,7 @@
|
|
|
147e83 |
%r4 = number of bytes to copy. */
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-ENTRY(memcpy_g5)
|
|
|
147e83 |
+ENTRY(__memcpy_g5)
|
|
|
147e83 |
#else
|
|
|
147e83 |
ENTRY(memcpy)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
@@ -49,7 +49,7 @@ ENTRY(memcpy)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_G5_13:
|
|
|
147e83 |
chi %r5,4096 # Switch to mvcle for copies >1MB
|
|
|
147e83 |
- jh memcpy_mvcle
|
|
|
147e83 |
+ jh __memcpy_mvcle
|
|
|
147e83 |
.L_G5_12:
|
|
|
147e83 |
mvc 0(256,%r1),0(%r3)
|
|
|
147e83 |
la %r1,256(%r1)
|
|
|
147e83 |
@@ -60,13 +60,13 @@ ENTRY(memcpy)
|
|
|
147e83 |
.L_G5_17:
|
|
|
147e83 |
mvc 0(1,%r1),0(%r3)
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-END(memcpy_g5)
|
|
|
147e83 |
+END(__memcpy_g5)
|
|
|
147e83 |
#else
|
|
|
147e83 |
END(memcpy)
|
|
|
147e83 |
libc_hidden_builtin_def (memcpy)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcpy_mvcle)
|
|
|
147e83 |
+ENTRY(__memcpy_mvcle)
|
|
|
147e83 |
# Using as standalone function will result in unexpected
|
|
|
147e83 |
# results since the length field is incremented by 1 in order to
|
|
|
147e83 |
# compensate the changes already done in the functions above.
|
|
|
147e83 |
@@ -79,4 +79,4 @@ ENTRY(memcpy_mvcle)
|
|
|
147e83 |
jo .L_MVCLE_1
|
|
|
147e83 |
lr %r2,%r1 # return destination address
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
-END(memcpy_mvcle)
|
|
|
147e83 |
+END(__memcpy_mvcle)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/memset.S b/sysdeps/s390/s390-32/memset.S
|
|
|
147e83 |
index 31a70f0..a73dc6c 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/memset.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/memset.S
|
|
|
147e83 |
@@ -28,7 +28,7 @@
|
|
|
147e83 |
.text
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-ENTRY(memset_g5)
|
|
|
147e83 |
+ENTRY(__memset_g5)
|
|
|
147e83 |
#else
|
|
|
147e83 |
ENTRY(memset)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
@@ -58,7 +58,7 @@ ENTRY(memset)
|
|
|
147e83 |
.L_G5_20:
|
|
|
147e83 |
mvc 1(1,%r1),0(%r1)
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-END(memset_g5)
|
|
|
147e83 |
+END(__memset_g5)
|
|
|
147e83 |
#else
|
|
|
147e83 |
END(memset)
|
|
|
147e83 |
libc_hidden_builtin_def (memset)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
|
|
|
147e83 |
index 42ca8da..522c63c 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
|
|
|
147e83 |
@@ -28,17 +28,17 @@
|
|
|
147e83 |
#define IFUNC_RESOLVE(FUNC) \
|
|
|
147e83 |
asm (".globl " #FUNC "\n\t" \
|
|
|
147e83 |
".type " #FUNC ",@gnu_indirect_function\n\t" \
|
|
|
147e83 |
- ".set " #FUNC ",resolve_" #FUNC "\n\t" \
|
|
|
147e83 |
+ ".set " #FUNC ",__resolve_" #FUNC "\n\t" \
|
|
|
147e83 |
".globl __GI_" #FUNC "\n\t" \
|
|
|
147e83 |
".set __GI_" #FUNC "," #FUNC "\n"); \
|
|
|
147e83 |
\
|
|
|
147e83 |
/* Make the declarations of the optimized functions hidden in order
|
|
|
147e83 |
to prevent GOT slots being generated for them. */ \
|
|
|
147e83 |
- extern void *FUNC##_z196 attribute_hidden; \
|
|
|
147e83 |
- extern void *FUNC##_z10 attribute_hidden; \
|
|
|
147e83 |
- extern void *FUNC##_g5 attribute_hidden; \
|
|
|
147e83 |
+ extern void *__##FUNC##_z196 attribute_hidden; \
|
|
|
147e83 |
+ extern void *__##FUNC##_z10 attribute_hidden; \
|
|
|
147e83 |
+ extern void *__##FUNC##_g5 attribute_hidden; \
|
|
|
147e83 |
\
|
|
|
147e83 |
- void *resolve_##FUNC (unsigned long int dl_hwcap) \
|
|
|
147e83 |
+ void *__resolve_##FUNC (unsigned long int dl_hwcap) \
|
|
|
147e83 |
{ \
|
|
|
147e83 |
if ((dl_hwcap & HWCAP_S390_STFLE) \
|
|
|
147e83 |
&& (dl_hwcap & HWCAP_S390_ZARCH) \
|
|
|
147e83 |
@@ -53,11 +53,11 @@
|
|
|
147e83 |
: : "cc"); \
|
|
|
147e83 |
\
|
|
|
147e83 |
if ((stfle_bits & (1ULL << (63 - STFLE_BITS_Z196))) != 0) \
|
|
|
147e83 |
- return &FUNC##_z196; \
|
|
|
147e83 |
+ return &__##FUNC##_z196; \
|
|
|
147e83 |
else if ((stfle_bits & (1ULL << (63 - STFLE_BITS_Z10))) != 0) \
|
|
|
147e83 |
- return &FUNC##_z10; \
|
|
|
147e83 |
+ return &__##FUNC##_z10; \
|
|
|
147e83 |
} \
|
|
|
147e83 |
- return &FUNC##_g5; \
|
|
|
147e83 |
+ return &__##FUNC##_g5; \
|
|
|
147e83 |
}
|
|
|
147e83 |
|
|
|
147e83 |
IFUNC_RESOLVE(memset)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/multiarch/memcmp.S b/sysdeps/s390/s390-32/multiarch/memcmp.S
|
|
|
147e83 |
index 9ca8891..c654d19 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/multiarch/memcmp.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/multiarch/memcmp.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#ifndef NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcmp_z196)
|
|
|
147e83 |
+ENTRY(__memcmp_z196)
|
|
|
147e83 |
.machine "z196"
|
|
|
147e83 |
.machinemode "zarch_nohighgprs"
|
|
|
147e83 |
ltr %r4,%r4
|
|
|
147e83 |
@@ -61,9 +61,9 @@ ENTRY(memcmp_z196)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z196_14:
|
|
|
147e83 |
clc 0(1,%r3),0(%r2)
|
|
|
147e83 |
-END(memcmp_z196)
|
|
|
147e83 |
+END(__memcmp_z196)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcmp_z10)
|
|
|
147e83 |
+ENTRY(__memcmp_z10)
|
|
|
147e83 |
.machine "z10"
|
|
|
147e83 |
.machinemode "zarch_nohighgprs"
|
|
|
147e83 |
ltr %r4,%r4
|
|
|
147e83 |
@@ -90,7 +90,7 @@ ENTRY(memcmp_z10)
|
|
|
147e83 |
j .L_Z10_3
|
|
|
147e83 |
.L_Z10_15:
|
|
|
147e83 |
clc 0(1,%r3),0(%r2)
|
|
|
147e83 |
-END(memcmp_z10)
|
|
|
147e83 |
+END(__memcmp_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -98,7 +98,7 @@ END(memcmp_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NOT_IN_libc
|
|
|
147e83 |
.globl memcmp
|
|
|
147e83 |
-.set memcmp,memcmp_g5
|
|
|
147e83 |
+.set memcmp,__memcmp_g5
|
|
|
147e83 |
.weak bcmp
|
|
|
147e83 |
-.set bcmp,memcmp_g5
|
|
|
147e83 |
+.set bcmp,__memcmp_g5
|
|
|
147e83 |
#endif
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/multiarch/memcpy.S b/sysdeps/s390/s390-32/multiarch/memcpy.S
|
|
|
147e83 |
index 7b85602..5c2113f 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/multiarch/memcpy.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/multiarch/memcpy.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#if defined SHARED && !defined NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcpy_z196)
|
|
|
147e83 |
+ENTRY(__memcpy_z196)
|
|
|
147e83 |
.machine "z196"
|
|
|
147e83 |
.machinemode "zarch_nohighgprs"
|
|
|
147e83 |
llgfr %r4,%r4
|
|
|
147e83 |
@@ -46,7 +46,7 @@ ENTRY(memcpy_z196)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z196_5:
|
|
|
147e83 |
cgfi %r5,262144 # Switch to mvcle for copies >64MB
|
|
|
147e83 |
- jh memcpy_mvcle
|
|
|
147e83 |
+ jh __memcpy_mvcle
|
|
|
147e83 |
.L_Z196_2:
|
|
|
147e83 |
pfd 1,768(%r3)
|
|
|
147e83 |
pfd 2,768(%r1)
|
|
|
147e83 |
@@ -58,9 +58,9 @@ ENTRY(memcpy_z196)
|
|
|
147e83 |
j .L_Z196_3
|
|
|
147e83 |
.L_Z196_14:
|
|
|
147e83 |
mvc 0(1,%r1),0(%r3)
|
|
|
147e83 |
-END(memcpy_z196)
|
|
|
147e83 |
+END(__memcpy_z196)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcpy_z10)
|
|
|
147e83 |
+ENTRY(__memcpy_z10)
|
|
|
147e83 |
.machine "z10"
|
|
|
147e83 |
.machinemode "zarch_nohighgprs"
|
|
|
147e83 |
llgfr %r4,%r4
|
|
|
147e83 |
@@ -75,7 +75,7 @@ ENTRY(memcpy_z10)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z10_13:
|
|
|
147e83 |
cgfi %r5,65535 # Switch to mvcle for copies >16MB
|
|
|
147e83 |
- jh memcpy_mvcle
|
|
|
147e83 |
+ jh __memcpy_mvcle
|
|
|
147e83 |
.L_Z10_12:
|
|
|
147e83 |
pfd 1,768(%r3)
|
|
|
147e83 |
pfd 2,768(%r1)
|
|
|
147e83 |
@@ -86,7 +86,7 @@ ENTRY(memcpy_z10)
|
|
|
147e83 |
j .L_Z10_3
|
|
|
147e83 |
.L_Z10_15:
|
|
|
147e83 |
mvc 0(1,%r1),0(%r3)
|
|
|
147e83 |
-END(memcpy_z10)
|
|
|
147e83 |
+END(__memcpy_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -94,5 +94,5 @@ END(memcpy_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#if !defined SHARED || defined NOT_IN_libc
|
|
|
147e83 |
.globl memcpy
|
|
|
147e83 |
-.set memcpy,memcpy_g5
|
|
|
147e83 |
+.set memcpy,__memcpy_g5
|
|
|
147e83 |
#endif
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-32/multiarch/memset.S b/sysdeps/s390/s390-32/multiarch/memset.S
|
|
|
147e83 |
index ba43d67..54aa028 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-32/multiarch/memset.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-32/multiarch/memset.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#ifndef NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memset_z196)
|
|
|
147e83 |
+ENTRY(__memset_z196)
|
|
|
147e83 |
.machine "z196"
|
|
|
147e83 |
.machinemode "zarch_nohighgprs"
|
|
|
147e83 |
llgfr %r4,%r4
|
|
|
147e83 |
@@ -49,7 +49,7 @@ ENTRY(memset_z196)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z196_1:
|
|
|
147e83 |
cgfi %r5,1048576
|
|
|
147e83 |
- jh memset_mvcle # Switch to mvcle for >256MB
|
|
|
147e83 |
+ jh __memset_mvcle # Switch to mvcle for >256MB
|
|
|
147e83 |
.L_Z196_2:
|
|
|
147e83 |
pfd 2,1024(%r1)
|
|
|
147e83 |
mvc 1(256,%r1),0(%r1)
|
|
|
147e83 |
@@ -59,9 +59,9 @@ ENTRY(memset_z196)
|
|
|
147e83 |
j .L_Z196_3
|
|
|
147e83 |
.L_Z196_17:
|
|
|
147e83 |
mvc 1(1,%r1),0(%r1)
|
|
|
147e83 |
-END(memset_z196)
|
|
|
147e83 |
+END(__memset_z196)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memset_z10)
|
|
|
147e83 |
+ENTRY(__memset_z10)
|
|
|
147e83 |
.machine "z10"
|
|
|
147e83 |
.machinemode "zarch_nohighgprs"
|
|
|
147e83 |
llgfr %r4,%r4
|
|
|
147e83 |
@@ -78,7 +78,7 @@ ENTRY(memset_z10)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z10_15:
|
|
|
147e83 |
cgfi %r5,163840 # Switch to mvcle for >40MB
|
|
|
147e83 |
- jh memset_mvcle
|
|
|
147e83 |
+ jh __memset_mvcle
|
|
|
147e83 |
.L_Z10_14:
|
|
|
147e83 |
pfd 2,1024(%r1)
|
|
|
147e83 |
mvc 1(256,%r1),0(%r1)
|
|
|
147e83 |
@@ -87,9 +87,9 @@ ENTRY(memset_z10)
|
|
|
147e83 |
j .L_Z10_3
|
|
|
147e83 |
.L_Z10_18:
|
|
|
147e83 |
mvc 1(1,%r1),0(%r1)
|
|
|
147e83 |
-END(memset_z10)
|
|
|
147e83 |
+END(__memset_z10)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memset_mvcle)
|
|
|
147e83 |
+ENTRY(__memset_mvcle)
|
|
|
147e83 |
ahi %r4,2 # take back the change done by the caller
|
|
|
147e83 |
lr %r0,%r2 # save source address
|
|
|
147e83 |
lr %r1,%r3 # move pad byte to R1
|
|
|
147e83 |
@@ -101,7 +101,7 @@ ENTRY(memset_mvcle)
|
|
|
147e83 |
lr %r2,%r0 # return value is source address
|
|
|
147e83 |
.L1:
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
-END(memset_mvcle)
|
|
|
147e83 |
+END(__memset_mvcle)
|
|
|
147e83 |
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -109,5 +109,5 @@ END(memset_mvcle)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NOT_IN_libc
|
|
|
147e83 |
.globl memset
|
|
|
147e83 |
-.set memset,memset_g5
|
|
|
147e83 |
+.set memset,__memset_g5
|
|
|
147e83 |
#endif
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/memcmp.S b/sysdeps/s390/s390-64/memcmp.S
|
|
|
147e83 |
index 1b43440..eb5370f 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/memcmp.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/memcmp.S
|
|
|
147e83 |
@@ -27,7 +27,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
.text
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-ENTRY(memcmp_z900)
|
|
|
147e83 |
+ENTRY(__memcmp_z900)
|
|
|
147e83 |
#else
|
|
|
147e83 |
ENTRY(memcmp)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
@@ -56,7 +56,7 @@ ENTRY(memcmp)
|
|
|
147e83 |
.L_Z900_15:
|
|
|
147e83 |
clc 0(1,%r3),0(%r2)
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-END(memcmp_z900)
|
|
|
147e83 |
+END(__memcmp_z900)
|
|
|
147e83 |
#else
|
|
|
147e83 |
END(memcmp)
|
|
|
147e83 |
libc_hidden_builtin_def (memcmp)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/memcpy.S b/sysdeps/s390/s390-64/memcpy.S
|
|
|
147e83 |
index bae8836..61fca0b 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/memcpy.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/memcpy.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
.text
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-ENTRY(memcpy_z900)
|
|
|
147e83 |
+ENTRY(__memcpy_z900)
|
|
|
147e83 |
#else
|
|
|
147e83 |
ENTRY(memcpy)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
@@ -48,7 +48,7 @@ ENTRY(memcpy)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z900_13:
|
|
|
147e83 |
chi %r5,4096 # Switch to mvcle for copies >1MB
|
|
|
147e83 |
- jh memcpy_mvcle
|
|
|
147e83 |
+ jh __memcpy_mvcle
|
|
|
147e83 |
.L_Z900_12:
|
|
|
147e83 |
mvc 0(256,%r1),0(%r3)
|
|
|
147e83 |
la %r1,256(%r1)
|
|
|
147e83 |
@@ -59,13 +59,13 @@ ENTRY(memcpy)
|
|
|
147e83 |
mvc 0(1,%r1),0(%r3)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-END(memcpy_z900)
|
|
|
147e83 |
+END(__memcpy_z900)
|
|
|
147e83 |
#else
|
|
|
147e83 |
END(memcpy)
|
|
|
147e83 |
libc_hidden_builtin_def (memcpy)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcpy_mvcle)
|
|
|
147e83 |
+ENTRY(__memcpy_mvcle)
|
|
|
147e83 |
# Using as standalone function will result in unexpected
|
|
|
147e83 |
# results since the length field is incremented by 1 in order to
|
|
|
147e83 |
# compensate the changes already done in the functions above.
|
|
|
147e83 |
@@ -78,4 +78,4 @@ ENTRY(memcpy_mvcle)
|
|
|
147e83 |
jo .L_MVCLE_1
|
|
|
147e83 |
lgr %r2,%r1 # return destination address
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
-END(memcpy_mvcle)
|
|
|
147e83 |
+END(__memcpy_mvcle)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/memset.S b/sysdeps/s390/s390-64/memset.S
|
|
|
147e83 |
index 4edfb4e..8185e94 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/memset.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/memset.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
.text
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-ENTRY(memset_z900)
|
|
|
147e83 |
+ENTRY(__memset_z900)
|
|
|
147e83 |
#else
|
|
|
147e83 |
ENTRY(memset)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
@@ -57,7 +57,7 @@ ENTRY(memset)
|
|
|
147e83 |
.L_Z900_18:
|
|
|
147e83 |
mvc 1(1,%r1),0(%r1)
|
|
|
147e83 |
#ifdef USE_MULTIARCH
|
|
|
147e83 |
-END(memset_z900)
|
|
|
147e83 |
+END(__memset_z900)
|
|
|
147e83 |
#else
|
|
|
147e83 |
END(memset)
|
|
|
147e83 |
libc_hidden_builtin_def (memset)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
|
|
|
147e83 |
index 8db2c38..b6be970 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
|
|
|
147e83 |
@@ -28,17 +28,17 @@
|
|
|
147e83 |
#define IFUNC_RESOLVE(FUNC) \
|
|
|
147e83 |
asm (".globl " #FUNC "\n\t" \
|
|
|
147e83 |
".type " #FUNC ",@gnu_indirect_function\n\t" \
|
|
|
147e83 |
- ".set " #FUNC ",resolve_" #FUNC "\n\t" \
|
|
|
147e83 |
+ ".set " #FUNC ",__resolve_" #FUNC "\n\t" \
|
|
|
147e83 |
".globl __GI_" #FUNC "\n\t" \
|
|
|
147e83 |
".set __GI_" #FUNC "," #FUNC "\n"); \
|
|
|
147e83 |
\
|
|
|
147e83 |
/* Make the declarations of the optimized functions hidden in order
|
|
|
147e83 |
to prevent GOT slots being generated for them. */ \
|
|
|
147e83 |
- extern void *FUNC##_z196 attribute_hidden; \
|
|
|
147e83 |
- extern void *FUNC##_z10 attribute_hidden; \
|
|
|
147e83 |
- extern void *FUNC##_z900 attribute_hidden; \
|
|
|
147e83 |
+ extern void *__##FUNC##_z196 attribute_hidden; \
|
|
|
147e83 |
+ extern void *__##FUNC##_z10 attribute_hidden; \
|
|
|
147e83 |
+ extern void *__##FUNC##_z900 attribute_hidden; \
|
|
|
147e83 |
\
|
|
|
147e83 |
- void *resolve_##FUNC (unsigned long int dl_hwcap) \
|
|
|
147e83 |
+ void *__resolve_##FUNC (unsigned long int dl_hwcap) \
|
|
|
147e83 |
{ \
|
|
|
147e83 |
if (dl_hwcap & HWCAP_S390_STFLE) \
|
|
|
147e83 |
{ \
|
|
|
147e83 |
@@ -54,14 +54,14 @@
|
|
|
147e83 |
: : "cc"); \
|
|
|
147e83 |
\
|
|
|
147e83 |
if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z196))) != 0) \
|
|
|
147e83 |
- return &FUNC##_z196; \
|
|
|
147e83 |
+ return &__##FUNC##_z196; \
|
|
|
147e83 |
else if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z10))) != 0) \
|
|
|
147e83 |
- return &FUNC##_z10; \
|
|
|
147e83 |
+ return &__##FUNC##_z10; \
|
|
|
147e83 |
else \
|
|
|
147e83 |
- return &FUNC##_z900; \
|
|
|
147e83 |
+ return &__##FUNC##_z900; \
|
|
|
147e83 |
} \
|
|
|
147e83 |
else \
|
|
|
147e83 |
- return &FUNC##_z900; \
|
|
|
147e83 |
+ return &__##FUNC##_z900; \
|
|
|
147e83 |
}
|
|
|
147e83 |
|
|
|
147e83 |
IFUNC_RESOLVE(memset)
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.S b/sysdeps/s390/s390-64/multiarch/memcmp.S
|
|
|
147e83 |
index f40a3c1..9a8cba8 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/multiarch/memcmp.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/multiarch/memcmp.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#ifndef NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcmp_z196)
|
|
|
147e83 |
+ENTRY(__memcmp_z196)
|
|
|
147e83 |
.machine "z196"
|
|
|
147e83 |
ltgr %r4,%r4
|
|
|
147e83 |
je .L_Z196_4
|
|
|
147e83 |
@@ -60,9 +60,9 @@ ENTRY(memcmp_z196)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z196_14:
|
|
|
147e83 |
clc 0(1,%r3),0(%r2)
|
|
|
147e83 |
-END(memcmp_z196)
|
|
|
147e83 |
+END(__memcmp_z196)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcmp_z10)
|
|
|
147e83 |
+ENTRY(__memcmp_z10)
|
|
|
147e83 |
.machine "z10"
|
|
|
147e83 |
ltgr %r4,%r4
|
|
|
147e83 |
je .L_Z10_4
|
|
|
147e83 |
@@ -87,7 +87,7 @@ ENTRY(memcmp_z10)
|
|
|
147e83 |
j .L_Z10_3
|
|
|
147e83 |
.L_Z10_15:
|
|
|
147e83 |
clc 0(1,%r3),0(%r2)
|
|
|
147e83 |
-END(memcmp_z10)
|
|
|
147e83 |
+END(__memcmp_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -95,7 +95,7 @@ END(memcmp_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NOT_IN_libc
|
|
|
147e83 |
.globl memcmp
|
|
|
147e83 |
-.set memcmp,memcmp_z900
|
|
|
147e83 |
+.set memcmp,__memcmp_z900
|
|
|
147e83 |
.weak bcmp
|
|
|
147e83 |
-.set bcmp,memcmp_z900
|
|
|
147e83 |
+.set bcmp,__memcmp_z900
|
|
|
147e83 |
#endif
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/multiarch/memcpy.S b/sysdeps/s390/s390-64/multiarch/memcpy.S
|
|
|
147e83 |
index b00ffc1..525588f 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/multiarch/memcpy.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/multiarch/memcpy.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#if defined SHARED && !defined NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcpy_z196)
|
|
|
147e83 |
+ENTRY(__memcpy_z196)
|
|
|
147e83 |
.machine "z196"
|
|
|
147e83 |
ltgr %r4,%r4
|
|
|
147e83 |
je .L_Z196_4
|
|
|
147e83 |
@@ -44,7 +44,7 @@ ENTRY(memcpy_z196)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z196_5:
|
|
|
147e83 |
cgfi %r5,262144 # Switch to mvcle for copies >64MB
|
|
|
147e83 |
- jh memcpy_mvcle
|
|
|
147e83 |
+ jh __memcpy_mvcle
|
|
|
147e83 |
.L_Z196_2:
|
|
|
147e83 |
pfd 1,768(%r3)
|
|
|
147e83 |
pfd 2,768(%r1)
|
|
|
147e83 |
@@ -56,9 +56,9 @@ ENTRY(memcpy_z196)
|
|
|
147e83 |
j .L_Z196_3
|
|
|
147e83 |
.L_Z196_14:
|
|
|
147e83 |
mvc 0(1,%r1),0(%r3)
|
|
|
147e83 |
-END(memcpy_z196)
|
|
|
147e83 |
+END(__memcpy_z196)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memcpy_z10)
|
|
|
147e83 |
+ENTRY(__memcpy_z10)
|
|
|
147e83 |
.machine "z10"
|
|
|
147e83 |
cgije %r4,0,.L_Z10_4
|
|
|
147e83 |
aghi %r4,-1
|
|
|
147e83 |
@@ -71,7 +71,7 @@ ENTRY(memcpy_z10)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z10_13:
|
|
|
147e83 |
cgfi %r5,65535 # Switch to mvcle for copies >16MB
|
|
|
147e83 |
- jh memcpy_mvcle
|
|
|
147e83 |
+ jh __memcpy_mvcle
|
|
|
147e83 |
.L_Z10_12:
|
|
|
147e83 |
pfd 1,768(%r3)
|
|
|
147e83 |
pfd 2,768(%r1)
|
|
|
147e83 |
@@ -82,7 +82,7 @@ ENTRY(memcpy_z10)
|
|
|
147e83 |
j .L_Z10_3
|
|
|
147e83 |
.L_Z10_15:
|
|
|
147e83 |
mvc 0(1,%r1),0(%r3)
|
|
|
147e83 |
-END(memcpy_z10)
|
|
|
147e83 |
+END(__memcpy_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -90,5 +90,5 @@ END(memcpy_z10)
|
|
|
147e83 |
|
|
|
147e83 |
#if !defined SHARED || defined NOT_IN_libc
|
|
|
147e83 |
.globl memcpy
|
|
|
147e83 |
-.set memcpy,memcpy_z900
|
|
|
147e83 |
+.set memcpy,__memcpy_z900
|
|
|
147e83 |
#endif
|
|
|
147e83 |
diff --git a/sysdeps/s390/s390-64/multiarch/memset.S b/sysdeps/s390/s390-64/multiarch/memset.S
|
|
|
147e83 |
index 1f9064d..8dbb3cb 100644
|
|
|
147e83 |
--- a/sysdeps/s390/s390-64/multiarch/memset.S
|
|
|
147e83 |
+++ b/sysdeps/s390/s390-64/multiarch/memset.S
|
|
|
147e83 |
@@ -29,7 +29,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#ifndef NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memset_z196)
|
|
|
147e83 |
+ENTRY(__memset_z196)
|
|
|
147e83 |
.machine "z196"
|
|
|
147e83 |
ltgr %r4,%r4
|
|
|
147e83 |
je .L_Z196_4
|
|
|
147e83 |
@@ -47,7 +47,7 @@ ENTRY(memset_z196)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z196_1:
|
|
|
147e83 |
cgfi %r5,1048576
|
|
|
147e83 |
- jh memset_mvcle # Switch to mvcle for >256MB
|
|
|
147e83 |
+ jh __memset_mvcle # Switch to mvcle for >256MB
|
|
|
147e83 |
.L_Z196_2:
|
|
|
147e83 |
pfd 2,1024(%r1)
|
|
|
147e83 |
mvc 1(256,%r1),0(%r1)
|
|
|
147e83 |
@@ -57,9 +57,9 @@ ENTRY(memset_z196)
|
|
|
147e83 |
j .L_Z196_3
|
|
|
147e83 |
.L_Z196_17:
|
|
|
147e83 |
mvc 1(1,%r1),0(%r1)
|
|
|
147e83 |
-END(memset_z196)
|
|
|
147e83 |
+END(__memset_z196)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memset_z10)
|
|
|
147e83 |
+ENTRY(__memset_z10)
|
|
|
147e83 |
.machine "z10"
|
|
|
147e83 |
cgije %r4,0,.L_Z10_4
|
|
|
147e83 |
stc %r3,0(%r2)
|
|
|
147e83 |
@@ -74,7 +74,7 @@ ENTRY(memset_z10)
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
.L_Z10_15:
|
|
|
147e83 |
cgfi %r5,163840 # Switch to mvcle for >40MB
|
|
|
147e83 |
- jh memset_mvcle
|
|
|
147e83 |
+ jh __memset_mvcle
|
|
|
147e83 |
.L_Z10_14:
|
|
|
147e83 |
pfd 2,1024(%r1)
|
|
|
147e83 |
mvc 1(256,%r1),0(%r1)
|
|
|
147e83 |
@@ -83,9 +83,9 @@ ENTRY(memset_z10)
|
|
|
147e83 |
j .L_Z10_3
|
|
|
147e83 |
.L_Z10_18:
|
|
|
147e83 |
mvc 1(1,%r1),0(%r1)
|
|
|
147e83 |
-END(memset_z10)
|
|
|
147e83 |
+END(__memset_z10)
|
|
|
147e83 |
|
|
|
147e83 |
-ENTRY(memset_mvcle)
|
|
|
147e83 |
+ENTRY(__memset_mvcle)
|
|
|
147e83 |
aghi %r4,2 # take back the change done by the caller
|
|
|
147e83 |
lgr %r0,%r2 # save source address
|
|
|
147e83 |
lgr %r1,%r3 # move pad byte to R1
|
|
|
147e83 |
@@ -97,7 +97,7 @@ ENTRY(memset_mvcle)
|
|
|
147e83 |
lgr %r2,%r0 # return value is source address
|
|
|
147e83 |
.L1:
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
-END(memset_mvcle)
|
|
|
147e83 |
+END(__memset_mvcle)
|
|
|
147e83 |
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -105,5 +105,5 @@ END(memset_mvcle)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NOT_IN_libc
|
|
|
147e83 |
.globl memset
|
|
|
147e83 |
-.set memset,memset_z900
|
|
|
147e83 |
+.set memset,__memset_z900
|
|
|
147e83 |
#endif
|
|
|
147e83 |
--
|
|
|
147e83 |
2.3.0
|
|
|
147e83 |
|