re PR fortran/61156 (Internal compiler error for Fortran files when specifying a...

2016-02-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/61156
	* scanner.c (add_path_to_list): If include path is not a directory,
	issue a fatal error.

	PR fortran/61156
	* gfortran.dg/include_6.f90: Update test.

From-SVN: r233649

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7e0b8828e042a34d5f13a0d4795a26b2ea8d5cb5..661479302f4807ea1517dd972eca3ad0d74afd30 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR fortran/61156
+       * scanner.c (add_path_to_list): If include path is not a directory,
+       issue a fatal error.
+
 2016-02-23  Andre Vehreschild  <vehre@gcc.gnu.org>
 
        PR fortran/67451

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index c1d79457f7acebfa456da21be2262db341413c16..c4e7974ed4a5a2aecfaaa36eaff9ddea3bb9aae4 100644 (file)
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -336,7 +336,7 @@ add_path_to_list (gfc_directorylist **list, const char *path,
     }
   else if (!S_ISDIR (st.st_mode))
     {
-      gfc_warning_now (0, "%qs is not a directory", path);
+      gfc_fatal_error ("%qs is not a directory", path);
       return;
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8a9e3a02f886673b1450db57c28f0f13973ae53a..2e524ece716c803c4c384c55df450980f3192c7f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-23  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR fortran/61156
+       * gfortran.dg/include_6.f90: Update test.
+
 2016-02-23  Jakub Jelinek  <jakub@redhat.com>
 
        PR objc/69844

diff --git a/gcc/testsuite/gfortran.dg/include_6.f90 b/gcc/testsuite/gfortran.dg/include_6.f90
index 0bac3909b8a04ecb6691abc0f7a42459b7878556..f5bb085d32112087471b6fcdd3202b2d84af519d 100644 (file)
--- a/gcc/testsuite/gfortran.dg/include_6.f90
+++ b/gcc/testsuite/gfortran.dg/include_6.f90
@@ -1,5 +1,6 @@
 ! { dg-do compile }
 ! { dg-options "-I gfortran.log" }
-! { dg-warning "is not a directory" "" { target *-*-* } 0 }
+! { dg-error "is not a directory" "" { target *-*-* } 0 }
+! { dg-prune-output "compilation terminated." }
 end