diff options
| author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-10-28 21:56:24 +0000 |
|---|---|---|
| committer | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-10-28 21:56:24 +0000 |
| commit | a56abdccae1807251bcec03f8979fedba8edbf95 (patch) | |
| tree | ac382e936a957c83179b3ff8865871b3b99a5790 /gcc/fortran/options.c | |
| parent | 99630555c2224e544a11928dcbc89e4a3f5ff1e7 (diff) | |
| download | gcc-a56abdccae1807251bcec03f8979fedba8edbf95.zip gcc-a56abdccae1807251bcec03f8979fedba8edbf95.tar.gz gcc-a56abdccae1807251bcec03f8979fedba8edbf95.tar.bz2 | |
re PR fortran/44054 (Handle -Werror, -Werror=, -fdiagnostics-show-option, !GCC$ diagnostic (pragmas) and color)
2014-10-28 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR fortran/44054
* gfortran.h (gfc_warning_cmdline): Rename as gfc_warning_now_2.
(gfc_error_cmdline): Rename as gfc_error_now_2.
* error.c (gfc_diagnostic_build_locus_prefix): Remove trailing space.
(gfc_diagnostic_starter): Add space between locus and prefix.
(gfc_warning_now_2): Renamed from gfc_warning_cmdline.
(gfc_error_now_2): Renamed from gfc_error_cmdline.
* scanner.c (add_path_to_list): Use gfc_warning_now_2.
(load_line): Likewise.
(load_file): Likewise.
* options.c (gfc_post_options): Update all renamed functions.
From-SVN: r216812
Diffstat (limited to 'gcc/fortran/options.c')
| -rw-r--r-- | gcc/fortran/options.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index a482d2f..8bc8f94 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -362,8 +362,8 @@ gfc_post_options (const char **pfilename) if (gfc_current_form == FORM_UNKNOWN) { gfc_current_form = FORM_FREE; - gfc_warning_cmdline ("Reading file %qs as free form", - (filename[0] == '\0') ? "<stdin>" : filename); + gfc_warning_now_2 ("Reading file %qs as free form", + (filename[0] == '\0') ? "<stdin>" : filename); } } @@ -372,10 +372,10 @@ gfc_post_options (const char **pfilename) if (gfc_current_form == FORM_FREE) { if (gfc_option.flag_d_lines == 0) - gfc_warning_cmdline ("%<-fd-lines-as-comments%> has no effect " - "in free form"); + gfc_warning_now_2 ("%<-fd-lines-as-comments%> has no effect " + "in free form"); else if (gfc_option.flag_d_lines == 1) - gfc_warning_cmdline ("%<-fd-lines-as-code%> has no effect in free form"); + gfc_warning_now_2 ("%<-fd-lines-as-code%> has no effect in free form"); } /* If -pedantic, warn about the use of GNU extensions. */ @@ -393,21 +393,21 @@ gfc_post_options (const char **pfilename) if (!gfc_option.flag_automatic && gfc_option.flag_max_stack_var_size != -2 && gfc_option.flag_max_stack_var_size != 0) - gfc_warning_cmdline ("Flag %<-fno-automatic%> overwrites %<-fmax-stack-var-size=%d%>", - gfc_option.flag_max_stack_var_size); + gfc_warning_now_2 ("Flag %<-fno-automatic%> overwrites %<-fmax-stack-var-size=%d%>", + gfc_option.flag_max_stack_var_size); else if (!gfc_option.flag_automatic && gfc_option.flag_recursive) - gfc_warning_cmdline ("Flag %<-fno-automatic%> overwrites %<-frecursive%>"); + gfc_warning_now_2 ("Flag %<-fno-automatic%> overwrites %<-frecursive%>"); else if (!gfc_option.flag_automatic && gfc_option.gfc_flag_openmp) - gfc_warning_cmdline ("Flag %<-fno-automatic%> overwrites %<-frecursive%> implied by " - "%<-fopenmp%>"); + gfc_warning_now_2 ("Flag %<-fno-automatic%> overwrites %<-frecursive%> implied by " + "%<-fopenmp%>"); else if (gfc_option.flag_max_stack_var_size != -2 && gfc_option.flag_recursive) - gfc_warning_cmdline ("Flag %<-frecursive%> overwrites %<-fmax-stack-var-size=%d%>", - gfc_option.flag_max_stack_var_size); + gfc_warning_now_2 ("Flag %<-frecursive%> overwrites %<-fmax-stack-var-size=%d%>", + gfc_option.flag_max_stack_var_size); else if (gfc_option.flag_max_stack_var_size != -2 && gfc_option.gfc_flag_openmp) - gfc_warning_cmdline ("Flag %<-fmax-stack-var-size=%d%> overwrites %<-frecursive%> " - "implied by %<-fopenmp%>", + gfc_warning_now_2 ("Flag %<-fmax-stack-var-size=%d%> overwrites %<-frecursive%> " + "implied by %<-fopenmp%>", gfc_option.flag_max_stack_var_size); /* Implement -frecursive as -fmax-stack-var-size=-1. */ |