File 0011-S390-Cleanup-ifunc-resolve.h.patch of Package glibc.15121
From aee73851877662eab608fa900262cbd98dc9c343 Mon Sep 17 00:00:00 2001
From: Stefan Liebler <stli@linux.ibm.com>
Date: Mon, 1 Jul 2019 13:59:10 +0200
Subject: [PATCH 11/18] S390: Cleanup ifunc-resolve.h.
Note: the following part is not cherry-picked.
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.
Note: the following part is cherry-picked.
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.
(cherry picked from commit 80190d2b0e3f48d973724218f37d2da5bf1a20ab)
Note: only the part of renaming s390_libc_ifunc_init to
s390_libc_ifunc_expr_stfle_init.
---
sysdeps/s390/memcpy.c | 2 +-
sysdeps/s390/mempcpy.c | 2 +-
sysdeps/s390/multiarch/ifunc-resolve.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: glibc-2.26/sysdeps/s390/memcpy.c
===================================================================
--- glibc-2.26.orig/sysdeps/s390/memcpy.c
+++ glibc-2.26/sysdeps/s390/memcpy.c
@@ -38,7 +38,7 @@ extern __typeof (__redirect_memcpy) MEMC
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))
Index: glibc-2.26/sysdeps/s390/mempcpy.c
===================================================================
--- glibc-2.26.orig/sysdeps/s390/mempcpy.c
+++ glibc-2.26/sysdeps/s390/mempcpy.c
@@ -42,7 +42,7 @@ extern __typeof (__redirect___mempcpy) M
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))
Index: glibc-2.26/sysdeps/s390/multiarch/ifunc-resolve.h
===================================================================
--- glibc-2.26.orig/sysdeps/s390/multiarch/ifunc-resolve.h
+++ glibc-2.26/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) \
@@ -61,7 +61,7 @@
: __glibc_likely (S390_IS_Z10 (stfle_bits)) \
? RESOLVERFUNC##_z10 \
: RESOLVERFUNC##_default, \
- unsigned long int hwcap, s390_libc_ifunc_init);
+ unsigned long int hwcap, s390_libc_ifunc_expr_stfle_init);
#define s390_vx_libc_ifunc(FUNC) \
s390_vx_libc_ifunc2_redirected(FUNC, FUNC, FUNC)
