From 9b9e4cd6a909fd68c16d27c7f011300933db2f10 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 26 Sep 2006 20:06:55 +0200
Subject: [PATCH] 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
---
gcc/fortran/ChangeLog | 5 +++++
gcc/fortran/scanner.c | 20 ++++++++++++++++++-
libgomp/ChangeLog | 9 +++++++++
libgomp/testsuite/libgomp.fortran/condinc1.f | 7 +++++++
.../testsuite/libgomp.fortran/condinc1.inc | 2 ++
libgomp/testsuite/libgomp.fortran/condinc2.f | 7 +++++++
.../testsuite/libgomp.fortran/condinc3.f90 | 7 +++++++
.../testsuite/libgomp.fortran/condinc4.f90 | 7 +++++++
8 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 libgomp/testsuite/libgomp.fortran/condinc1.f
create mode 100644 libgomp/testsuite/libgomp.fortran/condinc1.inc
create mode 100644 libgomp/testsuite/libgomp.fortran/condinc2.f
create mode 100644 libgomp/testsuite/libgomp.fortran/condinc3.f90
create mode 100644 libgomp/testsuite/libgomp.fortran/condinc4.f90
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2b5db962011e..e6860a63b7be 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR fortran/29097
+ * scanner.c (include_line): Handle conditional include.
+
2006-09-25 Tobias Schluter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/21203
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 7e0d6962d514..e79fa37b9222 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -1212,8 +1212,26 @@ static bool
include_line (char *line)
{
char quote, *c, *begin, *stop;
-
+
c = line;
+
+ if (gfc_option.flag_openmp)
+ {
+ if (gfc_current_form == FORM_FREE)
+ {
+ while (*c == ' ' || *c == '\t')
+ c++;
+ if (*c == '!' && c[1] == '$' && (c[2] == ' ' || c[2] == '\t'))
+ c += 3;
+ }
+ else
+ {
+ if ((*c == '!' || *c == 'c' || *c == 'C' || *c == '*')
+ && c[1] == '$' && (c[2] == ' ' || c[2] == '\t'))
+ c += 3;
+ }
+ }
+
while (*c == ' ' || *c == '\t')
c++;
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 9dc9e31078fe..229b27ab51ab 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 000000000000..d94fe8d0fb1e
--- /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 000000000000..4624db7c4b74
--- /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 000000000000..8123be455a07
--- /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 000000000000..16b937a0afb6
--- /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 000000000000..33250256b719
--- /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
--
GitLab