Author: Eric Salama <esalama@haproxy.com>
Date:   Tue Nov 6 13:59:38 2018 +0000

    replace struct ucontext with ucontext_t
    see also https://sourceforge.net/p/strace/mailman/message/35918931/

diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c
index 28726a2..07d34ff 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/mips/arch_sigreturn.c b/linux/mips/arch_sigreturn.c
index 3095fe5..24bffde 100644
--- a/linux/mips/arch_sigreturn.c
+++ b/linux/mips/arch_sigreturn.c
@@ -17,7 +17,7 @@ arch_sigreturn(struct tcb *tcp)
 	 * sizeof(sf_ass) + sizeof(sf_pad) + sizeof(struct siginfo)
 	 */
 	const long addr = mips_REG_SP + 6 * 4 + 128 +
-			  offsetof(struct ucontext, uc_sigmask);
+			  offsetof(ucontext_t, uc_sigmask);
 #endif
 
 	tprints("{mask=");
diff --git a/linux/tile/arch_sigreturn.c b/linux/tile/arch_sigreturn.c
index b1182fc..9fb230d 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 long addr = tile_regs.sp + SIGFRAME_UC_OFFSET +
-			  offsetof(struct ucontext, uc_sigmask);
+			  offsetof(ucontext_t, uc_sigmask);
 
 	tprints("{mask=");
 	print_sigset_addr_len(tcp, addr, NSIG / 8);
diff --git a/linux/x86_64/arch_sigreturn.c b/linux/x86_64/arch_sigreturn.c
index 1de0a0a..b7b1f80 100644
--- a/linux/x86_64/arch_sigreturn.c
+++ b/linux/x86_64/arch_sigreturn.c
@@ -15,7 +15,7 @@ arch_sigreturn(struct tcb *tcp)
 		struct sigcontext mcontext;
 	} ucontext_x32_header;
 
-#define	X86_64_SIGMASK_OFFSET	offsetof(struct ucontext, uc_sigmask)
+#define	X86_64_SIGMASK_OFFSET	offsetof(ucontext_t, uc_sigmask)
 #define	X32_SIGMASK_OFFSET	sizeof(ucontext_x32_header)
 
 	const unsigned long offset =