From c7d0de89bb39336e8f7c0f1f1ab026975bedf3e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Fri, 23 Apr 2010 17:14:27 +0000 Subject: [PATCH] toplev.c (general_init): Set default for fdiagnostics-show-option. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2010-04-23 Manuel López-Ibáñez * toplev.c (general_init): Set default for fdiagnostics-show-option. * opts.c (common_handle_option): Allow disabling it. * common.opt (fdiagnostics-show-option): Add Var. Enabled by default. testsuite/ * gcc.dg/Wconversion-integer.c: Update. From-SVN: r158676 --- gcc/ChangeLog | 8 ++++++++ gcc/common.opt | 2 +- gcc/opts.c | 2 +- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/Wconversion-integer.c | 4 ++-- gcc/toplev.c | 1 + 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6b5feae200f..2ec92ea6583 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-04-23 Manuel López-Ibáñez + + * toplev.c (general_init): Set default for + fdiagnostics-show-option. + * opts.c (common_handle_option): Allow disabling it. + * common.opt (fdiagnostics-show-option): Add Var. Enabled by + default. + 2010-04-23 Eric Botcazou * expr.c (expand_expr_real_1) : Only use conversion diff --git a/gcc/common.opt b/gcc/common.opt index 6e9e6965f22..70b2c9050bf 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -465,7 +465,7 @@ Common Joined RejectNegative -fdiagnostics-show-location=[once|every-line] How often to emit source location at the beginning of line-wrapped diagnostics fdiagnostics-show-option -Common +Common Var(flag_diagnostics_show_option) Init(1) Amend appropriate diagnostic messages with the command line option that controls them fdump- diff --git a/gcc/opts.c b/gcc/opts.c index ce45e1cb0d5..0009a749dae 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -1766,7 +1766,7 @@ common_handle_option (size_t scode, const char *arg, int value, break; case OPT_fdiagnostics_show_option: - global_dc->show_option_requested = true; + global_dc->show_option_requested = value; break; case OPT_fdump_: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fc5f35f58a0..6e32296a3a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2010-04-23 Manuel López-Ibáñez + + * gcc.dg/Wconversion-integer.c: Update. + 2010-04-23 Eric Botcazou * gnat.dg/unchecked_convert5.adb: New test. diff --git a/gcc/testsuite/gcc.dg/Wconversion-integer.c b/gcc/testsuite/gcc.dg/Wconversion-integer.c index b2101076f93..d50b155699b 100644 --- a/gcc/testsuite/gcc.dg/Wconversion-integer.c +++ b/gcc/testsuite/gcc.dg/Wconversion-integer.c @@ -40,9 +40,9 @@ void h (int x) fuc ('A'); uc = 'A'; - uc = x ? 1U : -1; /* { dg-warning "conversion" } */ + uc = x ? 1U : -1; /* { dg-warning " conversion" } */ /* { dg-warning "negative integer implicitly converted to unsigned type" "" { target *-*-* } 43 } */ - uc = x ? SCHAR_MIN : 1U; /* { dg-warning "conversion" } */ + uc = x ? SCHAR_MIN : 1U; /* { dg-warning " conversion" } */ /* { dg-warning "negative integer implicitly converted to unsigned type" "" { target *-*-* } 45 } */ uc = x ? 1 : -1; /* { dg-warning "negative integer implicitly converted to unsigned type" } */ uc = x ? SCHAR_MIN : 1; /* { dg-warning "negative integer implicitly converted to unsigned type" } */ diff --git a/gcc/toplev.c b/gcc/toplev.c index 996bd900e65..0dce6ee8e43 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1694,6 +1694,7 @@ general_init (const char *argv0) /* Set a default printer. Language specific initializations will override it later. */ pp_format_decoder (global_dc->printer) = &default_tree_printer; + global_dc->show_option_requested = flag_diagnostics_show_option; /* Trap fatal signals, e.g. SIGSEGV, and convert them to ICE messages. */ #ifdef SIGSEGV -- 2.30.2