From: "Andreas K. Huettel" <dilfridge@gentoo.org>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org, Frederic Berat <fberat@redhat.com>,
Carlos O'Donell <carlos@redhat.com>
Subject: Re: [PATCH 2/4] i386: Remove memset_chk-nonshared.S
Date: Wed, 26 Jul 2023 11:17:21 +0200 [thread overview]
Message-ID: <6348918.eFTFzoEnKi@pinacolada> (raw)
In-Reply-To: <9342c832-3c8f-246b-9099-4290354289e5@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 4325 bytes --]
Am Mittwoch, 26. Juli 2023, 03:51:37 CEST schrieb Carlos O'Donell:
> On 7/25/23 11:16, Adhemerval Zanella via Libc-alpha wrote:
> > Similar to memcpy, mempcpy, and memmove there is no need for an
> > specific memset_chk-nonshared.S. It can be provided by
> > memset-ia32.S itself for static library.
>
> Agreed. LGTM. I'll retest i686 after this goes in.
>
> Andreas, As the RM is this OK to push?
>
> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Yes please go ahead.
>
> > Checked on i686-linux-gnu.
> > ---
> > sysdeps/i386/i686/memset.S | 2 +-
> > sysdeps/i386/i686/multiarch/Makefile | 4 ----
> > sysdeps/i386/i686/multiarch/memset-ia32.S | 9 ++++----
> > .../i686/multiarch/memset_chk-nonshared.S | 21 -------------------
> > 4 files changed, 6 insertions(+), 30 deletions(-)
> > delete mode 100644 sysdeps/i386/i686/multiarch/memset_chk-nonshared.S
> >
> > diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S
> > index 0b5e671d83..b84dc3fbe9 100644
> > --- a/sysdeps/i386/i686/memset.S
> > +++ b/sysdeps/i386/i686/memset.S
> > @@ -27,7 +27,7 @@
> > #define LEN CHR+4
> >
> > .text
> > -#if defined SHARED && IS_IN (libc)
> > +#if defined PIC && IS_IN (libc)
> > ENTRY_CHK (__memset_chk)
> > movl 12(%esp), %eax
> > cmpl %eax, 16(%esp)
> > diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile
> > index f48b06741f..f86e69de55 100644
> > --- a/sysdeps/i386/i686/multiarch/Makefile
> > +++ b/sysdeps/i386/i686/multiarch/Makefile
> > @@ -44,7 +44,3 @@ libm-sysdep_routines += s_fma-fma s_fmaf-fma
> > CFLAGS-s_fma-fma.c += -mavx -mfpmath=sse
> > CFLAGS-s_fmaf-fma.c += -mavx -mfpmath=sse
> > endif
> > -
> > -ifeq ($(subdir),debug)
> > -sysdep_routines += memset_chk-nonshared
> > -endif
> > diff --git a/sysdeps/i386/i686/multiarch/memset-ia32.S b/sysdeps/i386/i686/multiarch/memset-ia32.S
> > index ac57e456d4..a1b3919a19 100644
> > --- a/sysdeps/i386/i686/multiarch/memset-ia32.S
> > +++ b/sysdeps/i386/i686/multiarch/memset-ia32.S
> > @@ -18,16 +18,17 @@
> >
> > #if IS_IN (libc)
> > # define memset __memset_ia32
> > -# define __memset_chk __memset_chk_ia32
> >
> > # ifdef SHARED
> > -# undef libc_hidden_builtin_def
> > +# define __memset_chk __memset_chk_ia32
>
> OK.
>
> > +# endif
> > +
> > +# undef libc_hidden_builtin_def
> > /* IFUNC doesn't work with the hidden functions in shared library since
> > they will be called without setting up EBX needed for PLT which is
> > used by IFUNC. */
> > -# define libc_hidden_builtin_def(name) \
> > +# define libc_hidden_builtin_def(name) \
> > .globl __GI_memset; __GI_memset = memset
> > -# endif
> > #endif
> >
> > #include <sysdeps/i386/i686/memset.S>
> > diff --git a/sysdeps/i386/i686/multiarch/memset_chk-nonshared.S b/sysdeps/i386/i686/multiarch/memset_chk-nonshared.S
> > deleted file mode 100644
> > index e68c6e43b3..0000000000
> > --- a/sysdeps/i386/i686/multiarch/memset_chk-nonshared.S
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -/* Non-shared version of memset_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/memset_chk.S>
> > -#endif
>
> OK.
>
>
--
Andreas K. Hüttel
dilfridge@gentoo.org
Gentoo Linux developer
(council, toolchain, base-system, perl, libreoffice)
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 981 bytes --]
next prev parent reply other threads:[~2023-07-26 9:17 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 ` [PATCH 1/4] i386: Fix build with --enable-fortify=3 Adhemerval Zanella
2023-07-26 1:51 ` 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 [this message]
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=6348918.eFTFzoEnKi@pinacolada \
--to=dilfridge@gentoo.org \
--cc=adhemerval.zanella@linaro.org \
--cc=carlos@redhat.com \
--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).