Replace absolute line numbers in g++.dg/{debug,goacc}

2017-05-06  Tom de Vries  <tom@codesourcery.com>

	PR testsuite/80557
	* g++.dg/debug/dwarf2/dwarf2-1.C: Replace absolute line numbers.
	* g++.dg/debug/dwarf2/dwarf2-2.C: Same.
	* g++.dg/debug/dwarf2/pr46123-2.C: Same.
	* g++.dg/debug/dwarf2/typedef5.C: Same.
	* g++.dg/goacc/data-1.C: Same.

From-SVN: r247712

6 files changed, 23 insertions, 12 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bec90e3..fb278a9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2017-05-06  Tom de Vries  <tom@codesourcery.com>
+
+	PR testsuite/80557
+	* g++.dg/debug/dwarf2/dwarf2-1.C: Replace absolute line numbers.
+	* g++.dg/debug/dwarf2/dwarf2-2.C: Same.
+	* g++.dg/debug/dwarf2/pr46123-2.C: Same.
+	* g++.dg/debug/dwarf2/typedef5.C: Same.
+	* g++.dg/goacc/data-1.C: Same.
+
 2017-05-05  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* gcc.target/powerpc/versioned-copy-loop.c: New file.
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-1.C
index d0176ba..ada9fef 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-1.C
@@ -1,3 +1,4 @@
+/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } } */
 // Copyright (C) 2006 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 6 Jan 2006 <nathan@codesourcery.com>
 
@@ -20,5 +21,3 @@ namespace N
 }
 
 N::Derived thing;
-
-/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } 1 } */
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-2.C
index 23175c6..1386186 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/dwarf2-2.C
@@ -1,3 +1,4 @@
+/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } } */
 // PR debug/27057
 // { dg-do compile }
 // { dg-options "-gdwarf -feliminate-dwarf2-dups" }
@@ -15,5 +16,3 @@ void A::foo ()
 {
   using namespace N;
 }
-
-/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } 1 } */
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr46123-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr46123-2.C
index b262034..71e2baf 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/pr46123-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr46123-2.C
@@ -1,3 +1,4 @@
+/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } } */
 // PR debug/46123
 // { dg-do compile }
 // { dg-options "-g -feliminate-dwarf2-dups" }
@@ -45,5 +46,3 @@ int main ()
     return 1;
   return 0;
 }
-
-/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } 1 } */
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/typedef5.C b/gcc/testsuite/g++.dg/debug/dwarf2/typedef5.C
index b541ae4..e7c5003 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/typedef5.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/typedef5.C
@@ -1,3 +1,4 @@
+/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } } */
 // Origin: PR debug/46101
 // { dg-options "-gdwarf-2 -feliminate-dwarf2-dups" }
 // { dg-do compile }
@@ -9,4 +10,3 @@ typedef struct
 
 A a;
 
-/* { dg-bogus "-feliminate-dwarf2-dups is broken for C\\+\\+, ignoring" "broken -feliminate-dwarf2-dups" { xfail *-*-* } 1 } */
diff --git a/gcc/testsuite/g++.dg/goacc/data-1.C b/gcc/testsuite/g++.dg/goacc/data-1.C
index 2b210dc..73de964 100644
--- a/gcc/testsuite/g++.dg/goacc/data-1.C
+++ b/gcc/testsuite/g++.dg/goacc/data-1.C
@@ -3,7 +3,11 @@ foo (int &a, int (&b)[100], int &n)
 {
 #pragma acc enter data copyin (a, b) async wait
 #pragma acc enter data create (b[20:30]) async wait
-#pragma acc enter data (a) /* { dg-error "expected '#pragma acc' clause before '\\\(' token" } */
+
+#pragma acc enter data (a)
+  /* { dg-error "expected '#pragma acc' clause before '\\\(' token" "" { target *-*-* } .-1 } */
+  /* { dg-error "has no data movement clause" "" { target *-*-* } .-2 } */
+
 #pragma acc enter data create (b(1:10)) /* { dg-error "expected '\\\)' before '\\\(' token" } */
 #pragma acc exit data delete (a) if (0)
 #pragma acc exit data copyout (b) if (a)
@@ -22,7 +26,11 @@ foo (T &a, T (&b)[100], T &n)
 {
 #pragma acc enter data copyin (a, b) async wait
 #pragma acc enter data create (b[20:30]) async wait
-#pragma acc enter data (a) /* { dg-error "expected '#pragma acc' clause before '\\\(' token" } */
+
+#pragma acc enter data (a)
+  /* { dg-error "expected '#pragma acc' clause before '\\\(' token" "" { target *-*-* } .-1 } */
+  /* { dg-error "has no data movement clause" "" { target *-*-* } .-2 } */
+
 #pragma acc enter data create (b(1:10)) /* { dg-error "expected '\\\)' before '\\\(' token" } */
 #pragma acc exit data delete (a) if (0)
 #pragma acc exit data copyout (b) if (a)
@@ -34,6 +42,3 @@ foo (T &a, T (&b)[100], T &n)
 #pragma acc enter Data /* { dg-error "expected 'data' after" } */
 #pragma acc exit copyout (b) /* { dg-error "expected 'data' after" } */
 }
-
-/* { dg-error "has no data movement clause" "" { target *-*-* } 6 } */
-/* { dg-error "has no data movement clause" "" { target *-*-* } 25 } */