aboutsummaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-09-26 20:06:55 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2006-09-26 20:06:55 +0200
commit9b9e4cd6a909fd68c16d27c7f011300933db2f10 (patch)
treeaaa6cc93a9b83f7aa74397195af3ff5c62fe131e /libgomp
parentec14aed23b26f2877c5b26a3e13c672f031f38fc (diff)
downloadgcc-9b9e4cd6a909fd68c16d27c7f011300933db2f10.zip
gcc-9b9e4cd6a909fd68c16d27c7f011300933db2f10.tar.gz
gcc-9b9e4cd6a909fd68c16d27c7f011300933db2f10.tar.bz2
re PR fortran/29097 (!$ include 'omp_lib.h' does not work)
PR fortran/29097 * scanner.c (include_line): Handle conditional include. * testsuite/libgomp.fortran/condinc1.f: New test. * testsuite/libgomp.fortran/condinc2.f: New test. * testsuite/libgomp.fortran/condinc3.f90: New test. * testsuite/libgomp.fortran/condinc4.f90: New test. * testsuite/libgomp.fortran/condinc1.inc: New file. From-SVN: r117234
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog9
-rw-r--r--libgomp/testsuite/libgomp.fortran/condinc1.f7
-rw-r--r--libgomp/testsuite/libgomp.fortran/condinc1.inc2
-rw-r--r--libgomp/testsuite/libgomp.fortran/condinc2.f7
-rw-r--r--libgomp/testsuite/libgomp.fortran/condinc3.f907
-rw-r--r--libgomp/testsuite/libgomp.fortran/condinc4.f907
6 files changed, 39 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 9dc9e31..229b27a 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR fortran/29097
+ * testsuite/libgomp.fortran/condinc1.f: New test.
+ * testsuite/libgomp.fortran/condinc2.f: New test.
+ * testsuite/libgomp.fortran/condinc3.f90: New test.
+ * testsuite/libgomp.fortran/condinc4.f90: New test.
+ * testsuite/libgomp.fortran/condinc1.inc: New file.
+
2006-09-18 Tom Tromey <tromey@redhat.com>
* configure: Rebuilt.
diff --git a/libgomp/testsuite/libgomp.fortran/condinc1.f b/libgomp/testsuite/libgomp.fortran/condinc1.f
new file mode 100644
index 0000000..d94fe8d
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/condinc1.f
@@ -0,0 +1,7 @@
+! { dg-options "-fopenmp" }
+ program condinc1
+ logical l
+ l = .false.
+!$ include 'condinc1.inc'
+ stop 2
+ end
diff --git a/libgomp/testsuite/libgomp.fortran/condinc1.inc b/libgomp/testsuite/libgomp.fortran/condinc1.inc
new file mode 100644
index 0000000..4624db7
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/condinc1.inc
@@ -0,0 +1,2 @@
+ if (l) stop 3
+ return
diff --git a/libgomp/testsuite/libgomp.fortran/condinc2.f b/libgomp/testsuite/libgomp.fortran/condinc2.f
new file mode 100644
index 0000000..8123be4
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/condinc2.f
@@ -0,0 +1,7 @@
+! { dg-options "-fno-openmp" }
+ program condinc2
+ logical l
+ l = .true.
+C$ include 'condinc1.inc'
+ return
+ end
diff --git a/libgomp/testsuite/libgomp.fortran/condinc3.f90 b/libgomp/testsuite/libgomp.fortran/condinc3.f90
new file mode 100644
index 0000000..16b937a
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/condinc3.f90
@@ -0,0 +1,7 @@
+ ! { dg-options "-fopenmp" }
+program condinc3
+ logical l
+ l = .false.
+ !$ include 'condinc1.inc'
+ stop 2
+end
diff --git a/libgomp/testsuite/libgomp.fortran/condinc4.f90 b/libgomp/testsuite/libgomp.fortran/condinc4.f90
new file mode 100644
index 0000000..3325025
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/condinc4.f90
@@ -0,0 +1,7 @@
+! { dg-options "-fno-openmp" }
+ program condinc4
+ logical l
+ l = .true.
+!$ include 'condinc1.inc'
+ return
+ end