Tested on x86_64-linux, darwin, pushed to trunk, thanks
Iain
--- 8< ---
The exact size of the pubtypes has changed several times, the tests
are scanning for more specific features, so make the presence of the
output required, but relax the constraint on the exact size.
gcc/testsuite/ChangeLog:
* gcc.dg/pubtypes-2.c: Relax size constraint.
* gcc.dg/pubtypes-3.c: Likewise.
* gcc.dg/pubtypes-4.c: Likewise.
Signed-off-by: Iain Sandoe <[email protected]>
---
gcc/testsuite/gcc.dg/pubtypes-2.c | 2 +-
gcc/testsuite/gcc.dg/pubtypes-3.c | 2 +-
gcc/testsuite/gcc.dg/pubtypes-4.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/pubtypes-2.c
b/gcc/testsuite/gcc.dg/pubtypes-2.c
index 116e3489bc0..846586cb5a4 100644
--- a/gcc/testsuite/gcc.dg/pubtypes-2.c
+++ b/gcc/testsuite/gcc.dg/pubtypes-2.c
@@ -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]+0x14d+[ \t]+[#;]+[ \t]+Pub Info
Length} } } */
+/* { dg-final { scan-assembler {long+[ \t]+0x[0-9a-f]+[ \t]+[#;]+[ \t]+Pub
Info Length} } } */
/* { dg-final { scan-assembler "used_struct\\\\0\"+\[ \t\]+\[#;]+\[
\t\]+external name" } } */
/* { dg-final { scan-assembler-not "unused_struct\\\\0\"+\[ \t\]+\[#;]+\[
\t\]+external name" } } */
diff --git a/gcc/testsuite/gcc.dg/pubtypes-3.c
b/gcc/testsuite/gcc.dg/pubtypes-3.c
index 3fb3468fb00..243ab9089e6 100644
--- a/gcc/testsuite/gcc.dg/pubtypes-3.c
+++ b/gcc/testsuite/gcc.dg/pubtypes-3.c
@@ -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]+0x14d+[ \t]+[#;]+[ \t]+Pub Info
Length} } } */
+/* { dg-final { scan-assembler {long+[ \t]+0x[0-9a-f]+[ \t]+[#;]+[ \t]+Pub
Info Length} } } */
/* { 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 --git a/gcc/testsuite/gcc.dg/pubtypes-4.c
b/gcc/testsuite/gcc.dg/pubtypes-4.c
index 83fba8dfabc..f356799558e 100644
--- a/gcc/testsuite/gcc.dg/pubtypes-4.c
+++ b/gcc/testsuite/gcc.dg/pubtypes-4.c
@@ -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]+0x184+[ \t]+[#;]+[ \t]+Pub Info
Length} } } */
+/* { dg-final { scan-assembler {long+[ \t]+0x[0-9a-f]+[ \t]+[#;]+[ \t]+Pub
Info Length} } } */
/* { 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" } } */
--
2.50.1 (Apple Git-155)
