backport: re PR fortran/61156 (Internal compiler error for Fortran files when specify...

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

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

	* gfortran.dg/include_6.f90: Update test.

From-SVN: r233793

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c39af56de1deb9269e9c7c3cf9c280d3febe1350..4e2610a161e0fb930be37c83a306bc503ff219f5 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-28  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       Backported from mainline
+       PR fortran/61156
+       * scanner.c (add_path_to_list): If include path is not a directory,
+       issue a fatal error.
+
 2016-02-11  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 8934924d876e075d81ab4f41bd20362123ce9f22..aa4d7564706ed711b67b842028cca3e2ff57fb69 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 ("\"%s\" is not a directory", path);
+      gfc_fatal_error ("\"%s\" is not a directory", path);
       return;
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b0b902fe1838adffdda148393cba4c07867685d3..7d4b1de71869881d85b115135d39e623d25622ec 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-28  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       Backport from mainline
+       PR fortran/61156
+       * gfortran.dg/include_6.f90: Update test.
+
 2016-02-18  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        Backport from gcc-5-branch.

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