diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2015-01-16 09:17:32 +0100 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2015-01-16 09:17:32 +0100 |
| commit | 1d53248326dbd3c620a2bca16d35eff3019d900a (patch) | |
| tree | 0a1fc9df0fd77039c5086acbcbe98183cfb64521 /sysdeps/s390/s390-64/multiarch/ifunc-resolve.c | |
| parent | 53fbd16918791258ebc1684b1a1afd543b814780 (diff) | |
| download | glibc-1d53248326dbd3c620a2bca16d35eff3019d900a.tar.gz | |
S390: Get rid of linknamespace failures for string functions.
Diffstat (limited to 'sysdeps/s390/s390-64/multiarch/ifunc-resolve.c')
| -rw-r--r-- | sysdeps/s390/s390-64/multiarch/ifunc-resolve.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c index fce8ef6401..b303304f31 100644 --- a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c +++ b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c @@ -28,17 +28,17 @@ #define IFUNC_RESOLVE(FUNC) \ asm (".globl " #FUNC "\n\t" \ ".type " #FUNC ",@gnu_indirect_function\n\t" \ - ".set " #FUNC ",resolve_" #FUNC "\n\t" \ + ".set " #FUNC ",__resolve_" #FUNC "\n\t" \ ".globl __GI_" #FUNC "\n\t" \ ".set __GI_" #FUNC "," #FUNC "\n"); \ \ /* Make the declarations of the optimized functions hidden in order to prevent GOT slots being generated for them. */ \ - extern void *FUNC##_z196 attribute_hidden; \ - extern void *FUNC##_z10 attribute_hidden; \ - extern void *FUNC##_z900 attribute_hidden; \ + extern void *__##FUNC##_z196 attribute_hidden; \ + extern void *__##FUNC##_z10 attribute_hidden; \ + extern void *__##FUNC##_z900 attribute_hidden; \ \ - void *resolve_##FUNC (unsigned long int dl_hwcap) \ + void *__resolve_##FUNC (unsigned long int dl_hwcap) \ { \ if (dl_hwcap & HWCAP_S390_STFLE) \ { \ @@ -54,14 +54,14 @@ : : "cc"); \ \ if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z196))) != 0) \ - return &FUNC##_z196; \ + return &__##FUNC##_z196; \ else if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z10))) != 0) \ - return &FUNC##_z10; \ + return &__##FUNC##_z10; \ else \ - return &FUNC##_z900; \ + return &__##FUNC##_z900; \ } \ else \ - return &FUNC##_z900; \ + return &__##FUNC##_z900; \ } IFUNC_RESOLVE(memset) |