* [backport] Fix misplaced const
@ 2022-05-02 14:09 Sunil Pandey
2022-05-03 18:52 ` Sunil Pandey
0 siblings, 1 reply; 2+ messages in thread
From: Sunil Pandey @ 2022-05-02 14:09 UTC (permalink / raw)
To: Libc-stable Mailing List, schwab
I would like to backport this patch to release branches.
Any comments or objections?
$ git show 31f6488722
commit 31f64887222597bb15b7a814d8dadb7cb667bcb9
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon Jan 25 14:29:45 2021 +0100
Fix misplaced const
Constify __x86_cacheinfo_p and __x86_cpu_features_p, not their pointer
target types.
diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
index 350cba5fda..7b8df45e3b 100644
--- a/sysdeps/x86/cacheinfo.c
+++ b/sysdeps/x86/cacheinfo.c
@@ -77,7 +77,7 @@ __cache_sysconf (int name)
# include <ifunc-init.h>
extern void __x86_cacheinfo (void) attribute_hidden;
-const void (*__x86_cacheinfo_p) (void) attribute_hidden
+void (*const __x86_cacheinfo_p) (void) attribute_hidden
= __x86_cacheinfo;
__ifunc (__x86_cacheinfo, __x86_cacheinfo, NULL, void, init_cacheinfo);
diff --git a/sysdeps/x86/dl-get-cpu-features.c
b/sysdeps/x86/dl-get-cpu-features.c
index 99e3aa7d04..839803c746 100644
--- a/sysdeps/x86/dl-get-cpu-features.c
+++ b/sysdeps/x86/dl-get-cpu-features.c
@@ -28,7 +28,7 @@
once by IFUNC relocation. In dynamic executable, it is called twice
by DL_PLATFORM_INIT and by IFUNC relocation. */
extern void __x86_cpu_features (void) attribute_hidden;
-const void (*__x86_cpu_features_p) (void) attribute_hidden
+void (*const __x86_cpu_features_p) (void) attribute_hidden
= __x86_cpu_features;
void
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [backport] Fix misplaced const
2022-05-02 14:09 [backport] Fix misplaced const Sunil Pandey
@ 2022-05-03 18:52 ` Sunil Pandey
0 siblings, 0 replies; 2+ messages in thread
From: Sunil Pandey @ 2022-05-03 18:52 UTC (permalink / raw)
To: Libc-stable Mailing List, schwab
On Mon, May 2, 2022 at 7:09 AM Sunil Pandey <skpgkp2@gmail.com> wrote:
>
> I would like to backport this patch to release branches.
> Any comments or objections?
>
> $ git show 31f6488722
> commit 31f64887222597bb15b7a814d8dadb7cb667bcb9
> Author: Andreas Schwab <schwab@linux-m68k.org>
> Date: Mon Jan 25 14:29:45 2021 +0100
>
> Fix misplaced const
>
> Constify __x86_cacheinfo_p and __x86_cpu_features_p, not their pointer
> target types.
>
> diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
> index 350cba5fda..7b8df45e3b 100644
> --- a/sysdeps/x86/cacheinfo.c
> +++ b/sysdeps/x86/cacheinfo.c
> @@ -77,7 +77,7 @@ __cache_sysconf (int name)
> # include <ifunc-init.h>
>
> extern void __x86_cacheinfo (void) attribute_hidden;
> -const void (*__x86_cacheinfo_p) (void) attribute_hidden
> +void (*const __x86_cacheinfo_p) (void) attribute_hidden
> = __x86_cacheinfo;
>
> __ifunc (__x86_cacheinfo, __x86_cacheinfo, NULL, void, init_cacheinfo);
> diff --git a/sysdeps/x86/dl-get-cpu-features.c
> b/sysdeps/x86/dl-get-cpu-features.c
> index 99e3aa7d04..839803c746 100644
> --- a/sysdeps/x86/dl-get-cpu-features.c
> +++ b/sysdeps/x86/dl-get-cpu-features.c
> @@ -28,7 +28,7 @@
> once by IFUNC relocation. In dynamic executable, it is called twice
> by DL_PLATFORM_INIT and by IFUNC relocation. */
> extern void __x86_cpu_features (void) attribute_hidden;
> -const void (*__x86_cpu_features_p) (void) attribute_hidden
> +void (*const __x86_cpu_features_p) (void) attribute_hidden
> = __x86_cpu_features;
>
> void
I have to stop backporting at 2.33.
There is major x86 restructuring and inter patch dependency in the 2.32 branch.
Resolving backport conflict in the 2.32 branch has a cascading effect
on existing
patches.
--Sunil
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-03 18:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-02 14:09 [backport] Fix misplaced const Sunil Pandey
2022-05-03 18:52 ` Sunil Pandey
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).