From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14748 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Khem Raj Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH V3] riscv64: Change container for riscv floating-point state to __riscv_mc_fp_state Date: Sat, 28 Sep 2019 17:31:01 -0700 Message-ID: <20190929003101.2886019-1-raj.khem@gmail.com> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="135095"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Khem Raj To: musl@lists.openwall.com Original-X-From: musl-return-14764-gllmg-musl=m.gmane.org@lists.openwall.com Sun Sep 29 02:31:27 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 1iEN7X-000Z13-Es for gllmg-musl@m.gmane.org; Sun, 29 Sep 2019 02:31:27 +0200 Original-Received: (qmail 1341 invoked by uid 550); 29 Sep 2019 00:31:24 -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 1309 invoked from network); 29 Sep 2019 00:31:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JUxReCPFkzZtSTmeVv53Tr3zPm2TEfpjtbG53I73rGM=; b=iJ3NwySycGDoBxhZpQ+q4BZJVKhF84dHU18HsPFs6IybUfN/aOyHtYV6aRsMfap+Z0 0m3wWl1MEC8F05Lxqu8HE+zQ5MwjamE8TZG/+IUCtfpYHyIyAMyFIlCesVfAsOgT1Da4 9z0liVRdQ34S3HVaoeNzuP+Um4YLKwGHviZG8XsExXq6MP4nH9rbtW4UjJjPcYhTPPxV /yi6i9ycFjjiOg6+p5M0eeq6NkJGC5lukiBaB+BR5fZBTnquwab9z0iM/CX5ayjK5kMS jNjtQcGaBDm1pBn4tzIk5yawXeRD1w3DpR5YnhWBUBwa67D8ljRi17bAJox4UpNJ5Ctj x+hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JUxReCPFkzZtSTmeVv53Tr3zPm2TEfpjtbG53I73rGM=; b=ifRlT+M7Jf0CiDt3rokzo9ifUeds02Z1Tw1XbYd2egaxCZGP9Sfo5P+UC8UBIsVDS3 0T8Ht0JpwTubXDoj3p/QaI1zuE4RDbTVa5D1yKvdDT1Sc5Xf3jqLysxe7DqZGMvC4EzZ X1ObW9FovfzM6gMuoRfWj00KLB6RpRJl/UFj0kzRNhRKYsDB9iVcoJW0stXXCU1G+5iB pMyiCP20OWPPgXtT1H9LcY+Fyq/e9VfuYD6J/rcMmLjkNaKgxNbjfEMyfpbEimGe6sTR cA5eoItymhxqTYlsggbu1A4AD7wEWge0rc8iwJTV2IyHbR/rjFdtiNYa5/K+S/Jw4gBd Gdvw== X-Gm-Message-State: APjAAAWh47RsdFoGwGA2ptoJDwRPg3d3oSoGFVYpnkcw+NFvkLl0iFTe 9HBMjXgSZGaEN2jgNidBqVPrSu6zs8E= X-Google-Smtp-Source: APXvYqzBqodwkXjEjVoc4M4UvMsJnp/Ci/C+6fsETINdyq3GtjZh8DXjEttVrKSUkWgxB/dkv6/DUQ== X-Received: by 2002:a17:902:680d:: with SMTP id h13mr12997605plk.300.1569717071321; Sat, 28 Sep 2019 17:31:11 -0700 (PDT) X-Mailer: git-send-email 2.23.0 Xref: news.gmane.org gmane.linux.lib.musl.general:14748 Archived-At: Match the struct elements with glibc glibc also uses __riscv_mc prefix, some packages like gdb uses that include signal.h in sys/user.h for __riscv_mc_fp_state type definition Signed-off-by: Khem Raj --- v2: Include bits/signal.h in sys/user.h v3: Replace bits/signal.h with signal.h arch/riscv64/bits/signal.h | 18 +++++++++--------- arch/riscv64/bits/user.h | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h index 76d7ad80..aba7ab00 100644 --- a/arch/riscv64/bits/signal.h +++ b/arch/riscv64/bits/signal.h @@ -13,25 +13,25 @@ typedef unsigned long greg_t; typedef unsigned long gregset_t[32]; struct __riscv_mc_f_ext_state { - unsigned int f[32]; - unsigned int fcsr; + unsigned int __f[32]; + unsigned int __fcsr; }; struct __riscv_mc_d_ext_state { - unsigned long long f[32]; - unsigned int fcsr; + unsigned long long __f[32]; + unsigned int __fcsr; }; struct __riscv_mc_q_ext_state { - unsigned long long f[64] __attribute__((aligned(16))); - unsigned int fcsr; + unsigned long long __f[64] __attribute__((aligned(16))); + unsigned int __fcsr; unsigned int reserved[3]; }; 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; + struct __riscv_mc_f_ext_state __f; + struct __riscv_mc_d_ext_state __d; + struct __riscv_mc_q_ext_state __q; }; typedef union __riscv_mc_fp_state fpregset_t; diff --git a/arch/riscv64/bits/user.h b/arch/riscv64/bits/user.h index d2e383b2..9cc0bc70 100644 --- a/arch/riscv64/bits/user.h +++ b/arch/riscv64/bits/user.h @@ -1,3 +1,5 @@ +#include + struct user_fpregs_struct { double f[32]; unsigned int fcsr; @@ -5,4 +7,4 @@ struct user_fpregs_struct { #define ELF_NGREG 32 typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG]; -typedef struct user_fpregs_struct elf_fpregset_t; +typedef union __riscv_mc_fp_state elf_fpregset_t; -- 2.23.0