From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14517 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH 1/2] fix risc64 conflict with kernel headers Date: Tue, 6 Aug 2019 12:31:00 -0400 Message-ID: <20190806163059.GY9017@brightrain.aerifal.cx> References: <63f4c551e85a848e336f41539b6dd283396eeda7.1565070674.git.baruch@tkos.co.il> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="92965"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mutt/1.5.21 (2010-09-15) To: musl@lists.openwall.com Original-X-From: musl-return-14533-gllmg-musl=m.gmane.org@lists.openwall.com Tue Aug 06 18:31:15 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1hv2Mk-000O46-G8 for gllmg-musl@m.gmane.org; Tue, 06 Aug 2019 18:31:14 +0200 Original-Received: (qmail 5413 invoked by uid 550); 6 Aug 2019 16:31:12 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 5391 invoked from network); 6 Aug 2019 16:31:11 -0000 Content-Disposition: inline In-Reply-To: <63f4c551e85a848e336f41539b6dd283396eeda7.1565070674.git.baruch@tkos.co.il> Xref: news.gmane.org gmane.linux.lib.musl.general:14517 Archived-At: On Tue, Aug 06, 2019 at 08:51:13AM +0300, Baruch Siach wrote: > Rename user registers struct definitions to avoid conflict with the > asm/ptrace.h kernel header that defines the same structs. Use the > __riscv_mc prefix as glibc does. > --- > arch/riscv64/bits/signal.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h > index 4c94a8f02edc..76d7ad80c8cd 100644 > --- a/arch/riscv64/bits/signal.h > +++ b/arch/riscv64/bits/signal.h > @@ -12,29 +12,29 @@ > typedef unsigned long greg_t; > typedef unsigned long gregset_t[32]; > > -struct __riscv_f_ext_state { > +struct __riscv_mc_f_ext_state { > unsigned int f[32]; > unsigned int fcsr; > }; > > -struct __riscv_d_ext_state { > +struct __riscv_mc_d_ext_state { > unsigned long long f[32]; > unsigned int fcsr; > }; > > -struct __riscv_q_ext_state { > +struct __riscv_mc_q_ext_state { > unsigned long long f[64] __attribute__((aligned(16))); > unsigned int fcsr; > unsigned int reserved[3]; > }; > > -union __riscv_fp_state { > - struct __riscv_f_ext_state f; > - struct __riscv_d_ext_state d; > - struct __riscv_q_ext_state q; > +union __riscv_mc_fp_state { > + struct __riscv_mc_f_ext_state f; > + struct __riscv_mc_d_ext_state d; > + struct __riscv_mc_q_ext_state q; > }; > > -typedef union __riscv_fp_state fpregset_t; > +typedef union __riscv_mc_fp_state fpregset_t; > > typedef struct sigcontext { > gregset_t gregs; > -- > 2.20.1 I confirmed this matches glibc. Applying. Rich