diff options
| author | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:25 +0100 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.ibm.com> | 2018-12-18 13:57:25 +0100 |
| commit | 80190d2b0e3f48d973724218f37d2da5bf1a20ab (patch) | |
| tree | 06d6f856c2054d3c1b817fd369ab59f95d9d592f /sysdeps/s390/multiarch | |
| parent | 12f0dcb8da2c7c74d673583ec3286c0354273f52 (diff) | |
| download | glibc-80190d2b0e3f48d973724218f37d2da5bf1a20ab.tar.gz glibc-80190d2b0e3f48d973724218f37d2da5bf1a20ab.tar.xz glibc-80190d2b0e3f48d973724218f37d2da5bf1a20ab.zip | |
S390: Cleanup ifunc-resolve.h.
The ifunc macros s390_vx_libc* are no longer used and can be removed as all users are now relying on s390_libc_ifunc_expr. The same applies to s390_libc_ifunc. The macro s390_libc_ifunc_init is now renamed to s390_libc_ifunc_expr_stfle_init and the users are adjusted accordingly. ChangeLog: * sysdeps/s390/multiarch/ifunc-resolve.h (s390_vx_libc_ifunc, s390_vx_libc_ifunc_redirected, s390_vx_libc_ifunc2, s390_vx_libc_ifunc_init, s390_vx_libc_ifunc2_redirected, s390_libc_ifunc): Delete macro definition. (s390_libc_ifunc_init): Rename to s390_libc_ifunc_expr_stfle_init. * sysdeps/s390/bzero: Use s390_libc_ifunc_expr_stfle_init instead of s390_libc_ifunc_init. * sysdeps/s390/memcmp.c: Likewise. * sysdeps/s390/memcpy.c: Likewise. * sysdeps/s390/mempcpy.c: Likewise. * sysdeps/s390/memset.c: Likewise.
Diffstat (limited to 'sysdeps/s390/multiarch')
| -rw-r--r-- | sysdeps/s390/multiarch/ifunc-resolve.h | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/sysdeps/s390/multiarch/ifunc-resolve.h b/sysdeps/s390/multiarch/ifunc-resolve.h index b7e20abc59..b2be015401 100644 --- a/sysdeps/s390/multiarch/ifunc-resolve.h +++ b/sysdeps/s390/multiarch/ifunc-resolve.h @@ -40,7 +40,7 @@ ".machine pop" "\n" \ : "=QS" (STFLE_BITS), "+d" (reg0) \ : : "cc"); -#define s390_libc_ifunc_init() \ +#define s390_libc_ifunc_expr_stfle_init() \ unsigned long long stfle_bits = 0ULL; \ if (__glibc_likely ((hwcap & HWCAP_S390_STFLE) \ && (hwcap & HWCAP_S390_ZARCH) \ @@ -49,41 +49,6 @@ S390_STORE_STFLE (stfle_bits); \ } -#define s390_libc_ifunc(TYPE_FUNC, RESOLVERFUNC, FUNC) \ - /* Make the declarations of the optimized functions hidden in order - to prevent GOT slots being generated for them. */ \ - extern __typeof (TYPE_FUNC) RESOLVERFUNC##_z196 attribute_hidden; \ - extern __typeof (TYPE_FUNC) RESOLVERFUNC##_z10 attribute_hidden; \ - extern __typeof (TYPE_FUNC) RESOLVERFUNC##_default attribute_hidden; \ - __ifunc (TYPE_FUNC, FUNC, \ - __glibc_likely (S390_IS_Z196 (stfle_bits)) \ - ? RESOLVERFUNC##_z196 \ - : __glibc_likely (S390_IS_Z10 (stfle_bits)) \ - ? RESOLVERFUNC##_z10 \ - : RESOLVERFUNC##_default, \ - unsigned long int hwcap, s390_libc_ifunc_init); - -#define s390_vx_libc_ifunc(FUNC) \ - s390_vx_libc_ifunc2_redirected(FUNC, FUNC, FUNC) - -#define s390_vx_libc_ifunc_redirected(TYPE_FUNC, FUNC) \ - s390_vx_libc_ifunc2_redirected(TYPE_FUNC, FUNC, FUNC) - -#define s390_vx_libc_ifunc2(RESOLVERFUNC, FUNC) \ - s390_vx_libc_ifunc2_redirected(FUNC, RESOLVERFUNC, FUNC) - -#define s390_vx_libc_ifunc_init() -#define s390_vx_libc_ifunc2_redirected(TYPE_FUNC, RESOLVERFUNC, FUNC) \ - /* Make the declarations of the optimized functions hidden in order - to prevent GOT slots being generated for them. */ \ - extern __typeof (TYPE_FUNC) RESOLVERFUNC##_vx attribute_hidden; \ - extern __typeof (TYPE_FUNC) RESOLVERFUNC##_c attribute_hidden; \ - __ifunc (TYPE_FUNC, FUNC, \ - (hwcap & HWCAP_S390_VX) \ - ? RESOLVERFUNC##_vx \ - : RESOLVERFUNC##_c, \ - unsigned long int hwcap, s390_vx_libc_ifunc_init); - #define s390_libc_ifunc_expr_init() #define s390_libc_ifunc_expr(TYPE_FUNC, FUNC, EXPR) \ __ifunc (TYPE_FUNC, FUNC, EXPR, unsigned long int hwcap, \ |