diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-09-26 20:06:55 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2006-09-26 20:06:55 +0200 |
| commit | 9b9e4cd6a909fd68c16d27c7f011300933db2f10 (patch) | |
| tree | aaa6cc93a9b83f7aa74397195af3ff5c62fe131e /gcc | |
| parent | ec14aed23b26f2877c5b26a3e13c672f031f38fc (diff) | |
| download | gcc-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 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/scanner.c | 20 |
2 files changed, 24 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2b5db96..e6860a6 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 7e0d696..e79fa37 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++; |