[Patch,committed][OG9] Fix dg-warning line numbers in libgomp

[Patch,committed][OG9] Fix dg-warning line numbers in libgomp

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

This fixes the line numbers of dg-warnings (cf. 2019-07-31 commit 
fcea4b6e384e30231ab6d88b1f9feb1007b3e96b).

Committed to the openacc-gcc-9-branch.

Tobias


[-- Attachment #2: dg-warn.diff --]
[-- Type: text/x-patch, Size: 3391 bytes --]

commit 0f2a4240229e97fdbcd3c8299642ed4b85f5b347
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Wed Sep 18 13:45:34 2019 +0200

    libgomp - fix dg-warning line numbers
    
            libgomp/
            * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning
            line numbers.
            * testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise.

diff --git a/libgomp/ChangeLog.openacc b/libgomp/ChangeLog.openacc
index db7f2a43b80..943a9e4a933 100644
--- a/libgomp/ChangeLog.openacc
+++ b/libgomp/ChangeLog.openacc
@@ -1,3 +1,9 @@
+2019-09-18  Tobias Burnus  <tobias@codesourcery.com>
+
+	* testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Fix dg-warning
+	line numbers.
+	* testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Likewise.
+
 2019-09-18  Tobias Burnus  <tobias@codesourcery.com>
 
 	* linux/gomp_print.c (gomp_print_integer): Use PRId64 if available,
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
index d9f2c75e868..2c14f9c545a 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/parallel-dims.c
@@ -158,7 +158,7 @@ int main ()
     gangs_min = workers_min = vectors_min = INT_MAX;
     gangs_max = workers_max = vectors_max = INT_MIN;
 #pragma acc parallel copy (vectors_actual) /* { dg-warning "region contains vector partitioned code but is not vector partitioned" } */ \
-  /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-1 } */ \
+  /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 160 } */ \
   vector_length (VECTORS) /* { dg-warning "'vector_length' value must be positive" "" { target c++ } } */
     {
       /* We're actually executing with vector_length (1), just the GCC nvptx
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
index fd4b17c40c2..3895405b2cf 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
@@ -59,10 +59,10 @@ int main ()
     gangs_max = workers_max = vectors_max = INT_MIN;
     gangs_actual = workers_actual = vectors_actual = 1;
 #pragma acc serial
-    /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } .-1 } */
-    /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } .-2 } */
-    /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } .-3 } */
-    /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } .-4 } */
+    /* { dg-warning "region contains gang partitioned code but is not gang partitioned" "" { target *-*-* } 61 } */
+    /* { dg-warning "region contains worker partitioned code but is not worker partitioned" "" { target *-*-* } 61 } */
+    /* { dg-warning "region contains vector partitioned code but is not vector partitioned" "" { target *-*-* } 61 } */
+    /* { dg-warning "using vector_length \\(32\\), ignoring 1" "" { target openacc_nvidia_accel_selected } 61 } */
     {
       if (acc_on_device (acc_device_nvidia))
 	{