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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4a2936a434fb58bcd0b3f6950f09882efd3ea157..3d66cbce6e43270fd02eaa360e5199f835c0558d 100644 (file)
--- 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 5d519a0ba9b3a894f7de0b93fccfb0a0f7d29faa..cf05306794d5bed03efb6d72824cdf09863bc035 100644 (file)
--- 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);
 }