From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-xe30.google.com (mail-vs1-xe30.google.com [IPv6:2607:f8b0:4864:20::e30]) by sourceware.org (Postfix) with ESMTPS id 76F0C395A425 for ; Tue, 3 May 2022 18:52:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 76F0C395A425 Received: by mail-vs1-xe30.google.com with SMTP id t85so17361064vst.4 for ; Tue, 03 May 2022 11:52:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=L08QoucifURMS4jp5R0BE+izqlJWPPpX4w8pxc85Jjc=; b=Lhe0rjBb2NcAwUQjtUZV2O7gEX/sZ6lIejkkNpYPeLN5TpS19RAijGvy0NV/rTv9Ge rUlk08rIHIOVsZKHcmi83MpYJQAnoGvnwoeyIAF6izhJvJLcxac3oRmgpI9TICDll8+W q7/Trc8kdUuoTmgzX9lXSd78Wf0cueP7tF++dddoTKFfVxjKQfgtTiQzRxt0utid16qm l97R42a8XXbkkUvyO/x44EcNRHzdXG+AZuaN6RTtocy5fk5aV1IO2i4fNJInQTrClR69 7HwdBbjxPLdXIs9Id8rOCk0wH0+ltJE+rL13dbZrIHs8CJuJXpD+q+ju/yzNHeIvk+YO lCcA== X-Gm-Message-State: AOAM533tSWfvvZmR+qW/y7zdIQRw+/KXPFnl8dHRi1NYRFQOL83/5/n5 h47sbWZVkEqCg81Gw7gIULhkS0c+ZPRCqH0kNqHvIJYiqJU= X-Google-Smtp-Source: ABdhPJztGDjy+xXNOeH2n/AjMGIACBCd+MqZJcgrNjLSPSpu+FUI8UEGGcbXSjbQdi0K7t5pu+ZC8kFHKhDUZ6vNEro= X-Received: by 2002:a67:ef0a:0:b0:32d:4bb9:23f with SMTP id j10-20020a67ef0a000000b0032d4bb9023fmr2658649vsr.47.1651603972758; Tue, 03 May 2022 11:52:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Sunil Pandey Date: Tue, 3 May 2022 11:52:16 -0700 Message-ID: Subject: Re: [backport] Fix misplaced const To: Libc-stable Mailing List , schwab@linux-m68k.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2022 18:52:55 -0000 On Mon, May 2, 2022 at 7:09 AM Sunil Pandey wrote: > > I would like to backport this patch to release branches. > Any comments or objections? > > $ git show 31f6488722 > commit 31f64887222597bb15b7a814d8dadb7cb667bcb9 > Author: Andreas Schwab > 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 > > 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