OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fortran: Fix directory stat check for '.' [PR103560]

Browse Source 
MinGW does not like a call to 'stat' for './' via gfc_do_check_include_dir.
Solution: Only append '/' when concatenating the path with the filename.

gcc/fortran/ChangeLog:

	PR fortran/103560
	* scanner.cc (add_path_to_list): Don't append '/' to the
	save include path.
	(open_included_file): Use '/' in concatenating path + file name.
	* module.cc (gzopen_included_file_1): Likewise.

gcc/testsuite/ChangeLog:

	PR fortran/103560
	* gfortran.dg/include_14.f90: Update dg-warning.
	* gfortran.dg/include_17.f90: Likewise.
	* gfortran.dg/include_18.f90: Likewise.
	* gfortran.dg/include_6.f90: Update dg-*.
This commit is contained in:
Tobias Burnus 2022-03-23 16:54:12 +01:00
parent d9792f8d22
commit 5e33fea219
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/fortran/module.cc
View File

@ -1095,8 +1095,9 @@ gzopen_included_file_1 (const char *name, gfc_directorylist *list,
if (module && !p->use_for_modules)
continue;
fullname = (char *) alloca(strlen (p->path) + strlen (name) + 1);
fullname = (char *) alloca(strlen (p->path) + strlen (name) + 2);
strcpy (fullname, p->path);
strcat (fullname, "/");
strcat (fullname, name);
f = gzopen (fullname, "r");

7
gcc/fortran/scanner.cc
View File

@ -409,9 +409,7 @@ add_path_to_list (gfc_directorylist **list, const char *path,
*list = dir;
dir->use_for_modules = use_for_modules;
dir->warn = warn;
dir->path = XCNEWVEC (char, strlen (p) + 2);
strcpy (dir->path, p);
strcat (dir->path, "/"); /* make '/' last character */
dir->path = xstrdup (p);
}
/* defer_warn is set to true while parsing the commandline. */
@ -476,8 +474,9 @@ open_included_file (const char *name, gfc_directorylist *list,
if (module && !p->use_for_modules)
continue;
fullname = (char *) alloca(strlen (p->path) + strlen (name) + 1);
fullname = (char *) alloca(strlen (p->path) + strlen (name) + 2);
strcpy (fullname, p->path);
strcat (fullname, "/");
strcat (fullname, name);
f = gfc_open_file (fullname);

4
gcc/testsuite/gfortran.dg/include_14.f90
View File

@ -1,6 +1,6 @@
! { dg-additional-options "-cpp -idirafter /fdaf/ -I bar -J foo/bar" }
end
! default: warn for -I and -J but ignore other options.
! { dg-warning "Nonexistent include directory 'bar/'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'foo/bar/'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'bar'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'foo/bar'" "" { target *-*-* } 0 }

4
gcc/testsuite/gfortran.dg/include_17.f90
View File

@ -1,6 +1,6 @@
! { dg-do compile }
! { dg-options "-I foo-bar -J foo/bar" }
end
! { dg-warning "Nonexistent include directory 'foo-bar/'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'foo/bar/'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'foo-bar'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'foo/bar'" "" { target *-*-* } 0 }

4
gcc/testsuite/gfortran.dg/include_18.f90
View File

@ -1,5 +1,5 @@
! { dg-do compile }
! { dg-options "-I nothere -J neither/here -Wmissing-include-dirs" }
end
! { dg-warning "Nonexistent include directory 'nothere/'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'neither/here/'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'nothere'" "" { target *-*-* } 0 }
! { dg-warning "Nonexistent include directory 'neither/here'" "" { target *-*-* } 0 }

2
gcc/testsuite/gfortran.dg/include_6.f90
View File

@ -1,6 +1,6 @@
! { dg-do compile }
! { dg-options "-I gfortran.log" }
! { dg-warning "Include directory 'gfortran.log/': Not a directory" "" { target *-*-* } 0 }
! { dg-error "'gfortran.log' is not a directory" "" { target *-*-* } 0 }
! { dg-prune-output "compilation terminated." }
end