From 4777cf66403e311ff3f00bf3d9a60bd5b546f5ed Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 26 Mar 2021 15:19:49 +0100 Subject: [PATCH] Adjust 'libgomp.oacc-fortran/derivedtypes-arrays-1.f90' for og10 This is a fix-up for og10 commit c89b23b73edeeb7e3d8cbad278e505c2d6d770c4 "'libgomp.oacc-fortran/derivedtypes-arrays-1.f90' OpenACC 'serial' construct diagnostic for nvptx offloading". We're missing in og10 a few patches related to diagnostics location tracking/checking, both compiler-side and testsuite-side. libgomp/ * testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90: Adjust for og10. --- libgomp/ChangeLog.omp | 5 +++++ .../testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index b0af9c205a38..f131c2c79b7e 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2021-03-26 Thomas Schwinge + + * testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90: Adjust + for og10. + 2021-03-25 Kwok Cheung Yeung Backport from mainline diff --git a/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 index 7bca2df66285..0208e07ea937 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/derivedtypes-arrays-1.f90 @@ -88,7 +88,7 @@ end do !$acc data copyin(var3%t2(5)%t1%arr1) !$acc serial present(var3%t2(5)%t1%arr1) -! { 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 } 92 } var3%t2(5)%t1%arr1(:,:) = 6 !$acc end serial -- 2.30.2