From 590675c079d743ecf6fee9f561e46c94633a91ef Mon Sep 17 00:00:00 2001 From: "Gabriel F. T. Gomes" Date: Sat, 2 Mar 2019 16:57:13 -0300 Subject: [PATCH] powerpc: Fix build of wcscpy with --disable-multi-arch Since the commit commit 81a14439417552324ec6ca71f65ddf8e7cdd51c7 Author: Adhemerval Zanella Date: Tue Feb 5 17:35:12 2019 -0200 wcsmbs: optimize wcscat powerpc64 and powerpc64le builds fail when configured with --disable-multi-arch and --with-cpu=power6 (or newer), due to an undefined reference to __GI___wcscpy. This patch fixes this on sysdeps/powerpc/powerpc64/power6/wcscpy.c, which is only used when multi-arch is disabled. This patch does nothing for the failures on 32-bits powerpc builds, because the file is under the powerpc64 subdirectory, however, powerpc builds were already failing with --disable-multi-arch, with multiple error messages, even before the aforementioned commit. Tested for powerpc, powerpc64, and powerpc64le with multi-arch enabled (all pass) and disabled (powerpc still fails as explained above). --- ChangeLog | 6 ++++++ sysdeps/powerpc/powerpc64/power6/wcscpy.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8e276de..3a70b61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-03-05 Gabriel F. T. Gomes + + * sysdeps/powerpc/powerpc64/power6/wcscpy.c (WCSCPY): Define to + __wcscpy, then use libc_hidden_def and weak_alias to bind it to + __GI___wcscpy and wcscpy. + 2019-03-04 Florian Weimer * sysdeps/generic/ldsodefs.h (_dl_sysdep_open_zero_fill): Remove diff --git a/sysdeps/powerpc/powerpc64/power6/wcscpy.c b/sysdeps/powerpc/powerpc64/power6/wcscpy.c index 722c8f9..59cfb28 100644 --- a/sysdeps/powerpc/powerpc64/power6/wcscpy.c +++ b/sysdeps/powerpc/powerpc64/power6/wcscpy.c @@ -1 +1,4 @@ +#define WCSCPY __wcscpy #include +libc_hidden_def (__wcscpy) +weak_alias (__wcscpy, wcscpy) -- 2.7.4