Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>Date: Tue, 4 Jul 2017 10:23:57 +0000Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
Current glibc no longer gives the ucontext_t type the tag structucontext, to conform with POSIX namespace rules. This requiresvarious linux-unwind.h files in libgcc, that were previously usingstruct ucontext, to be fixed to use ucontext_t instead. This issimilar to the removal of the struct siginfo tag from siginfo_t someyears ago.
This patch changes those files to use ucontext_t instead. As thestandard name that should be unconditionally safe, so this is notrestricted to architectures supported by glibc, or conditioned on theglibc version.
Tested compilation together with current glibc with glibc'sbuild-many-glibcs.py.
* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), config/alpha/linux-unwind.h (alpha_fallback_frame_state), config/bfin/linux-unwind.h (bfin_fallback_frame_state), config/i386/linux-unwind.h (x86_64_fallback_frame_state, x86_fallback_frame_state), config/m68k/linux-unwind.h (struct uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), config/pa/linux-unwind.h (pa32_fallback_frame_state), config/sh/linux-unwind.h (sh_fallback_frame_state), config/tilepro/linux-unwind.h (tile_fallback_frame_state), config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use ucontext_t instead of struct ucontext.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4--- libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ libgcc/config/aarch64/linux-unwind.h | 2 +- libgcc/config/alpha/linux-unwind.h | 2 +- libgcc/config/bfin/linux-unwind.h | 2 +- libgcc/config/i386/linux-unwind.h | 4 ++-- libgcc/config/m68k/linux-unwind.h | 2 +- libgcc/config/nios2/linux-unwind.h | 2 +- libgcc/config/pa/linux-unwind.h | 2 +- libgcc/config/sh/linux-unwind.h | 2 +- libgcc/config/tilepro/linux-unwind.h | 2 +- libgcc/config/xtensa/linux-unwind.h | 2 +- 11 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.hindex 4512efb..06de45a 100644--- a/libgcc/config/aarch64/linux-unwind.h+++ b/libgcc/config/aarch64/linux-unwind.h@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, struct rt_sigframe { siginfo_t info;- struct ucontext uc;+ ucontext_t uc; }; struct rt_sigframe *rt_;diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.hindex bdbba4a..e84812e 100644--- a/libgcc/config/alpha/linux-unwind.h+++ b/libgcc/config/alpha/linux-unwind.h@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, { struct rt_sigframe { siginfo_t info;- struct ucontext uc;+ ucontext_t uc; } *rt_ = context->cfa; sc = &rt_->uc.uc_mcontext; }diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.hindex 77b7c23..8bf5e82 100644--- a/libgcc/config/bfin/linux-unwind.h+++ b/libgcc/config/bfin/linux-unwind.h@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, 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 --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.hindex 540a0a2..29efbe3 100644--- a/libgcc/config/i386/linux-unwind.h+++ b/libgcc/config/i386/linux-unwind.h@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, 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_Context *context, 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 problemdiff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.hindex 75b7cf7..f964e24 100644--- a/libgcc/config/m68k/linux-unwind.h+++ b/libgcc/config/m68k/linux-unwind.h@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see /* <sys/ucontext.h> 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];diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.hindex 9a2657f..e47493d 100644--- a/libgcc/config/pa/linux-unwind.h+++ b/libgcc/config/pa/linux-unwind.h@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, struct sigcontext *sc; struct rt_sigframe { siginfo_t info;- struct ucontext uc;+ ucontext_t uc; } *frame; /* rt_sigreturn trampoline:diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.hindex e389cac..0bf43ba 100644--- a/libgcc/config/sh/linux-unwind.h+++ b/libgcc/config/sh/linux-unwind.h@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, { 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 problemdiff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.hindex 796e976..75f8890 100644--- a/libgcc/config/tilepro/linux-unwind.h+++ b/libgcc/config/tilepro/linux-unwind.h@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, 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. */diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.hindex 9872492..586a9d4 100644--- a/libgcc/config/xtensa/linux-unwind.h+++ b/libgcc/config/xtensa/linux-unwind.h@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, struct rt_sigframe { siginfo_t info;- struct ucontext uc;+ ucontext_t uc; } *rt_; /* movi a2, __NR_rt_sigreturn; syscall */-- 2.9.3