From: Jerry DeLisle Date: Sun, 28 Feb 2016 18:16:56 +0000 (+0000) Subject: backport: re PR fortran/61156 (Internal compiler error for Fortran files when specify... X-Git-Tag: releases/gcc-4.9.4~300 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd0a6dd768364c555abce4c86092f85669e6f13;p=thirdparty%2Fgcc.git backport: re PR fortran/61156 (Internal compiler error for Fortran files when specifying a file instead of an include directory with -I) 2016-02-28 Jerry DeLisle 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 c39af56de1de..4e2610a161e0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-02-28 Jerry DeLisle + + 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 Backported from mainline diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 8934924d876e..aa4d7564706e 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 ("\"%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 b0b902fe1838..7d4b1de71869 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-02-28 Jerry DeLisle + + Backport from mainline + PR fortran/61156 + * gfortran.dg/include_6.f90: Update test. + 2016-02-18 Jerry DeLisle Backport from gcc-5-branch. diff --git a/gcc/testsuite/gfortran.dg/include_6.f90 b/gcc/testsuite/gfortran.dg/include_6.f90 index 0bac3909b8a0..d2b48eb595bb 100644 --- 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