diff options
author | Baruch Siach <baruch@tkos.co.il> | 2019-08-06 08:51:13 +0300 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2019-08-06 14:03:56 -0400 |
commit | 8acc688548b27151c45ee8a80f3a0b75f4a761c0 (patch) | |
tree | 9f1ebbd901cee2a0d60bf4a32b89d9b5c09c1258 /arch | |
parent | e0e8ae754cc7653fcff489a0e229adbbb49fde6c (diff) | |
download | musl-8acc688548b27151c45ee8a80f3a0b75f4a761c0.zip musl-8acc688548b27151c45ee8a80f3a0b75f4a761c0.tar.gz musl-8acc688548b27151c45ee8a80f3a0b75f4a761c0.tar.bz2 |
fix risc64 conflict with kernel headers
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.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/riscv64/bits/signal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h index 4c94a8f..76d7ad8 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; |