From 293e98256af04d0d51cc8fa04f790265ea411230 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 28 Jun 2017 11:43:07 -0700 Subject: [PATCH] aarch64, tile: replace struct ucontext with ucontext_t glibc >= 2.26 has dropped the tag struct ucontext from ucontext_t type. * linux/arm/arch_sigreturn.c (arch_sigreturn) [AARCH64]: Replace struct ucontext with ucontext_t. * linux/tile/arch_sigreturn.c (arch_sigreturn): Likewise. Signed-off-by: Khem Raj Signed-off-by: Dmitry V. Levin --- linux/arm/arch_sigreturn.c | 2 +- linux/tile/arch_sigreturn.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c index b60dad80..a2b71004 100644 --- a/linux/arm/arch_sigreturn.c +++ b/linux/arm/arch_sigreturn.c @@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp) #ifdef AARCH64 tcp->currpers == 0 ? (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + - offsetof(struct ucontext, uc_sigmask)) : + offsetof(ucontext_t, uc_sigmask)) : #endif (*arm_sp_ptr + OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK); diff --git a/linux/tile/arch_sigreturn.c b/linux/tile/arch_sigreturn.c index 1c687db2..7042cfd5 100644 --- a/linux/tile/arch_sigreturn.c +++ b/linux/tile/arch_sigreturn.c @@ -4,7 +4,7 @@ arch_sigreturn(struct tcb *tcp) /* offset of ucontext in the kernel's sigframe structure */ #define SIGFRAME_UC_OFFSET C_ABI_SAVE_AREA_SIZE + sizeof(siginfo_t) const unsigned long addr = tile_regs.sp + SIGFRAME_UC_OFFSET + - offsetof(struct ucontext, uc_sigmask); + offsetof(ucontext_t, uc_sigmask); tprints("{mask="); print_sigset_addr(tcp, addr);