This structure is part of the openrisc signal frame. Rename to user_regs_struct, per the kernel's ptrace.h, which allows removal of the explination of the name change from the kernel source.
Signed-off-by: Richard Henderson <[email protected]> --- linux-user/openrisc/target_syscall.h | 11 ----------- linux-user/openrisc/signal.c | 9 ++++++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/openrisc/target_syscall.h index 7fe5b73d3b..c8394e9dcd 100644 --- a/linux-user/openrisc/target_syscall.h +++ b/linux-user/openrisc/target_syscall.h @@ -1,17 +1,6 @@ #ifndef OPENRISC_TARGET_SYSCALL_H #define OPENRISC_TARGET_SYSCALL_H -/* Note that in linux/arch/openrisc/include/uapi/asm/ptrace.h, - * this is called user_regs_struct. Given that this is what - * is used within struct sigcontext we need this definition. - * However, elfload.c wants this name. - */ -struct target_pt_regs { - abi_ulong gpr[32]; - abi_ulong pc; - abi_ulong sr; -}; - #define UNAME_MACHINE "openrisc" #define UNAME_MINIMUM_RELEASE "2.6.32" diff --git a/linux-user/openrisc/signal.c b/linux-user/openrisc/signal.c index cb74a9fe5e..5b97d016af 100644 --- a/linux-user/openrisc/signal.c +++ b/linux-user/openrisc/signal.c @@ -22,8 +22,15 @@ #include "signal-common.h" #include "linux-user/trace.h" +/* See linux/arch/openrisc/include/uapi/asm/ptrace.h. */ +struct user_regs_struct { + abi_ulong gpr[32]; + abi_ulong pc; + abi_ulong sr; +}; + typedef struct target_sigcontext { - struct target_pt_regs regs; + struct user_regs_struct regs; abi_ulong oldmask; } target_sigcontext; -- 2.43.0
