File 0047-S390-Cleanup-ifunc-resolve.h.patch of Package glibc.i686.11089

Overview Repositories Revisions Requests Users Attributes Meta

File 0047-S390-Cleanup-ifunc-resolve.h.patch of Package glibc.i686.11089

2018-12-18  Stefan Liebler  <stli@linux.ibm.com>

* sysdeps/s390/multiarch/ifunc-resolve.h
	(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.

Index: glibc-2.22/sysdeps/s390/memcpy.c
===================================================================
--- glibc-2.22.orig/sysdeps/s390/memcpy.c
+++ glibc-2.22/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.22/sysdeps/s390/mempcpy.c
===================================================================
--- glibc-2.22.orig/sysdeps/s390/mempcpy.c
+++ glibc-2.22/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.22/sysdeps/s390/multiarch/ifunc-resolve.h
===================================================================
--- glibc-2.22.orig/sysdeps/s390/multiarch/ifunc-resolve.h
+++ glibc-2.22/sysdeps/s390/multiarch/ifunc-resolve.h
@@ -41,7 +41,7 @@
 	       : "=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)			\
@@ -62,7 +62,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)

Places

File 0047-S390-Cleanup-ifunc-resolve.h.patch of Package glibc.i686.11089

Places