From: Stefan Liebler <stli@linux.ibm.com>
Date: Wed, 6 Feb 2019 08:10:31 +0000 (+0100)
Subject: S390: Fix introduction of __wmemcmp and weak wmemcmp symbols.
X-Git-Tag: glibc-2.30~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94eeeec04be8efae1a85d7c224e0026ee18ee6e7;p=thirdparty%2Fglibc.git

S390: Fix introduction of __wmemcmp and weak wmemcmp symbols.

The recent commit 65f7767a914144ae303f7b9ae81865061793dcb9
has introduced __wmemcmp and the weak alias wmemcmp.
This patch also introduces those symbols if glibc is build
with CFLAGS="-march=z13" where the ifunc is omitted.

ChangeLog:

	* sysdeps/s390/wmemcmp-vx.S: Add strong alias to
	__wmemcmp and weak alias to wmemcmp.
---

diff --git a/ChangeLog b/ChangeLog
index 4988b0c6320..3de4ca1f103 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-06  Stefan Liebler  <stli@linux.ibm.com>
+
+	* sysdeps/s390/wmemcmp-vx.S: Add strong alias to
+	__wmemcmp and weak alias to wmemcmp.
+
 2019-02-06  Stefan Liebler  <stli@linux.ibm.com>
 
 	[BZ #23403]
diff --git a/sysdeps/s390/wmemcmp-vx.S b/sysdeps/s390/wmemcmp-vx.S
index f40603bfb54..1baf9133c35 100644
--- a/sysdeps/s390/wmemcmp-vx.S
+++ b/sysdeps/s390/wmemcmp-vx.S
@@ -149,6 +149,7 @@ ENTRY(WMEMCMP_Z13)
 END(WMEMCMP_Z13)
 
 # if ! HAVE_WMEMCMP_IFUNC
-strong_alias (WMEMCMP_Z13, wmemcmp)
+strong_alias (WMEMCMP_Z13, __wmemcmp)
+weak_alias (__wmemcmp, wmemcmp)
 # endif
 #endif