diff options
| author | Tobias Burnus <burnus@net-b.de> | 2007-01-04 09:57:36 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2007-01-04 09:57:36 +0100 |
| commit | e01f74e08e0ea50cd26c936c0ddcf7212fd18b7a (patch) | |
| tree | 65fe308921b97b7a847fd2a476e681503d561a01 /gcc | |
| parent | b8a00a4dcb742df10a4d3027fc274658c0330940 (diff) | |
| download | gcc-e01f74e08e0ea50cd26c936c0ddcf7212fd18b7a.zip gcc-e01f74e08e0ea50cd26c936c0ddcf7212fd18b7a.tar.gz gcc-e01f74e08e0ea50cd26c936c0ddcf7212fd18b7a.tar.bz2 | |
re PR fortran/30276 (gfortran include problem)
2007-01-02 Tobias Burnus <burnus@net-b.de>
Jakub Jelinek <jakub@redhat.com>
PR fortran/30276
* scanner.c (open_included_file): Revert patch.
(gfc_open_included_file): Support absolute pathnames.
(gfc_open_intrinsic_module): Support absolute pathnames.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r120431
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/scanner.c | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4a2936a..3d66cbc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2007-01-02 Tobias Burnus <burnus@net-b.de> + Jakub Jelinek <jakub@redhat.com> + + PR fortran/30276 + * scanner.c (open_included_file): Revert patch. + (gfc_open_included_file): Support absolute pathnames. + (gfc_open_intrinsic_module): Support absolute pathnames. + 2007-01-03 Brooks Moses <brooks.moses@codesourcery.com> * gfortran.texi (GNU Fortran and GCC): Rewrite diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 5d519a0..cf05306 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -199,11 +199,6 @@ open_included_file (const char *name, gfc_directorylist *list, bool module) gfc_directorylist *p; FILE *f; - f = gfc_open_file (name); - - if (f != NULL) - return f; - for (p = list; p; p = p->next) { if (module && !p->use_for_modules) @@ -231,6 +226,9 @@ gfc_open_included_file (const char *name, bool include_cwd, bool module) { FILE *f; + if (IS_ABSOLUTE_PATH (name)) + return gfc_open_file (name); + if (include_cwd) { f = gfc_open_file (name); @@ -244,6 +242,9 @@ gfc_open_included_file (const char *name, bool include_cwd, bool module) FILE * gfc_open_intrinsic_module (const char *name) { + if (IS_ABSOLUTE_PATH (name)) + return gfc_open_file (name); + return open_included_file (name, intrinsic_modules_dirs, true); } |