From 4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> Date: Wed, 21 Sep 2022 10:51:08 -0300 Subject: [PATCH 180/180] x86: Fix -Os build (BZ #29576) The compiler might transform __stpcpy calls (which are routed to __builtin_stpcpy as an optimization) to strcpy and x86_64 strcpy multiarch implementation does not build any working symbol due ISA_SHOULD_BUILD not being evaluated for IS_IN(rtld). Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com> (cherry picked from commit 9dc4e29f630c6ef8299120b275e503321dc0c8c7) --- NEWS | 2 ++ sysdeps/x86_64/multiarch/rtld-strcpy.S | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 sysdeps/x86_64/multiarch/rtld-strcpy.S diff --git a/NEWS b/NEWS index c3df0c007d..fb2d73a6be 100644 --- a/NEWS +++ b/NEWS @@ -39,6 +39,8 @@ The following bugs are resolved with this release: [29528] elf: Call __libc_early_init for reused namespaces [29537] libc: [2.34 regression]: Alignment issue on m68k when using [29539] libc: LD_TRACE_LOADED_OBJECTS changed how vDSO library are + [29576] build: librtld.os: in function `_dl_start_profile': + (.text+0x9444): undefined reference to `strcpy' [29583] Use 64-bit interfaces in gconv_parseconfdir [29600] Do not completely clear reused namespace in dlmopen [29607] nscd repeatably crashes calling __strlen_avx2 when hosts cache is diff --git a/sysdeps/x86_64/multiarch/rtld-strcpy.S b/sysdeps/x86_64/multiarch/rtld-strcpy.S new file mode 100644 index 0000000000..19439c553d --- /dev/null +++ b/sysdeps/x86_64/multiarch/rtld-strcpy.S @@ -0,0 +1,18 @@ +/* Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#include "../strcpy.S" -- 2.30.6
