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 <raj.khem@gmail.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c
index b60dad80df542fad9dc3a0bb427f4bd9c5d78838..a2b710041ce285795215906d7e208a28f23cf8c0 100644 (file)
--- 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 1c687db2c75ecd75688dac0fe0c9077617a83935..7042cfd51ea8cfdb917b1ed53c6acde79fca630e 100644 (file)
--- 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);