diff options
author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-26 18:06:55 +0000 |
---|---|---|
committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-26 18:06:55 +0000 |
commit | a5297f53d7a927ce2440b2f6ddae91e8a3d3de90 (patch) | |
tree | aaa6cc93a9b83f7aa74397195af3ff5c62fe131e | |
parent | 06bc6fd184d6b2d510d9dcb0b03ac7f9d43b19e3 (diff) |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117234 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/fortran/scanner.c | 20 | ||||
-rw-r--r-- | libgomp/ChangeLog | 9 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/condinc1.f | 7 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/condinc1.inc | 2 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/condinc2.f | 7 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/condinc3.f90 | 7 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/condinc4.f90 | 7 |
8 files changed, 63 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2b5db962011..e6860a63b7b 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 7e0d6962d51..e79fa37b922 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 9dc9e31078f..229b27ab51a 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 00000000000..d94fe8d0fb1 --- /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 00000000000..4624db7c4b7 --- /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 00000000000..8123be455a0 --- /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 00000000000..16b937a0afb --- /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 00000000000..33250256b71 --- /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 |