diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-18 16:44:23 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-18 16:44:23 +0000 |
commit | 8751114637bcc3caaf16a4216da0afb84456558a (patch) | |
tree | f3eca66b88003bc49c309a95827d461ae5b66aed /libc/sysdeps/s390 | |
parent | b261131fe2b94b53fe4950d9265ae10bef228455 (diff) |
Merge changes between r22552 and r22663 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22664 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/s390')
-rw-r--r-- | libc/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c | 6 | ||||
-rw-r--r-- | libc/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libc/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c b/libc/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c index fcbd15e26..d57a907df 100644 --- a/libc/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c +++ b/libc/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c @@ -34,9 +34,9 @@ \ /* Make the declarations of the optimized functions hidden in order to prevent GOT slots being generated for them. */ \ - extern __attribute__((visibility("hidden"))) void *FUNC##_z196; \ - extern __attribute__((visibility("hidden"))) void *FUNC##_z10; \ - extern __attribute__((visibility("hidden"))) void *FUNC##_g5; \ + extern void *FUNC##_z196 attribute_hidden; \ + extern void *FUNC##_z10 attribute_hidden; \ + extern void *FUNC##_g5 attribute_hidden; \ \ void *resolve_##FUNC (unsigned long int dl_hwcap) \ { \ diff --git a/libc/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c b/libc/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c index 256179b26..14d9c13eb 100644 --- a/libc/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c +++ b/libc/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c @@ -34,9 +34,9 @@ \ /* Make the declarations of the optimized functions hidden in order to prevent GOT slots being generated for them. */ \ - extern __attribute__((visibility("hidden"))) void *FUNC##_z196; \ - extern __attribute__((visibility("hidden"))) void *FUNC##_z10; \ - extern __attribute__((visibility("hidden"))) void *FUNC##_z900; \ + 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) \ { \ |