From 0ee1b105a36031f53b989f42f7bb38fc8f2c17be Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 3 Nov 2008 08:20:24 +0100 Subject: re PR fortran/37821 (gfortran is ignoring #includes with the syntax ) 2008-11-03 Tobias Burnus PR fortran/37821 * cpp.c (gfc_cpp_add_include_path): Use BRACKET. * scanner.c (add_path_to_list): Argument to add at head. (gfc_add_include_path): Add new argument. (gfc_add_intrinsic_modules_path) Update call. (load_file): Print filename/line in the error message. * gfortran.h (gfc_add_include_path): Update prototype. * options.c (gfc_post_options,gfc_handle_module_path_options, gfc_handle_option): Update call. * lang-spec.h (F951_OPTIONS): Don't insert include path twice. * arith.c (arith_error): Add -fno-range-error to the message. 2008-11-03 Tobias Burnus PR fortran/37821 * gfortran.dg/include_4.f90: New. * gfortran.dg/include_5.f90: New. * gfortran.dg/include_4.inc: New. From-SVN: r141544 --- gcc/fortran/options.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gcc/fortran/options.c') diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index 3f49d56..7a800ce 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -265,10 +265,10 @@ gfc_post_options (const char **pfilename) source_path = (char *) alloca (i + 1); memcpy (source_path, canon_source_file, i); source_path[i] = 0; - gfc_add_include_path (source_path, true); + gfc_add_include_path (source_path, true, true); } else - gfc_add_include_path (".", true); + gfc_add_include_path (".", true, true); if (canon_source_file != gfc_source_file) gfc_free (CONST_CAST (char *, canon_source_file)); @@ -407,7 +407,7 @@ gfc_handle_module_path_options (const char *arg) strcpy (gfc_option.module_dir, arg); strcat (gfc_option.module_dir, "/"); - gfc_add_include_path (gfc_option.module_dir, true); + gfc_add_include_path (gfc_option.module_dir, true, false); } @@ -639,7 +639,7 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_fintrinsic_modules_path: - gfc_add_include_path (arg, false); + gfc_add_include_path (arg, false, false); gfc_add_intrinsic_modules_path (arg); break; @@ -744,7 +744,7 @@ gfc_handle_option (size_t scode, const char *arg, int value) break; case OPT_I: - gfc_add_include_path (arg, true); + gfc_add_include_path (arg, true, false); break; case OPT_J: -- cgit v1.1