toplev.c (general_init): Set default for fdiagnostics-show-option.

2010-04-23  Manuel López-Ibáñez  <manu@gcc.gnu.org>

	* 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

+2010-04-23  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* 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  <ebotcazou@adacore.com>
 
 	* expr.c (expand_expr_real_1) <VIEW_CONVERT_EXPR>: Only use conversion

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-

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_:

gcc/testsuite/ChangeLog

+2010-04-23  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* gcc.dg/Wconversion-integer.c: Update.
+
 2010-04-23  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/unchecked_convert5.adb: New test.

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" } */

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