From f8f9a272573a4074c5b13ec69522945695d5d3f2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Tue, 25 Jul 2023 12:16:38 -0300 Subject: i386: Fix build with --enable-fortify=3 The i386 string routines provide multiple internal definitions for memcpy, memmove, and mempcpy chk routines: $ objdump -t libc.a | grep __memcpy_chk 00000000 g F .text 0000000e __memcpy_chk 00000000 g F .text 00000013 __memcpy_chk $ objdump -t libc.a | grep __mempcpy_chk 00000000 g F .text 0000000e __mempcpy_chk 00000000 g F .text 00000013 __mempcpy_chk $ objdump -t libc.a | grep __memmove_chk 00000000 g F .text 0000000e __memmove_chk 00000000 g F .text 00000013 __memmove_chk Although is not an issue for normal static builds, with fortify=3 glibc itself might use the fortify chk functions and thus static build might fail with multiple definitions. For instance: x86_64-glibc-linux-gnu-gcc -m32 -march=i686 -o [...]math/test-signgam-uchar-static -nostdlib -nostartfiles -static -static-pie [...] x86_64-glibc-linux-gnu/bin/ld: [...]/libc.a(mempcpy-ia32.o): in function `__mempcpy_chk': [...]/glibc-git/string/../sysdeps/i386/i686/mempcpy.S:32: multiple definition of `__mempcpy_chk'; [...]/libc.a(mempcpy_chk-nonshared.o):[...]/debug/../sysdeps/i386/mempcpy_chk.S:28: first defined here collect2: error: ld returned 1 exit status make[2]: *** [../Rules:298: There is no need for mem*-nonshared.S, the __mem*_chk routines are already provided by the assembly routines. Checked on i686-linux-gnu with gcc 13 built with fortify=1,2,3 and without fortify. Reviewed-by: Carlos O'Donell --- sysdeps/i386/i686/multiarch/Makefile | 3 +-- sysdeps/i386/i686/multiarch/memcpy_chk-nonshared.S | 21 --------------------- sysdeps/i386/i686/multiarch/memmove_chk-nonshared.S | 21 --------------------- sysdeps/i386/i686/multiarch/mempcpy_chk-nonshared.S | 21 --------------------- 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 sysdeps/i386/i686/multiarch/memcpy_chk-nonshared.S delete mode 100644 sysdeps/i386/i686/multiarch/memmove_chk-nonshared.S delete mode 100644 sysdeps/i386/i686/multiarch/mempcpy_chk-nonshared.S (limited to 'sysdeps/i386/i686') diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile index 9fe5ea8639..f48b06741f 100644 --- a/sysdeps/i386/i686/multiarch/Makefile +++ b/sysdeps/i386/i686/multiarch/Makefile @@ -46,6 +46,5 @@ CFLAGS-s_fmaf-fma.c += -mavx -mfpmath=sse endif ifeq ($(subdir),debug) -sysdep_routines += memcpy_chk-nonshared mempcpy_chk-nonshared \ - memmove_chk-nonshared memset_chk-nonshared +sysdep_routines += memset_chk-nonshared endif diff --git a/sysdeps/i386/i686/multiarch/memcpy_chk-nonshared.S b/sysdeps/i386/i686/multiarch/memcpy_chk-nonshared.S deleted file mode 100644 index 6801893b72..0000000000 --- a/sysdeps/i386/i686/multiarch/memcpy_chk-nonshared.S +++ /dev/null @@ -1,21 +0,0 @@ -/* Non-shared version of memcpy_chk for i686. - Copyright (C) 2017-2023 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 - . */ - -#if IS_IN (libc) && !defined SHARED -# include -#endif diff --git a/sysdeps/i386/i686/multiarch/memmove_chk-nonshared.S b/sysdeps/i386/i686/multiarch/memmove_chk-nonshared.S deleted file mode 100644 index c5de28d4a8..0000000000 --- a/sysdeps/i386/i686/multiarch/memmove_chk-nonshared.S +++ /dev/null @@ -1,21 +0,0 @@ -/* Non-shared version of memmmove_chk for i686. - Copyright (C) 2017-2023 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 - . */ - -#if IS_IN (libc) && !defined SHARED -# include -#endif diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk-nonshared.S b/sysdeps/i386/i686/multiarch/mempcpy_chk-nonshared.S deleted file mode 100644 index c4f89e156b..0000000000 --- a/sysdeps/i386/i686/multiarch/mempcpy_chk-nonshared.S +++ /dev/null @@ -1,21 +0,0 @@ -/* Non-shared version of mempcpy_chk for i686. - Copyright (C) 2017-2023 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 - . */ - -#if IS_IN (libc) && !defined SHARED -# include -#endif -- cgit v1.2.3