Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gcc/4.2.2/gentoo: 05_all_gcc-4.2.x-siginfo.patch
Date: Thu, 29 Nov 2012 05:03:59
Message-Id: 20121129050334.2958720C9F@flycatcher.gentoo.org
1 vapier 12/11/29 05:03:34
2
3 Added: 05_all_gcc-4.2.x-siginfo.patch
4 Log:
5 fix from upstream for building with newer glibc #424970
6
7 Revision Changes Path
8 1.1 src/patchsets/gcc/4.2.2/gentoo/05_all_gcc-4.2.x-siginfo.patch
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.2.2/gentoo/05_all_gcc-4.2.x-siginfo.patch?rev=1.1&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.2.2/gentoo/05_all_gcc-4.2.x-siginfo.patch?rev=1.1&content-type=text/plain
12
13 Index: 05_all_gcc-4.2.x-siginfo.patch
14 ===================================================================
15 https://bugs.gentoo.org/424970
16
17 fix from upstream for building with newer glibc versions
18
19 From f0cdca2bf2230005025e13e7354fedb612933c96 Mon Sep 17 00:00:00 2001
20 From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
21 Date: Fri, 20 Apr 2012 08:14:00 +0000
22 Subject: [PATCH] struct siginfo vs. siginfo_t
23
24 Backport from trunk (but apply to gcc/):
25
26 2012-04-20 Thomas Schwinge <thomas@××××××××××××.com>
27
28 gcc/
29 * config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use
30 siginfo_t instead of struct siginfo.
31 * config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise.
32 * config/ia64/linux-unwind.h (ia64_fallback_frame_state)
33 (ia64_handle_unwabi): Likewise.
34 * config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise.
35 * config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise.
36 * config/sh/linux-unwind.h (shmedia_fallback_frame_state)
37 (sh_fallback_frame_state): Likewise.
38
39 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_5-branch@186613 138bc75d-0d04-0410-961f-82ee72b054a4
40 ---
41 gcc/ChangeLog | 20 ++++++++++++++++++++
42 gcc/config/alpha/linux-unwind.h | 4 ++--
43 gcc/config/i386/linux-unwind.h | 6 +++---
44 gcc/config/ia64/linux-unwind.h | 6 +++---
45 gcc/config/mips/linux-unwind.h | 5 +++--
46 gcc/config/pa/linux-unwind.h | 4 ++--
47 gcc/config/sh/linux-unwind.h | 9 +++++----
48 9 files changed, 43 insertions(+), 21 deletions(-)
49
50 diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h
51 index 4c811dc..8c04b3b 100644
52 --- a/gcc/config/alpha/linux-unwind.h
53 +++ b/gcc/config/alpha/linux-unwind.h
54 @@ -49,7 +49,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
55 else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */
56 {
57 struct rt_sigframe {
58 - struct siginfo info;
59 + siginfo_t info;
60 struct ucontext uc;
61 } *rt_ = context->cfa;
62 sc = &rt_->uc.uc_mcontext;
63 diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h
64 index 36ee370..fe0ea3e 100644
65 --- a/gcc/config/i386/linux-unwind.h
66 +++ b/gcc/config/i386/linux-unwind.h
67 @@ -133,9 +133,9 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
68 {
69 struct rt_sigframe {
70 int sig;
71 - struct siginfo *pinfo;
72 + siginfo_t *pinfo;
73 void *puc;
74 - struct siginfo info;
75 + siginfo_t info;
76 struct ucontext uc;
77 } *rt_ = context->cfa;
78 /* The void * cast is necessary to avoid an aliasing warning.
79 diff --git a/gcc/config/ia64/linux-unwind.h b/gcc/config/ia64/linux-unwind.h
80 index 93f762d..da31259 100644
81 --- a/gcc/config/ia64/linux-unwind.h
82 +++ b/gcc/config/ia64/linux-unwind.h
83 @@ -47,7 +47,7 @@ ia64_fallback_frame_state (struct _Unwind_Context *context,
84 struct sigframe {
85 char scratch[16];
86 unsigned long sig_number;
87 - struct siginfo *info;
88 + siginfo_t *info;
89 struct sigcontext *sc;
90 } *frame_ = (struct sigframe *)context->psp;
91 struct sigcontext *sc = frame_->sc;
92 @@ -137,7 +137,7 @@ ia64_handle_unwabi (struct _Unwind_Context *context, _Unwind_FrameState *fs)
93 struct sigframe {
94 char scratch[16];
95 unsigned long sig_number;
96 - struct siginfo *info;
97 + siginfo_t *info;
98 struct sigcontext *sc;
99 } *frame = (struct sigframe *)context->psp;
100 struct sigcontext *sc = frame->sc;
101 diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h
102 index 02f7cd5..094ff58 100644
103 --- a/gcc/config/mips/linux-unwind.h
104 +++ b/gcc/config/mips/linux-unwind.h
105 @@ -75,7 +76,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context,
106 struct rt_sigframe {
107 u_int32_t ass[4]; /* Argument save space for o32. */
108 u_int32_t trampoline[2];
109 - struct siginfo info;
110 + siginfo_t info;
111 _sig_ucontext_t uc;
112 } *rt_ = context->cfa;
113 sc = &rt_->uc.uc_mcontext;
114 diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h
115 index a0560e9..38b4eda 100644
116 --- a/gcc/config/pa/linux-unwind.h
117 +++ b/gcc/config/pa/linux-unwind.h
118 @@ -63,7 +63,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
119 int i;
120 struct sigcontext *sc;
121 struct rt_sigframe {
122 - struct siginfo info;
123 + siginfo_t info;
124 struct ucontext uc;
125 } *frame;
126
127 diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h
128 index 94ed95d..5a78e31 100644
129 --- a/gcc/config/sh/linux-unwind.h
130 +++ b/gcc/config/sh/linux-unwind.h
131 @@ -80,9 +81,9 @@ shmedia_fallback_frame_state (struct _Unwind_Context *context,
132 && (*(unsigned long *) (pc+11) == 0x6ff0fff0))
133 {
134 struct rt_sigframe {
135 - struct siginfo *pinfo;
136 + siginfo_t *pinfo;
137 void *puc;
138 - struct siginfo info;
139 + siginfo_t info;
140 struct ucontext uc;
141 } *rt_ = context->cfa;
142 /* The void * cast is necessary to avoid an aliasing warning.
143 @@ -179,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
144 && (*(unsigned short *) (pc+14) == 0x00ad))))
145 {
146 struct rt_sigframe {
147 - struct siginfo info;
148 + siginfo_t info;
149 struct ucontext uc;
150 } *rt_ = context->cfa;
151 /* The void * cast is necessary to avoid an aliasing warning.
152 --
153 1.7.9.7