testsuite/libgomp.oacc-fortran: Update dg-output to fix GCN

        * testsuite/libgomp.oacc-fortran/error_stop-1.f: Also don't
        expect dg-output of 'Error termination.' for GCN.
        * testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise.
        * testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise.

Plus: Fix date of a previous commit in:
        * gcc/fortran/ChangeLog
        * gcc/testsuite/ChangeLog

From-SVN: r278986

6 files changed, 33 insertions, 11 deletions

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index faac8fa..bd109f9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,4 +1,4 @@
-2019-12-12  Tobias Burnus  <tobias@codesourcery.com>
+2019-12-04  Tobias Burnus  <tobias@codesourcery.com>
 
 	PR fortran/92754
 	* intrinsic.c (gfc_intrinsic_func_interface): Set
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 477a3b2..03a97b5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -31,7 +31,7 @@
 
 	* gcc.dg/tree-ssa/ssa-fre-84.c: New testcase.
 
-2019-12-12  Tobias Burnus  <tobias@codesourcery.com>
+2019-12-04  Tobias Burnus  <tobias@codesourcery.com>
 
 	PR fortran/92754
 	gfortran.dg/intrinsic_9.f90: New.
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 183e7a6..c675889 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-05  Tobias Burnus  <tobias@codesourcery.com>
+
+	* testsuite/libgomp.oacc-fortran/error_stop-1.f: Also don't
+	expect dg-output of 'Error termination.' for GCN.
+	* testsuite/libgomp.oacc-fortran/error_stop-2.f: Likewise.
+	* testsuite/libgomp.oacc-fortran/error_stop-3.f: Likewise.
+
 2019-12-04  Jakub Jelinek  <jakub@redhat.com>
 
 	PR fortran/92756
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f
index 4965e67..e7358f4 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-1.f
@@ -13,8 +13,13 @@
 
 ! { dg-output "CheCKpOInT(\n|\r\n|\r)+" }
 ! { dg-output "ERROR STOP (\n|\r\n|\r)+" }
-! PR85463.  The "minimal" libgfortran implementation used with nvptx
-! offloading is a little bit different.
-! { dg-output "Error termination.*" { target { ! openacc_nvidia_accel_selected } } }
+!
+! In gfortran's main program, libfortran's set_options is called - which sets
+! compiler_options.backtrace = 1 by default.  For an offload libgfortran, this
+! is never called and, hence, "Error termination." is never printed.  Thus:
+! { dg-output "Error termination.*" { target { ! { openacc_nvidia_accel_selected || openacc_amdgcn_accel_selected } } } }
+!
+! PR85463:
 ! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvidia_accel_selected } }
+!
 ! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f
index 7103fdb..fca1d96 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-2.f
@@ -13,8 +13,13 @@
 
 ! { dg-output "CheCKpOInT(\n|\r\n|\r)+" }
 ! { dg-output "ERROR STOP 35(\n|\r\n|\r)+" }
-! PR85463.  The "minimal" libgfortran implementation used with nvptx
-! offloading is a little bit different.
-! { dg-output "Error termination.*" { target { ! openacc_nvidia_accel_selected } } }
+!
+! In gfortran's main program, libfortran's set_options is called - which sets
+! compiler_options.backtrace = 1 by default.  For an offload libgfortran, this
+! is never called and, hence, "Error termination." is never printed.  Thus:
+! { dg-output "Error termination.*" { target { ! { openacc_nvidia_accel_selected || openacc_amdgcn_accel_selected } } } }
+!
+! PR85463:
 ! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvidia_accel_selected } }
+!
 ! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f
index 9c217f1..2ae0b0d 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/error_stop-3.f
@@ -13,8 +13,13 @@
 
 ! { dg-output "CheCKpOInT(\n|\r\n|\r)+" }
 ! { dg-output "ERROR STOP SiGN(\n|\r\n|\r)+" }
-! PR85463.  The "minimal" libgfortran implementation used with nvptx
-! offloading is a little bit different.
-! { dg-output "Error termination.*" { target { ! openacc_nvidia_accel_selected } } }
+!
+! In gfortran's main program, libfortran's set_options is called - which sets
+! compiler_options.backtrace = 1 by default.  For an offload libgfortran, this
+! is never called and, hence, "Error termination." is never printed.  Thus:
+! { dg-output "Error termination.*" { target { ! { openacc_nvidia_accel_selected || openacc_amdgcn_accel_selected } } } }
+!
+! PR85463:
 ! { dg-output "libgomp: cuStreamSynchronize error.*" { target openacc_nvidia_accel_selected } }
+!
 ! { dg-shouldfail "" }