From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Tue, 23 Feb 2016 22:53:31 +0000 (+0000)
Subject: re PR fortran/61156 (Internal compiler error for Fortran files when specifying a... 
X-Git-Tag: basepoints/gcc-7~791
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc5ec657e43b4467c8da5026bc4f43a4fb6ab4c;p=thirdparty%2Fgcc.git

re PR fortran/61156 (Internal compiler error for Fortran files when specifying a file instead of an include directory with -I)

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 7e0b8828e042..661479302f48 100644
--- 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 c1d79457f7ac..c4e7974ed4a5 100644
--- 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 8a9e3a02f886..2e524ece716c 100644
--- 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 0bac3909b8a0..f5bb085d3211 100644
--- 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