From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Frederic Berat <fberat@redhat.com>
Subject: [PATCH 1/4] i386: Fix build with --enable-fortify=3
Date: Tue, 25 Jul 2023 12:16:38 -0300 [thread overview]
Message-ID: <20230725151641.923083-2-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230725151641.923083-1-adhemerval.zanella@linaro.org>
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.
---
sysdeps/i386/i686/multiarch/Makefile | 3 +--
.../i686/multiarch/memcpy_chk-nonshared.S | 21 -------------------
.../i686/multiarch/memmove_chk-nonshared.S | 21 -------------------
.../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
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
- <https://www.gnu.org/licenses/>. */
-
-#if IS_IN (libc) && !defined SHARED
-# include <sysdeps/i386/memcpy_chk.S>
-#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
- <https://www.gnu.org/licenses/>. */
-
-#if IS_IN (libc) && !defined SHARED
-# include <sysdeps/i386/memmove_chk.S>
-#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
- <https://www.gnu.org/licenses/>. */
-
-#if IS_IN (libc) && !defined SHARED
-# include <sysdeps/i386/mempcpy_chk.S>
-#endif
--
2.34.1
next prev parent reply other threads:[~2023-07-25 15:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 15:16 [PATCH 0/4] Fix i386 build with --enable-fortify-source Adhemerval Zanella
2023-07-25 15:16 ` Adhemerval Zanella [this message]
2023-07-26 1:51 ` [PATCH 1/4] i386: Fix build with --enable-fortify=3 Carlos O'Donell
2023-07-26 9:17 ` Andreas K. Huettel
2023-07-25 15:16 ` [PATCH 2/4] i386: Remove memset_chk-nonshared.S Adhemerval Zanella
2023-07-26 1:51 ` Carlos O'Donell
2023-07-26 9:17 ` Andreas K. Huettel
2023-07-25 15:16 ` [PATCH 3/4] linux: Fix i686 with gcc6 Adhemerval Zanella
2023-07-26 1:51 ` Carlos O'Donell
2023-07-26 9:17 ` Andreas K. Huettel
2023-07-25 15:16 ` [PATCH 4/4] string: Fix tester build with fortify enable with gcc 6 Adhemerval Zanella
2023-07-26 1:51 ` Carlos O'Donell
2023-07-26 9:18 ` [PATCH 4/4] string: Fix tester build with fortify enable with gcc6 Andreas K. Huettel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230725151641.923083-2-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fberat@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).