public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: H.J. Lu <hjl@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Fix elf: Do not duplicate the GLIBC_TUNABLES string
Date: Wed, 20 Dec 2023 00:32:34 +0000 (GMT)	[thread overview]
Message-ID: <20231220003234.A4A94385E02F@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=50bef9bd63e7fb94f1d2cc8b7809256ffc73b2ef

commit 50bef9bd63e7fb94f1d2cc8b7809256ffc73b2ef
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Dec 19 16:01:33 2023 -0800

    Fix elf: Do not duplicate the GLIBC_TUNABLES string
    
    commit 2a969b53c0b02fed7e43473a92f219d737fd217a
    Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
    Date:   Wed Dec 6 10:24:01 2023 -0300
    
        elf: Do not duplicate the GLIBC_TUNABLES string
    
    has
    
    @@ -38,7 +39,7 @@
        which isn't available.  */
     #define CHECK_GLIBC_IFUNC_PREFERRED_OFF(f, cpu_features, name, len) \
       _Static_assert (sizeof (#name) - 1 == len, #name " != " #len); \
    -  if (memcmp (f, #name, len) == 0)             \
    +  if (tunable_str_comma_strcmp_cte (&f, #name) == 0)       \
         {                           \
           cpu_features->preferred[index_arch_##name]        \
       &= ~bit_arch_##name;                \
    @@ -46,12 +47,11 @@
    
    Fix it by removing "== 0" after tunable_str_comma_strcmp_cte.

Diff:
---
 sysdeps/x86/cpu-tunables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c
index ef96148d30..142c6b9240 100644
--- a/sysdeps/x86/cpu-tunables.c
+++ b/sysdeps/x86/cpu-tunables.c
@@ -39,7 +39,7 @@
    which isn't available.  */
 #define CHECK_GLIBC_IFUNC_PREFERRED_OFF(f, cpu_features, name, len)	\
   _Static_assert (sizeof (#name) - 1 == len, #name " != " #len);	\
-  if (tunable_str_comma_strcmp_cte (&f, #name) == 0)			\
+  if (tunable_str_comma_strcmp_cte (&f, #name))				\
     {									\
       cpu_features->preferred[index_arch_##name]			\
 	&= ~bit_arch_##name;						\

             reply	other threads:[~2023-12-20  0:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-20  0:32 H.J. Lu [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-19 21:34 H.J. Lu

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=20231220003234.A4A94385E02F@sourceware.org \
    --to=hjl@sourceware.org \
    --cc=glibc-cvs@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).