From 928b305d3f6773b6a8cd1202da4f7d5d9a654456 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 1 Mar 2019 16:30:30 +0100 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ sysdeps/s390/wcscpy-vx.S | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 92615ed339..85506efc99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-03-01 Stefan Liebler + + * sysdeps/s390/wcscpy-vx.S: Add strong aliases to + __wcscpy, __GI___wcscpy and weak alias to wcscpy. + 2019-03-01 Florian Weimer [BZ #20271] diff --git a/sysdeps/s390/wcscpy-vx.S b/sysdeps/s390/wcscpy-vx.S index e797fece6b..5fe110fd94 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