From: Stefan Liebler <stli@linux.ibm.com>
Date: Fri, 1 Mar 2019 15:30:30 +0000 (+0100)
Subject: S390: Fix introduction of __wcscpy and weak wcscpy symbols.
X-Git-Tag: glibc-2.30~313
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=928b305d3f6773b6a8cd1202da4f7d5d9a654456;p=thirdparty%2Fglibc.git

S390: Fix introduction of __wcscpy and weak wcscpy symbols.

The recent commit 81a14439417552324ec6ca71f65ddf8e7cdd51c7
has introduced __wcscpy, __GI___wcscpy and the weak alias wcscpy.
This patch also introduces those symbols if glibc is build
with CFLAGS="-march=z13" where the ifunc is omitted.

ChangeLog:

	* sysdeps/s390/wcscpy-vx.S: Add strong aliases to
	__wcscpy, __GI___wcscpy and weak alias to wcscpy.
---

diff --git a/ChangeLog b/ChangeLog
index 92615ed3399..85506efc998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-01  Stefan Liebler  <stli@linux.ibm.com>
+
+	* sysdeps/s390/wcscpy-vx.S: Add strong aliases to
+	__wcscpy, __GI___wcscpy and weak alias to wcscpy.
+
 2019-03-01  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #20271]
diff --git a/sysdeps/s390/wcscpy-vx.S b/sysdeps/s390/wcscpy-vx.S
index e797fece6bc..5fe110fd941 100644
--- a/sysdeps/s390/wcscpy-vx.S
+++ b/sysdeps/s390/wcscpy-vx.S
@@ -111,6 +111,10 @@ ENTRY(WCSCPY_Z13)
 END(WCSCPY_Z13)
 
 # if ! HAVE_WCSCPY_IFUNC
-strong_alias (WCSCPY_Z13, wcscpy)
+strong_alias (WCSCPY_Z13, __wcscpy)
+weak_alias (__wcscpy, wcscpy)
+#  if defined SHARED && IS_IN (libc)
+strong_alias (__wcscpy, __GI___wcscpy)
+#  endif
 # endif
 #endif