--- gcc-5.3.0.old/gcc/ada/sigtramp.h +++ gcc-5.3.0/gcc/ada/sigtramp.h @@ -52,7 +52,7 @@ typedef struct ucontext { unsigned long uc_flags; - struct ucontext *uc_link; + ucontext_t *uc_link; stack_t uc_stack; mcontext_t uc_mcontext; } ucontext_t; --- gcc-5.3.0.old/libgcc/config/aarch64/linux-unwind.h +++ gcc-5.3.0/libgcc/config/aarch64/linux-unwind.h @@ -52,7 +52,7 @@ struct rt_sigframe { siginfo_t info; - struct ucontext uc; + ucontext_t uc; }; struct rt_sigframe *rt_; --- gcc-5.3.0.old/libgcc/config/alpha/linux-unwind.h +++ gcc-5.3.0/libgcc/config/alpha/linux-unwind.h @@ -51,7 +51,7 @@ { struct rt_sigframe { siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_ = context->cfa; sc = &rt_->uc.uc_mcontext; } --- gcc-5.3.0.old/libgcc/config/bfin/linux-unwind.h +++ gcc-5.3.0/libgcc/config/bfin/linux-unwind.h @@ -52,7 +52,7 @@ void *puc; char retcode[8]; siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_ = context->cfa; /* The void * cast is necessary to avoid an aliasing warning. --- gcc-5.3.0.old/libgcc/config/i386/linux-unwind.h +++ gcc-5.3.0/libgcc/config/i386/linux-unwind.h @@ -58,7 +58,7 @@ if (*(unsigned char *)(pc+0) == 0x48 && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) { - struct ucontext *uc_ = context->cfa; + ucontext_t *uc_ = context->cfa; /* The void * cast is necessary to avoid an aliasing warning. The aliasing warning is correct, but should not be a problem because it does not alias anything. */ @@ -138,7 +138,7 @@ siginfo_t *pinfo; void *puc; siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_ = context->cfa; /* The void * cast is necessary to avoid an aliasing warning. The aliasing warning is correct, but should not be a problem --- gcc-5.3.0.old/libgcc/config/m68k/linux-unwind.h +++ gcc-5.3.0/libgcc/config/m68k/linux-unwind.h @@ -33,7 +33,7 @@ /* is unfortunately broken right now. */ struct uw_ucontext { unsigned long uc_flags; - struct ucontext *uc_link; + ucontext_t *uc_link; stack_t uc_stack; mcontext_t uc_mcontext; unsigned long uc_filler[80]; --- gcc-5.3.0.old/libgcc/config/mips/linux-unwind.h +++ gcc-5.3.0/libgcc/config/mips/linux-unwind.h @@ -31,7 +31,7 @@ /* The third parameter to the signal handler points to something with * this structure defined in asm/ucontext.h, but the name clashes with - * struct ucontext from sys/ucontext.h so this private copy is used. */ + * ucontext_t from sys/ucontext.h so this private copy is used. */ typedef struct _sig_ucontext { unsigned long uc_flags; struct _sig_ucontext *uc_link; --- gcc-5.3.0.old/libgcc/config/nios2/linux-unwind.h +++ gcc-5.3.0/libgcc/config/nios2/linux-unwind.h @@ -38,7 +38,7 @@ struct nios2_ucontext { unsigned long uc_flags; - struct ucontext *uc_link; + ucontext_t *uc_link; stack_t uc_stack; struct nios2_mcontext uc_mcontext; sigset_t uc_sigmask; /* mask last for extensibility */ --- gcc-5.3.0.old/libgcc/config/pa/linux-unwind.h +++ gcc-5.3.0/libgcc/config/pa/linux-unwind.h @@ -80,7 +80,7 @@ struct sigcontext *sc; struct rt_sigframe { siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *frame; /* rt_sigreturn trampoline: --- gcc-5.3.0.old/libgcc/config/sh/linux-unwind.h +++ gcc-5.3.0/libgcc/config/sh/linux-unwind.h @@ -83,7 +83,7 @@ siginfo_t *pinfo; void *puc; siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_ = context->cfa; /* The void * cast is necessary to avoid an aliasing warning. The aliasing warning is correct, but should not be a problem @@ -180,7 +180,7 @@ { struct rt_sigframe { siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_ = context->cfa; /* The void * cast is necessary to avoid an aliasing warning. The aliasing warning is correct, but should not be a problem --- gcc-5.3.0.old/libgcc/config/tilepro/linux-unwind.h +++ gcc-5.3.0/libgcc/config/tilepro/linux-unwind.h @@ -61,7 +61,7 @@ struct rt_sigframe { unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_; /* Return if this is not a signal handler. */ --- gcc-5.3.0.old/libgcc/config/xtensa/linux-unwind.h +++ gcc-5.3.0/libgcc/config/xtensa/linux-unwind.h @@ -64,7 +64,7 @@ struct rt_sigframe { siginfo_t info; - struct ucontext uc; + ucontext_t uc; } *rt_; /* movi a2, __NR_rt_sigreturn; syscall */ --- gcc-5.3.0.old/libjava/include/i386-signal.h +++ gcc-5.3.0/libjava/include/i386-signal.h @@ -29,7 +29,7 @@ #define HANDLE_DIVIDE_OVERFLOW \ do \ { \ - struct ucontext *_uc = (struct ucontext *)_p; \ + ucontext_t *_uc = (struct ucontext *)_p; \ gregset_t &_gregs = _uc->uc_mcontext.gregs; \ unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \ \ --- gcc-5.3.0.old/libjava/include/s390-signal.h +++ gcc-5.3.0/libjava/include/s390-signal.h @@ -51,7 +51,7 @@ struct \ { \ unsigned long int uc_flags; \ - struct ucontext *uc_link; \ + ucontext_t *uc_link; \ stack_t uc_stack; \ mcontext_t uc_mcontext; \ unsigned long sigmask[2]; \ --- gcc-5.3.0.old/libjava/include/sh-signal.h +++ gcc-5.3.0/libjava/include/sh-signal.h @@ -21,7 +21,7 @@ /* The third parameter to the signal handler points to something with * this structure defined in asm/ucontext.h, but the name clashes with - * struct ucontext from sys/ucontext.h so this private copy is used. */ + * ucontext_t from sys/ucontext.h so this private copy is used. */ typedef struct _sig_ucontext { unsigned long uc_flags; struct _sig_ucontext *uc_link; --- gcc-5.3.0.old/libjava/include/x86_64-signal.h +++ gcc-5.3.0/libjava/include/x86_64-signal.h @@ -28,7 +28,7 @@ #define HANDLE_DIVIDE_OVERFLOW \ do \ { \ - struct ucontext *_uc = (struct ucontext *)_p; \ + ucontext_t *_uc = (struct ucontext *)_p; \ gregset_t &_gregs = _uc->uc_mcontext.gregs; \ unsigned char *_rip = (unsigned char *)_gregs[REG_RIP]; \ \