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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2b5db96..e6860a6 100644 (file)
--- 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 7e0d696..e79fa37 100644 (file)
--- 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 9dc9e31..229b27a 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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