| Message ID | 20231220000448.1420614-1-hjl.tools@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix elf: Do not duplicate the GLIBC_TUNABLES string | expand |
On Tue, Dec 19, 2023 at 4:04 PM H.J. Lu <hjl.tools@gmail.com> wrote: > > 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. > --- > 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; \ > -- > 2.43.0 > I am checking it in.
On 19/12/23 21:31, H.J. Lu wrote: > On Tue, Dec 19, 2023 at 4:04 PM H.J. Lu <hjl.tools@gmail.com> wrote: >> >> 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. >> --- >> 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; \ >> -- >> 2.43.0 >> > > I am checking it in. > LGTM, thanks.
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; \
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. --- sysdeps/x86/cpu-tunables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)