Re: struct siginfo vs. siginfo_t
Hi! Sorry for the delay. On Tue, 27 Mar 2012 05:34:30 -0700, Ian Lance Taylor wrote: > Thomas Schwinge writes: > > > libgcc/ > > * config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use > > siginfo_t instead of struct siginfo. > > * config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise. > > * config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise. > > * config/ia64/linux-unwind.h (ia64_fallback_frame_state) > > (ia64_handle_unwabi): Likewise. > > * config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise. > > * config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise. > > * config/sh/linux-unwind.h (shmedia_fallback_frame_state) > > (sh_fallback_frame_state): Likewise. > > * config/tilepro/linux-unwind.h (tile_fallback_frame_state): Likewise. > > * config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise. > > This is OK for mainline and release branches. Now committed to GCC trunk (r186610), gcc-4_7-branch (r186611), and trivially ported (libgcc/ -> gcc/) to gcc-4_6-branch (r186612), and gcc-4_5-branch (r186613). Grüße, Thomas pgpMDTk7dAKL4.pgp Description: PGP signature
Re: struct siginfo vs. siginfo_t
Thomas Schwinge writes: > libgcc/ > * config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use > siginfo_t instead of struct siginfo. > * config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise. > * config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise. > * config/ia64/linux-unwind.h (ia64_fallback_frame_state) > (ia64_handle_unwabi): Likewise. > * config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise. > * config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise. > * config/sh/linux-unwind.h (shmedia_fallback_frame_state) > (sh_fallback_frame_state): Likewise. > * config/tilepro/linux-unwind.h (tile_fallback_frame_state): Likewise. > * config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise. This is OK for mainline and release branches. Thanks. Ian
Re: struct siginfo vs. siginfo_t
Hi!
Ping.
On Wed, 21 Mar 2012 15:56:04 +0100, I wrote:
> On Thu, 15 Mar 2012 11:57:00 -0400, Carlos O'Donell
> wrote:
> > On Thu, Mar 15, 2012 at 11:05 AM, Thomas Schwinge
> > wrote:
> > > On 26 Feb 2012 18:17:52 -, drep...@sourceware.org wrote:
> > >> http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4efeffc1d583597e4f52985b9747269e47b754e2
> > >>
> > >> commit 4efeffc1d583597e4f52985b9747269e47b754e2
> > >> Author: Ulrich Drepper
> > >> Date: Sun Feb 26 13:17:27 2012 -0500
> > >>
> > >> Fix up POSIX testing in conformtest
> > >
> > >> [...]
> > >> + * sysdeps/unix/sysv/linux/bits/siginfo.h: Don't name siginfo_t
> > >> + struct. [...]
> > >> [...]
> > >
> > >> diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h
> > >> b/sysdeps/unix/sysv/linux/bits/siginfo.h
> > >> index ecef39d..0635e2f 100644
> > >> --- a/sysdeps/unix/sysv/linux/bits/siginfo.h
> > >> +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
> > >> [...]
> > >> @@ -47,7 +47,7 @@ typedef union sigval
> > >> # define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3)
> > >> # endif
> > >>
> > >> -typedef struct siginfo
> > >> +typedef struct
> > >> {
> > >> int si_signo; /* Signal number. */
> > >> int si_errno; /* If non-zero, an errno value associated
> > >> with
> > >> [...]
> > >
> > > This change breaks GCC:
> > >
> > > In file included from
> > > /scratch/tschwing/FM_sh-linux-gnu-mk2/src/gcc-mainline/libgcc/unwind-dw2.c:377:0:
> > > ./md-unwind-support.h: In function 'sh_fallback_frame_state':
> > > ./md-unwind-support.h:182:17: error: field 'info' has incomplete type
> > >
> > > In my case, this is really libgcc/config/sh/linux-unwind.h:
> > >
> > > [...]
> > > 181 struct rt_sigframe {
> > > 182 struct siginfo info;
> > > 183 struct ucontext uc;
> > > 184 } *rt_ = context->cfa;
> > > [...]
> >
> > POSIX says you get "siginto_t" *not* "struct siginfo," please fix the code.
>
> There is one usage in boehm-gc/os_dep.c, but it is only used if
> SUNOS5SIGS is defined, which it is only if one of SUNOS5, DRSNX, HPUX, or
> FREEBSD is defined, which are all not using Linux-based glibc ports.
>
> Likewise, gcc/ada/init.c has a struct __siginfo occurence, but only for
> __FreeBSD__.
>
> config/rs6000/linux-unwind.h uses ``char siginfo[128]'', and
> config/s390/linux-unwind.h also uses a constant.
>
> I tested the following patch for sh-linux-gnu. This only covers one
> configuration, but the change is pretty mechanic anyway and every place
> that used to refer to struct siginfo already must have had in
> its include path, which is the same file that declares siginfo_t.
>
> OK to commit? This should probably also go into any active release
> branches, to keep them buildable once this glibc change ripples through?
>
> libgcc/
> * config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use
> siginfo_t instead of struct siginfo.
> * config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise.
> * config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise.
> * config/ia64/linux-unwind.h (ia64_fallback_frame_state)
> (ia64_handle_unwabi): Likewise.
> * config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise.
> * config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise.
> * config/sh/linux-unwind.h (shmedia_fallback_frame_state)
> (sh_fallback_frame_state): Likewise.
> * config/tilepro/linux-unwind.h (tile_fallback_frame_state): Likewise.
> * config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise.
>
> diff --git a/libgcc/config/alpha/linux-unwind.h
> b/libgcc/config/alpha/linux-unwind.h
> index 4c811dc..f747053 100644
> --- a/libgcc/config/alpha/linux-unwind.h
> +++ b/libgcc/config/alpha/linux-unwind.h
> @@ -49,7 +49,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
>else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */
> {
>struct rt_sigframe {
> - struct siginfo info;
> + siginfo_t info;
> struct ucontext uc;
>} *rt_ = context->cfa;
>sc = &rt_->uc.uc_mcontext;
> diff --git a/libgcc/config/bfin/linux-unwind.h
> b/libgcc/config/bfin/linux-unwind.h
> index 88c8285..6e8f1ad 100644
> --- a/libgcc/config/bfin/linux-unwind.h
> +++ b/libgcc/config/bfin/linux-unwind.h
> @@ -48,10 +48,10 @@ bfin_fallback_frame_state (struct _Unwind_Context
> *context,
> {
>struct rt_sigframe {
> int sig;
> - struct siginfo *pinfo;
> + siginfo_t *pinfo;
> void *puc;
> char retcode[8];
> - struct siginfo info;
> + siginfo_t info;
> struct ucontext uc;
>} *rt_ = context->cfa;
>
> diff --git a/libgcc/config/i386/linux-unwind.h
> b/libgcc/config/i386/linux-unwind.h
> index f17a46c..33810c5 100644
> --- a/libgcc/config/i386/linux-unwind.h
> +++ b/libgcc/
Re: struct siginfo vs. siginfo_t
Hi!
On Thu, 15 Mar 2012 11:57:00 -0400, Carlos O'Donell
wrote:
> On Thu, Mar 15, 2012 at 11:05 AM, Thomas Schwinge
> wrote:
> > On 26 Feb 2012 18:17:52 -, drep...@sourceware.org wrote:
> >> http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4efeffc1d583597e4f52985b9747269e47b754e2
> >>
> >> commit 4efeffc1d583597e4f52985b9747269e47b754e2
> >> Author: Ulrich Drepper
> >> Date: Sun Feb 26 13:17:27 2012 -0500
> >>
> >> Fix up POSIX testing in conformtest
> >
> >> [...]
> >> + * sysdeps/unix/sysv/linux/bits/siginfo.h: Don't name siginfo_t
> >> + struct. [...]
> >> [...]
> >
> >> diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h
> >> b/sysdeps/unix/sysv/linux/bits/siginfo.h
> >> index ecef39d..0635e2f 100644
> >> --- a/sysdeps/unix/sysv/linux/bits/siginfo.h
> >> +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
> >> [...]
> >> @@ -47,7 +47,7 @@ typedef union sigval
> >> # define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3)
> >> # endif
> >>
> >> -typedef struct siginfo
> >> +typedef struct
> >> {
> >> int si_signo; /* Signal number. */
> >> int si_errno; /* If non-zero, an errno value associated
> >> with
> >> [...]
> >
> > This change breaks GCC:
> >
> > In file included from
> > /scratch/tschwing/FM_sh-linux-gnu-mk2/src/gcc-mainline/libgcc/unwind-dw2.c:377:0:
> > ./md-unwind-support.h: In function 'sh_fallback_frame_state':
> > ./md-unwind-support.h:182:17: error: field 'info' has incomplete type
> >
> > In my case, this is really libgcc/config/sh/linux-unwind.h:
> >
> > [...]
> > 181 struct rt_sigframe {
> > 182 struct siginfo info;
> > 183 struct ucontext uc;
> > 184 } *rt_ = context->cfa;
> > [...]
>
> POSIX says you get "siginto_t" *not* "struct siginfo," please fix the code.
There is one usage in boehm-gc/os_dep.c, but it is only used if
SUNOS5SIGS is defined, which it is only if one of SUNOS5, DRSNX, HPUX, or
FREEBSD is defined, which are all not using Linux-based glibc ports.
Likewise, gcc/ada/init.c has a struct __siginfo occurence, but only for
__FreeBSD__.
config/rs6000/linux-unwind.h uses ``char siginfo[128]'', and
config/s390/linux-unwind.h also uses a constant.
I tested the following patch for sh-linux-gnu. This only covers one
configuration, but the change is pretty mechanic anyway and every place
that used to refer to struct siginfo already must have had in
its include path, which is the same file that declares siginfo_t.
OK to commit? This should probably also go into any active release
branches, to keep them buildable once this glibc change ripples through?
libgcc/
* config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use
siginfo_t instead of struct siginfo.
* config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise.
* config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise.
* config/ia64/linux-unwind.h (ia64_fallback_frame_state)
(ia64_handle_unwabi): Likewise.
* config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise.
* config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise.
* config/sh/linux-unwind.h (shmedia_fallback_frame_state)
(sh_fallback_frame_state): Likewise.
* config/tilepro/linux-unwind.h (tile_fallback_frame_state): Likewise.
* config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise.
diff --git a/libgcc/config/alpha/linux-unwind.h
b/libgcc/config/alpha/linux-unwind.h
index 4c811dc..f747053 100644
--- a/libgcc/config/alpha/linux-unwind.h
+++ b/libgcc/config/alpha/linux-unwind.h
@@ -49,7 +49,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
else if (pc[1] == 0x201f015f)/* lda $0,NR_rt_sigreturn */
{
struct rt_sigframe {
- struct siginfo info;
+ siginfo_t info;
struct ucontext uc;
} *rt_ = context->cfa;
sc = &rt_->uc.uc_mcontext;
diff --git a/libgcc/config/bfin/linux-unwind.h
b/libgcc/config/bfin/linux-unwind.h
index 88c8285..6e8f1ad 100644
--- a/libgcc/config/bfin/linux-unwind.h
+++ b/libgcc/config/bfin/linux-unwind.h
@@ -48,10 +48,10 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
{
struct rt_sigframe {
int sig;
- struct siginfo *pinfo;
+ siginfo_t *pinfo;
void *puc;
char retcode[8];
- struct siginfo info;
+ siginfo_t info;
struct ucontext uc;
} *rt_ = context->cfa;
diff --git a/libgcc/config/i386/linux-unwind.h
b/libgcc/config/i386/linux-unwind.h
index f17a46c..33810c5 100644
--- a/libgcc/config/i386/linux-unwind.h
+++ b/libgcc/config/i386/linux-unwind.h
@@ -139,9 +139,9 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
{
struct rt_sigframe {
int sig;
- struct siginfo *pinfo;
+ siginfo_t *pinfo;
void *puc;
- struct sigi
Re: struct siginfo vs. siginfo_t (was: GNU C Library master sources branch, master, updated. glibc-2.15-229-g4efeffc)
On Thursday 15 March 2012 11:57:00 Carlos O'Donell wrote: > We should be rebuilding *all* of userspace when glibc changes. It > would be nice if we setup an OpenEmbedded system to rebuild as much of > x86-64 userspace as possible against a new glibc and check for > regressions. emerge -e world -mike signature.asc Description: This is a digitally signed message part.
Re: struct siginfo vs. siginfo_t (was: GNU C Library master sources branch, master, updated. glibc-2.15-229-g4efeffc)
On Thu, Mar 15, 2012 at 8:57 AM, Carlos O'Donell
wrote:
> On Thu, Mar 15, 2012 at 11:05 AM, Thomas Schwinge
> wrote:
>> Hi!
>>
>> On 26 Feb 2012 18:17:52 -, drep...@sourceware.org wrote:
>>> http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4efeffc1d583597e4f52985b9747269e47b754e2
>>>
>>> commit 4efeffc1d583597e4f52985b9747269e47b754e2
>>> Author: Ulrich Drepper
>>> Date: Sun Feb 26 13:17:27 2012 -0500
>>>
>>> Fix up POSIX testing in conformtest
>>
>>> [...]
>>> + * sysdeps/unix/sysv/linux/bits/siginfo.h: Don't name siginfo_t
>>> + struct. [...]
>>> [...]
>>
>>> diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h
>>> b/sysdeps/unix/sysv/linux/bits/siginfo.h
>>> index ecef39d..0635e2f 100644
>>> --- a/sysdeps/unix/sysv/linux/bits/siginfo.h
>>> +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
>>> [...]
>>> @@ -47,7 +47,7 @@ typedef union sigval
>>> # define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3)
>>> # endif
>>>
>>> -typedef struct siginfo
>>> +typedef struct
>>> {
>>> int si_signo; /* Signal number. */
>>> int si_errno; /* If non-zero, an errno value associated with
>>> [...]
>>
>> This change breaks GCC:
>>
>> In file included from
>> /scratch/tschwing/FM_sh-linux-gnu-mk2/src/gcc-mainline/libgcc/unwind-dw2.c:377:0:
>> ./md-unwind-support.h: In function 'sh_fallback_frame_state':
>> ./md-unwind-support.h:182:17: error: field 'info' has incomplete type
>>
>> In my case, this is really libgcc/config/sh/linux-unwind.h:
>>
>> [...]
>> 181 struct rt_sigframe {
>> 182 struct siginfo info;
>> 183 struct ucontext uc;
>> 184 } *rt_ = context->cfa;
>> [...]
>
> POSIX says you get "siginto_t" *not* "struct siginfo," please fix the code.
>
"struct siginfo" may not work correctly for Linux/x32
and siginfo_t does since siginfo_t has an alignment
attribute, which isn't applied to "struct siginfo".
--
H.J.
Re: struct siginfo vs. siginfo_t (was: GNU C Library master sources branch, master, updated. glibc-2.15-229-g4efeffc)
On Thu, Mar 15, 2012 at 11:05 AM, Thomas Schwinge
wrote:
> Hi!
>
> On 26 Feb 2012 18:17:52 -, drep...@sourceware.org wrote:
>> http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4efeffc1d583597e4f52985b9747269e47b754e2
>>
>> commit 4efeffc1d583597e4f52985b9747269e47b754e2
>> Author: Ulrich Drepper
>> Date: Sun Feb 26 13:17:27 2012 -0500
>>
>> Fix up POSIX testing in conformtest
>
>> [...]
>> + * sysdeps/unix/sysv/linux/bits/siginfo.h: Don't name siginfo_t
>> + struct. [...]
>> [...]
>
>> diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h
>> b/sysdeps/unix/sysv/linux/bits/siginfo.h
>> index ecef39d..0635e2f 100644
>> --- a/sysdeps/unix/sysv/linux/bits/siginfo.h
>> +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
>> [...]
>> @@ -47,7 +47,7 @@ typedef union sigval
>> # define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3)
>> # endif
>>
>> -typedef struct siginfo
>> +typedef struct
>> {
>> int si_signo; /* Signal number. */
>> int si_errno; /* If non-zero, an errno value associated with
>> [...]
>
> This change breaks GCC:
>
> In file included from
> /scratch/tschwing/FM_sh-linux-gnu-mk2/src/gcc-mainline/libgcc/unwind-dw2.c:377:0:
> ./md-unwind-support.h: In function 'sh_fallback_frame_state':
> ./md-unwind-support.h:182:17: error: field 'info' has incomplete type
>
> In my case, this is really libgcc/config/sh/linux-unwind.h:
>
> [...]
> 181 struct rt_sigframe {
> 182 struct siginfo info;
> 183 struct ucontext uc;
> 184 } *rt_ = context->cfa;
> [...]
POSIX says you get "siginto_t" *not* "struct siginfo," please fix the code.
> (Is there really nobody doing nightly testing of GCC against glibc master
> branch on x86, which would have shown this earlier?)
I don't test building GCC against glibc master unless I'm making a
potentially ABI breaking change.
We should be rebuilding *all* of userspace when glibc changes. It
would be nice if we setup an OpenEmbedded system to rebuild as much of
x86-64 userspace as possible against a new glibc and check for
regressions.
> Replacing struct siginfo with siginfo_t in sh/linux-unwind.h makes the
> build pass. Is this the desired approach; shall we apply this for all
> cases listed above (and submit to Boehm GC upstream)? I wonder -- if GCC
> breaks, how much software out in the wild is going to break once this
> glibc change ripples through?
You can't know until you try building a full distribution.
Cheers,
Carlos.
