| Message ID | 20120623105546.C1A893BE19@mailhost.lps.ens.fr |
|---|---|
| State | New |
| Headers | show |
On Sat, Jun 23, 2012 at 3:55 AM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote: >> As I don't have access to a Darwin machine to test a fix, would you >> mind updating the test? > > The failures are gone with the obvious patch: > > diff -up ../_clean/gcc/testsuite/gcc.dg/pubtypes-2.c gcc/testsuite/gcc.dg/pubtypes-2.c > --- ../_clean/gcc/testsuite/gcc.dg/pubtypes-2.c 2009-11-25 18:15:43.000000000 +0100 > +++ gcc/testsuite/gcc.dg/pubtypes-2.c 2012-06-22 23:56:37.000000000 +0200 > @@ -2,7 +2,7 @@ > /* { dg-options "-O0 -gdwarf-2 -dA" } */ > /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ > /* { dg-final { scan-assembler "__debug_pubtypes" } } */ > -/* { dg-final { scan-assembler "long+\[ \t\]+0x6a+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ > +/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ > /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > > diff -up ../_clean/gcc/testsuite/gcc.dg/pubtypes-3.c gcc/testsuite/gcc.dg/pubtypes-3.c > --- ../_clean/gcc/testsuite/gcc.dg/pubtypes-3.c 2009-11-25 18:15:46.000000000 +0100 > +++ gcc/testsuite/gcc.dg/pubtypes-3.c 2012-06-22 23:57:10.000000000 +0200 > @@ -2,7 +2,7 @@ > /* { dg-options "-O0 -gdwarf-2 -dA" } */ > /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ > /* { dg-final { scan-assembler "__debug_pubtypes" } } */ > -/* { dg-final { scan-assembler "long+\[ \t\]+0x6a+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ > +/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ > /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > /* { dg-final { scan-assembler-not "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > diff -up ../_clean/gcc/testsuite/gcc.dg/pubtypes-4.c gcc/testsuite/gcc.dg/pubtypes-4.c > --- ../_clean/gcc/testsuite/gcc.dg/pubtypes-4.c 2009-11-25 18:15:39.000000000 +0100 > +++ gcc/testsuite/gcc.dg/pubtypes-4.c 2012-06-22 23:57:38.000000000 +0200 > @@ -2,7 +2,7 @@ > /* { dg-options "-O0 -gdwarf-2 -dA" } */ > /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ > /* { dg-final { scan-assembler "__debug_pubtypes" } } */ > -/* { dg-final { scan-assembler "long+\[ \t\]+0xa1+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ > +/* { dg-final { scan-assembler "long+\[ \t\]+0x172+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ > /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > /* { dg-final { scan-assembler "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ > > I don't have write access, so someone will have to do the commit. I will commit this if someone can approve it. Sterling
On Jun 25, 2012, at 3:15 PM, Sterling Augustine wrote: > On Sat, Jun 23, 2012 at 3:55 AM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote: >>> As I don't have access to a Darwin machine to test a fix, would you >>> mind updating the test? >> >> The failures are gone with the obvious patch: > I will commit this if someone can approve it. Ok.
On Mon, Jun 25, 2012 at 7:13 PM, Mike Stump <mikestump@comcast.net> wrote: > On Jun 25, 2012, at 3:15 PM, Sterling Augustine wrote: >> On Sat, Jun 23, 2012 at 3:55 AM, Dominique Dhumieres <dominiq@lps.ens.fr> wrote: >>>> As I don't have access to a Darwin machine to test a fix, would you >>>> mind updating the test? >>> >>> The failures are gone with the obvious patch: > >> I will commit this if someone can approve it. > > Ok. Committed as Dominique posted with the included ChangeLog entry. Thanks Dominique. Sterling gcc/testsuite/ChangeLog 2012-06-26 Sterling Augustine <saugustine@google.com> Dominique Dhumieres <dominiq@lps.ens.fr> * gcc.dg/pubtypes-2.c: Update expected output. * gcc.dg/pubtypes-3.c: Likewise. * gcc.dg/pubtypes-4.c: Likewise.
diff -up ../_clean/gcc/testsuite/gcc.dg/pubtypes-2.c gcc/testsuite/gcc.dg/pubtypes-2.c --- ../_clean/gcc/testsuite/gcc.dg/pubtypes-2.c 2009-11-25 18:15:43.000000000 +0100 +++ gcc/testsuite/gcc.dg/pubtypes-2.c 2012-06-22 23:56:37.000000000 +0200 @@ -2,7 +2,7 @@ /* { dg-options "-O0 -gdwarf-2 -dA" } */ /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ /* { dg-final { scan-assembler "__debug_pubtypes" } } */ -/* { dg-final { scan-assembler "long+\[ \t\]+0x6a+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ +/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ diff -up ../_clean/gcc/testsuite/gcc.dg/pubtypes-3.c gcc/testsuite/gcc.dg/pubtypes-3.c --- ../_clean/gcc/testsuite/gcc.dg/pubtypes-3.c 2009-11-25 18:15:46.000000000 +0100 +++ gcc/testsuite/gcc.dg/pubtypes-3.c 2012-06-22 23:57:10.000000000 +0200 @@ -2,7 +2,7 @@ /* { dg-options "-O0 -gdwarf-2 -dA" } */ /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ /* { dg-final { scan-assembler "__debug_pubtypes" } } */ -/* { dg-final { scan-assembler "long+\[ \t\]+0x6a+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ +/* { dg-final { scan-assembler "long+\[ \t\]+0x13b+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ /* { dg-final { scan-assembler-not "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ diff -up ../_clean/gcc/testsuite/gcc.dg/pubtypes-4.c gcc/testsuite/gcc.dg/pubtypes-4.c --- ../_clean/gcc/testsuite/gcc.dg/pubtypes-4.c 2009-11-25 18:15:39.000000000 +0100 +++ gcc/testsuite/gcc.dg/pubtypes-4.c 2012-06-22 23:57:38.000000000 +0200 @@ -2,7 +2,7 @@ /* { dg-options "-O0 -gdwarf-2 -dA" } */ /* { dg-skip-if "Unmatchable assembly" { mmix-*-* } { "*" } { "" } } */ /* { dg-final { scan-assembler "__debug_pubtypes" } } */ -/* { dg-final { scan-assembler "long+\[ \t\]+0xa1+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ +/* { dg-final { scan-assembler "long+\[ \t\]+0x172+\[ \t\]+\[#;]+\[ \t\]+Length of Public Type Names Info" } } */ /* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ /* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */ /* { dg-final { scan-assembler "\"list_name_type\\\\0\"+\[ \t\]+\[#;]+\[ \t\]+external name" } } */