From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14747 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Khem Raj Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH V2] riscv64: Change container for riscv floating-point state to __riscv_mc_fp_state Date: Sat, 28 Sep 2019 16:45:42 -0700 Message-ID: <20190928234542.1426990-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="230967"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Khem Raj To: musl@lists.openwall.com Original-X-From: musl-return-14763-gllmg-musl=m.gmane.org@lists.openwall.com Sun Sep 29 01:47:13 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 1iEMQj-000xzo-Eb for gllmg-musl@m.gmane.org; Sun, 29 Sep 2019 01:47:13 +0200 Original-Received: (qmail 25686 invoked by uid 550); 28 Sep 2019 23:47:11 -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 25654 invoked from network); 28 Sep 2019 23:47:10 -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=sjFmx35aNj4p2nHVqDZx7OmH2u3NmzD8HIsE2JxkFgo=; b=jc4FE4pbK0sbG5//Cc+SDnNBWpYx317L0Xm9HSnVH/i+T/r/8/LDgIFDvX/dvq46EP x86b0DDOcGVe8IeI4YnFHteN0aCNmNgrCqo0YXu7S4doGW3jTS4COYlXq78Vg/9sw7Cj EZEKje7QA5RtLkDOH2zzw3qBntw2UsGnsPYGij8xHlNKDBdQIFq6lspq1bZTh1dYaZZO 9N4l7A9J0B2Oegzd9r1zzbTiGorcOeQoXFWy0q3vfHoQ/2b+YIGOdpfpkcXubc7cA4o/ dP5Ny4cvYqnoA1AUQxu5iZx+uka/SAO9+wcVKa7PS3w5VTY5HG8+zOF1Q15y1paUotVl eTnA== 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=sjFmx35aNj4p2nHVqDZx7OmH2u3NmzD8HIsE2JxkFgo=; b=MUshep8o45ZJNemfMaxEtw967/Gs75zN+Uy/wQY933L1nYvc8pg65Tlp83Tx3CRrHM 58GMsi9UBxIj9F8ozJlWcHtYl1Jt2KZhJMVkysCP8wjpu2JwBV39wZaAdetyxgC8GhJi rF3D24L/bCvbmiHMt851hU943mKKQPsMkqoVEqpvVkPNqQ/mrZvIKXLjtKeKB/x2XaQa E8btq3wptd72uoIFzm+PnJ/FN3Fx4sOJJJjw+VRqzo3HpObjnbKmOGGAvWKj6fj618J4 v28UnVY0wJnx6VWYakY75UwNmEs2Tad2SF8yoHsrQYsEVX5/OrNwlAGUXS9BIWFFjy5o 6U4g== X-Gm-Message-State: APjAAAVij8AypdqgyJxqLSJsiZyTQtXDOcL0D4UHWh1pf+HJmVU8824H zyO6zQiDwPWXL4qFok4m0grc13eV+qk= X-Google-Smtp-Source: APXvYqxkGhyzuR9dyQCHaEoCPC+rg9SSaegscuNFNktd3xD6hifaLgE6+LzMjkB/N2GNk0B3UZOVHw== X-Received: by 2002:aa7:9e01:: with SMTP id y1mr13282778pfq.175.1569714417910; Sat, 28 Sep 2019 16:46:57 -0700 (PDT) X-Mailer: git-send-email 2.23.0 Xref: news.gmane.org gmane.linux.lib.musl.general:14747 Archived-At: Match the struct elements with glibc glibc also uses __riscv_mc prefix, some packages like gdb uses that include bits/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 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..c0a46ada 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