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.
This commit is contained in:
Stefan Liebler
parent
12f0dcb8da
commit
80190d2b0e
17
ChangeLog
17
ChangeLog
@ -1,3 +1,20 @@
|
||||
2018-12-18 Stefan Liebler <stli@linux.ibm.com>
|
||||
|
||||
* 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.
|
||||
|
||||
2018-12-18 Stefan Liebler <stli@linux.ibm.com>
|
||||
|
||||
* sysdeps/s390/multiarch/gconv_simple.c (ICONV_VX_IFUNC):
|
||||
|
||||
@ -35,7 +35,7 @@ extern __typeof (__bzero) BZERO_Z196 attribute_hidden;
|
||||
|
||||
s390_libc_ifunc_expr (__bzero, __bzero,
|
||||
({
|
||||
s390_libc_ifunc_init ();
|
||||
s390_libc_ifunc_expr_stfle_init ();
|
||||
(HAVE_MEMSET_Z196 && S390_IS_Z196 (stfle_bits))
|
||||
? BZERO_Z196
|
||||
: (HAVE_MEMSET_Z10 && S390_IS_Z10 (stfle_bits))
|
||||
|
||||
@ -37,7 +37,7 @@ extern __typeof (__redirect_memcmp) MEMCMP_Z196 attribute_hidden;
|
||||
|
||||
s390_libc_ifunc_expr (__redirect_memcmp, memcmp,
|
||||
({
|
||||
s390_libc_ifunc_init ();
|
||||
s390_libc_ifunc_expr_stfle_init ();
|
||||
(HAVE_MEMCMP_Z196 && S390_IS_Z196 (stfle_bits))
|
||||
? MEMCMP_Z196
|
||||
: (HAVE_MEMCMP_Z10 && S390_IS_Z10 (stfle_bits))
|
||||
|
||||
@ -38,7 +38,7 @@ extern __typeof (__redirect_memcpy) MEMCPY_Z196 attribute_hidden;
|
||||
|
||||
s390_libc_ifunc_expr (__redirect_memcpy, memcpy,
|
||||
({
|
||||
s390_libc_ifunc_init ();
|
||||
s390_libc_ifunc_expr_stfle_init ();
|
||||
(HAVE_MEMCPY_Z196 && S390_IS_Z196 (stfle_bits))
|
||||
? MEMCPY_Z196
|
||||
: (HAVE_MEMCPY_Z10 && S390_IS_Z10 (stfle_bits))
|
||||
|
||||
@ -42,7 +42,7 @@ extern __typeof (__redirect___mempcpy) MEMPCPY_Z196 attribute_hidden;
|
||||
|
||||
s390_libc_ifunc_expr (__redirect___mempcpy, __mempcpy,
|
||||
({
|
||||
s390_libc_ifunc_init ();
|
||||
s390_libc_ifunc_expr_stfle_init ();
|
||||
(HAVE_MEMCPY_Z196 && S390_IS_Z196 (stfle_bits))
|
||||
? MEMPCPY_Z196
|
||||
: (HAVE_MEMCPY_Z10 && S390_IS_Z10 (stfle_bits))
|
||||
|
||||
@ -37,7 +37,7 @@ extern __typeof (__redirect_memset) MEMSET_Z196 attribute_hidden;
|
||||
|
||||
s390_libc_ifunc_expr (__redirect_memset, memset,
|
||||
({
|
||||
s390_libc_ifunc_init ();
|
||||
s390_libc_ifunc_expr_stfle_init ();
|
||||
(HAVE_MEMSET_Z196 && S390_IS_Z196 (stfle_bits))
|
||||
? MEMSET_Z196
|
||||
: (HAVE_MEMSET_Z10 && S390_IS_Z10 (stfle_bits))
|
||||
|
||||
@ -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, \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user