diff -rupN gcc-7.1.0.orig/libgcc/config/aarch64/linux-unwind.h gcc-7.1.0/libgcc/config/aarch64/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/aarch64/linux-unwind.h	2017-08-03 17:57:35.224124437 +0200
+++ gcc-7.1.0/libgcc/config/aarch64/linux-unwind.h	2017-08-03 17:58:50.244134563 +0200
@@ -55,7 +55,7 @@ aarch64_fallback_frame_state (struct _Un
   struct rt_sigframe
   {
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   };
 
   struct rt_sigframe *rt_;
diff -rupN gcc-7.1.0.orig/libgcc/config/alpha/linux-unwind.h gcc-7.1.0/libgcc/config/alpha/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/alpha/linux-unwind.h	2017-08-03 17:57:35.221124496 +0200
+++ gcc-7.1.0/libgcc/config/alpha/linux-unwind.h	2017-08-03 17:59:28.195143475 +0200
@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwi
     {
       struct rt_sigframe {
 	siginfo_t info;
-	struct ucontext uc;
+	ucontext_t uc;
       } *rt_ = context->cfa;
       sc = &rt_->uc.uc_mcontext;
     }
diff -rupN gcc-7.1.0.orig/libgcc/config/bfin/linux-unwind.h gcc-7.1.0/libgcc/config/bfin/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/bfin/linux-unwind.h	2017-08-03 17:57:35.225124418 +0200
+++ gcc-7.1.0/libgcc/config/bfin/linux-unwind.h	2017-08-03 17:59:51.829727193 +0200
@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwin
 	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.
diff -rupN gcc-7.1.0.orig/libgcc/config/i386/linux-unwind.h gcc-7.1.0/libgcc/config/i386/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/i386/linux-unwind.h	2017-08-03 17:57:35.216124593 +0200
+++ gcc-7.1.0/libgcc/config/i386/linux-unwind.h	2017-08-03 18:12:30.160537173 +0200
@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unw
   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 @@ x86_fallback_frame_state (struct _Unwind
 	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
Binary files gcc-7.1.0.orig/libgcc/config/i386/.linux-unwind.h.swp and gcc-7.1.0/libgcc/config/i386/.linux-unwind.h.swp differ
diff -rupN gcc-7.1.0.orig/libgcc/config/pa/linux-unwind.h gcc-7.1.0/libgcc/config/pa/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/pa/linux-unwind.h	2017-08-03 17:57:35.224124437 +0200
+++ gcc-7.1.0/libgcc/config/pa/linux-unwind.h	2017-08-03 18:00:17.384441123 +0200
@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwin
   struct sigcontext *sc;
   struct rt_sigframe {
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   } *frame;
 
   /* rt_sigreturn trampoline:
diff -rupN gcc-7.1.0.orig/libgcc/config/riscv/linux-unwind.h gcc-7.1.0/libgcc/config/riscv/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/riscv/linux-unwind.h	2017-08-03 17:57:35.216124593 +0200
+++ gcc-7.1.0/libgcc/config/riscv/linux-unwind.h	2017-08-03 18:00:32.665270064 +0200
@@ -42,7 +42,7 @@ riscv_fallback_frame_state (struct _Unwi
   struct rt_sigframe
   {
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   };
 
   struct rt_sigframe *rt_;
diff -rupN gcc-7.1.0.orig/libgcc/config/sh/linux-unwind.h gcc-7.1.0/libgcc/config/sh/linux-unwind.h
--- gcc-7.1.0.orig/libgcc/config/sh/linux-unwind.h	2017-08-03 17:57:35.216124593 +0200
+++ gcc-7.1.0/libgcc/config/sh/linux-unwind.h	2017-08-03 18:00:50.448059284 +0200
@@ -82,7 +82,7 @@ sh_fallback_frame_state (struct _Unwind_
     {
       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