From 4358400b3f5574a0460c23d55e9be002e13ba678 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Mon, 21 May 2018 22:48:59 +0200 Subject: [PATCH] re PR fortran/85841 ([F2018] reject deleted features) 2018-05-21 Janus Weil PR fortran/85841 PR testsuite/85865 * testsuite/libgomp.fortran/collapse2.f90: Add option "-std=legacy". * testsuite/libgomp.fortran/omp_atomic2.f90: Ditto. * testsuite/libgomp.fortran/omp_parse1.f90: Ditto. * testsuite/libgomp.fortran/omp_parse3.f90: Ditto. * testsuite/libgomp.fortran/task2.f90: Ditto. * testsuite/libgomp.fortran/vla1.f90: Ditto. * testsuite/libgomp.fortran/vla2.f90: Ditto. * testsuite/libgomp.fortran/vla3.f90: Ditto. * testsuite/libgomp.fortran/vla4.f90: Ditto. * testsuite/libgomp.fortran/vla5.f90: Ditto. * testsuite/libgomp.fortran/vla6.f90: Ditto. * testsuite/libgomp.fortran/vla8.f90: Ditto. * testsuite/libgomp.oacc-fortran/collapse-2.f90: Ditto. * testsuite/libgomp.oacc-fortran/nested-function-1.f90: Ditto. From-SVN: r260487 --- libgomp/ChangeLog | 19 +++++++++++++++++++ libgomp/testsuite/libgomp.fortran/collapse2.f90 | 1 + libgomp/testsuite/libgomp.fortran/omp_atomic2.f90 | 2 ++ libgomp/testsuite/libgomp.fortran/omp_parse1.f90 | 2 ++ libgomp/testsuite/libgomp.fortran/omp_parse3.f90 | 1 + libgomp/testsuite/libgomp.fortran/task2.f90 | 2 ++ libgomp/testsuite/libgomp.fortran/vla1.f90 | 1 + libgomp/testsuite/libgomp.fortran/vla2.f90 | 1 + libgomp/testsuite/libgomp.fortran/vla3.f90 | 1 + libgomp/testsuite/libgomp.fortran/vla4.f90 | 1 + libgomp/testsuite/libgomp.fortran/vla5.f90 | 1 + libgomp/testsuite/libgomp.fortran/vla6.f90 | 1 + libgomp/testsuite/libgomp.fortran/vla8.f90 | 1 + libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 | 1 + .../libgomp.oacc-fortran/nested-function-1.f90 | 1 + 15 files changed, 36 insertions(+) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index a184a0660c7..f575180baa2 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,22 @@ +2018-05-21 Janus Weil + + PR fortran/85841 + PR testsuite/85865 + * testsuite/libgomp.fortran/collapse2.f90: Add option "-std=legacy". + * testsuite/libgomp.fortran/omp_atomic2.f90: Ditto. + * testsuite/libgomp.fortran/omp_parse1.f90: Ditto. + * testsuite/libgomp.fortran/omp_parse3.f90: Ditto. + * testsuite/libgomp.fortran/task2.f90: Ditto. + * testsuite/libgomp.fortran/vla1.f90: Ditto. + * testsuite/libgomp.fortran/vla2.f90: Ditto. + * testsuite/libgomp.fortran/vla3.f90: Ditto. + * testsuite/libgomp.fortran/vla4.f90: Ditto. + * testsuite/libgomp.fortran/vla5.f90: Ditto. + * testsuite/libgomp.fortran/vla6.f90: Ditto. + * testsuite/libgomp.fortran/vla8.f90: Ditto. + * testsuite/libgomp.oacc-fortran/collapse-2.f90: Ditto. + * testsuite/libgomp.oacc-fortran/nested-function-1.f90: Ditto. + 2018-05-18 Cesar Philippidis PR c++/85782 diff --git a/libgomp/testsuite/libgomp.fortran/collapse2.f90 b/libgomp/testsuite/libgomp.fortran/collapse2.f90 index 41126372673..32d9fdd816f 100644 --- a/libgomp/testsuite/libgomp.fortran/collapse2.f90 +++ b/libgomp/testsuite/libgomp.fortran/collapse2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } program collapse2 call test1 diff --git a/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90 b/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90 index 06f6241f01f..68df316c85d 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90 +++ b/libgomp/testsuite/libgomp.fortran/omp_atomic2.f90 @@ -1,4 +1,6 @@ ! { dg-do run } +! { dg-options "-std=legacy" } + real, dimension (20) :: r integer, dimension (20) :: d integer :: i, j, k, n diff --git a/libgomp/testsuite/libgomp.fortran/omp_parse1.f90 b/libgomp/testsuite/libgomp.fortran/omp_parse1.f90 index 59fe372fe00..db89401f839 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_parse1.f90 +++ b/libgomp/testsuite/libgomp.fortran/omp_parse1.f90 @@ -1,4 +1,6 @@ ! { dg-do run } +! { dg-options "-std=legacy" } + use omp_lib call test_parallel call test_do diff --git a/libgomp/testsuite/libgomp.fortran/omp_parse3.f90 b/libgomp/testsuite/libgomp.fortran/omp_parse3.f90 index d8e86d924a5..a61d54615d2 100644 --- a/libgomp/testsuite/libgomp.fortran/omp_parse3.f90 +++ b/libgomp/testsuite/libgomp.fortran/omp_parse3.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } ! { dg-require-effective-target tls_runtime } use omp_lib common /tlsblock/ x, y diff --git a/libgomp/testsuite/libgomp.fortran/task2.f90 b/libgomp/testsuite/libgomp.fortran/task2.f90 index 4e5ce2a76cc..27151415043 100644 --- a/libgomp/testsuite/libgomp.fortran/task2.f90 +++ b/libgomp/testsuite/libgomp.fortran/task2.f90 @@ -1,3 +1,5 @@ +! { dg-options "-std=legacy" } + integer :: err err = 0 !$omp parallel num_threads (4) default (none) shared (err) diff --git a/libgomp/testsuite/libgomp.fortran/vla1.f90 b/libgomp/testsuite/libgomp.fortran/vla1.f90 index e483a4c483c..bf25e89a54a 100644 --- a/libgomp/testsuite/libgomp.fortran/vla1.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla1.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } call test contains diff --git a/libgomp/testsuite/libgomp.fortran/vla2.f90 b/libgomp/testsuite/libgomp.fortran/vla2.f90 index 37dc319f72a..1bda078a8f1 100644 --- a/libgomp/testsuite/libgomp.fortran/vla2.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } call test contains diff --git a/libgomp/testsuite/libgomp.fortran/vla3.f90 b/libgomp/testsuite/libgomp.fortran/vla3.f90 index 1f4012b1034..e31aaaf6b15 100644 --- a/libgomp/testsuite/libgomp.fortran/vla3.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla3.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } call test contains diff --git a/libgomp/testsuite/libgomp.fortran/vla4.f90 b/libgomp/testsuite/libgomp.fortran/vla4.f90 index 64c7315f2bb..3388e872288 100644 --- a/libgomp/testsuite/libgomp.fortran/vla4.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla4.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } call test contains diff --git a/libgomp/testsuite/libgomp.fortran/vla5.f90 b/libgomp/testsuite/libgomp.fortran/vla5.f90 index 867da73c55e..3b040c737ff 100644 --- a/libgomp/testsuite/libgomp.fortran/vla5.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla5.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } call test contains diff --git a/libgomp/testsuite/libgomp.fortran/vla6.f90 b/libgomp/testsuite/libgomp.fortran/vla6.f90 index 1017beed184..ccc91ec85d3 100644 --- a/libgomp/testsuite/libgomp.fortran/vla6.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla6.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } call test contains diff --git a/libgomp/testsuite/libgomp.fortran/vla8.f90 b/libgomp/testsuite/libgomp.fortran/vla8.f90 index 68174cadd7c..ee756d4fe6e 100644 --- a/libgomp/testsuite/libgomp.fortran/vla8.f90 +++ b/libgomp/testsuite/libgomp.fortran/vla8.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } ! { dg-timeout-factor 2.0 } call test diff --git a/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 index 4f45537c231..98b6987750e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/collapse-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-options "-std=legacy" } program collapse2 integer :: i, j, k, a(1:3, 4:6, 5:7) diff --git a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 index c95891d62a6..3c8a5ddea02 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/nested-function-1.f90 @@ -1,6 +1,7 @@ ! Exercise nested function decomposition, gcc/tree-nested.c. ! { dg-do run } +! { dg-options "-std=legacy" } program collapse2 call test1 -- 2.11.4.GIT