Fix -Werror= handling for Joined warnings, add a few missing Warning keywords (PRs c/48088, c/68657)

--- gcc/common.opt.jj	2015-12-02 20:26:59.000000000 +0100
+++ gcc/common.opt	2015-12-04 09:59:10.050125152 +0100
@@ -576,7 +576,7 @@  Common Var(flag_fatal_errors)
 Exit on the first error occurred.
 
 Wframe-larger-than=
-Common RejectNegative Joined UInteger
+Common RejectNegative Joined UInteger Warning
 -Wframe-larger-than=<number>	Warn if a function's stack frame requires more than <number> bytes.
 
 Wfree-nonheap-object
--- gcc/opts.h.jj	2015-11-14 19:35:57.000000000 +0100
+++ gcc/opts.h	2015-12-04 13:29:43.945655448 +0100
@@ -363,7 +363,7 @@  extern void read_cmdline_option (struct
 				 const struct cl_option_handlers *handlers,
 				 diagnostic_context *dc);
 extern void control_warning_option (unsigned int opt_index, int kind,
-				    bool imply, location_t loc,
+				    const char *arg, bool imply, location_t loc,
 				    unsigned int lang_mask,
 				    const struct cl_option_handlers *handlers,
 				    struct gcc_options *opts,
--- gcc/opts-common.c.jj	2015-12-02 20:26:54.000000000 +0100
+++ gcc/opts-common.c	2015-12-04 13:52:56.664401522 +0100
@@ -1332,8 +1332,8 @@  get_option_state (struct gcc_options *op
    used by -Werror= and #pragma GCC diagnostic.  */
 
 void
-control_warning_option (unsigned int opt_index, int kind, bool imply,
-			location_t loc, unsigned int lang_mask,
+control_warning_option (unsigned int opt_index, int kind, const char *arg,
+			bool imply, location_t loc, unsigned int lang_mask,
 			const struct cl_option_handlers *handlers,
 			struct gcc_options *opts,
 			struct gcc_options *opts_set,
@@ -1349,8 +1349,38 @@  control_warning_option (unsigned int opt
     {
       /* -Werror=foo implies -Wfoo.  */
       if (cl_options[opt_index].var_type == CLVC_BOOLEAN)
-	handle_generated_option (opts, opts_set,
-				 opt_index, NULL, 1, lang_mask,
-				 kind, loc, handlers, dc);
+	{
+	  int value = 1;
+
+	  /* If the switch takes an integer, convert it.  */
+	  if (arg && cl_options[opt_index].cl_uinteger)
+	    {
+	      value = integral_argument (arg);
+	      if (value == -1)
+		return;
+	    }
+
+	  /* If the switch takes an enumerated argument, convert it.  */
+	  if (arg && (cl_options[opt_index].var_type == CLVC_ENUM))
+	    {
+	      const struct cl_enum *e
+		= &cl_enums[cl_options[opt_index].var_enum];
+
+	      if (enum_arg_to_value (e->values, arg, &value, lang_mask))
+		{
+		  const char *carg = NULL;
+
+		  if (enum_value_to_arg (e->values, &carg, value, lang_mask))
+		    arg = carg;
+		  gcc_assert (carg != NULL);
+		}
+	      else
+		return;
+	    }
+
+	  handle_generated_option (opts, opts_set,
+				   opt_index, arg, value, lang_mask,
+				   kind, loc, handlers, dc);
+	}
     }
 }
--- gcc/opts.c.jj	2015-11-23 13:29:49.000000000 +0100
+++ gcc/opts.c	2015-12-04 13:39:57.986390792 +0100
@@ -2114,7 +2114,7 @@  common_handle_option (struct gcc_options
 
     case OPT_pedantic_errors:
       dc->pedantic_errors = 1;
-      control_warning_option (OPT_Wpedantic, DK_ERROR, value,
+      control_warning_option (OPT_Wpedantic, DK_ERROR, NULL, value,
 			      loc, lang_mask,
 			      handlers, opts, opts_set,
                               dc);
@@ -2437,8 +2437,11 @@  enable_warning_as_error (const char *arg
   else
     {
       const diagnostic_t kind = value ? DK_ERROR : DK_WARNING;
+      const char *arg = NULL;
 
-      control_warning_option (option_index, (int) kind, value,
+      if (cl_options[option_index].flags & CL_JOINED)
+	arg = new_option + cl_options[option_index].opt_len;
+      control_warning_option (option_index, (int) kind, arg, value,
 			      loc, lang_mask,
 			      handlers, opts, opts_set, dc);
     }
--- gcc/c-family/c.opt.jj	2015-11-09 13:39:26.000000000 +0100
+++ gcc/c-family/c.opt	2015-12-04 10:06:57.749538643 +0100
@@ -435,7 +435,7 @@  C ObjC RejectNegative Warning Alias(Werr
 This switch is deprecated; use -Werror=implicit-function-declaration instead.
 
 Wfloat-conversion
-C ObjC C++ ObjC++ Var(warn_float_conversion) LangEnabledBy(C ObjC C++ ObjC++,Wconversion)
+C ObjC C++ ObjC++ Var(warn_float_conversion) Warning LangEnabledBy(C ObjC C++ ObjC++,Wconversion)
 Warn for implicit type conversions that cause loss of floating point precision.
 
 Wfloat-equal
@@ -837,7 +837,7 @@  C ObjC C++ ObjC++ EnabledBy(Wextra)
 ;
 
 Wsign-conversion
-C ObjC C++ ObjC++ Var(warn_sign_conversion) LangEnabledBy(C ObjC,Wconversion)
+C ObjC C++ ObjC++ Var(warn_sign_conversion) Warning LangEnabledBy(C ObjC,Wconversion)
 Warn for implicit type conversions between signed and unsigned integers.
 
 Wsign-promo
--- gcc/c-family/c-pragma.c.jj	2015-12-02 07:57:20.000000000 +0100
+++ gcc/c-family/c-pragma.c	2015-12-04 13:40:13.934165561 +0100
@@ -814,7 +814,11 @@  handle_pragma_diagnostic(cpp_reader *ARG
 
   struct cl_option_handlers handlers;
   set_default_handlers (&handlers);
-  control_warning_option (option_index, (int) kind, kind != DK_IGNORED,
+  const char *arg = NULL;
+  if (cl_options[option_index].flags & CL_JOINED)
+    arg = option_string + 1 + cl_options[option_index].opt_len;
+  control_warning_option (option_index, (int) kind,
+			  arg, kind != DK_IGNORED,
 			  loc, lang_mask, &handlers,
 			  &global_options, &global_options_set,
 			  global_dc);
--- gcc/ada/gcc-interface/trans.c.jj	2015-12-01 19:48:12.000000000 +0100
+++ gcc/ada/gcc-interface/trans.c	2015-12-04 15:22:38.890268297 +0100
@@ -1441,6 +1441,7 @@  Pragma_to_gnu (Node_Id gnat_node)
 
 	/* This is the same implementation as in the C family of compilers.  */
 	const unsigned int lang_mask = CL_Ada | CL_COMMON;
+	const char *arg = NULL;
 	if (Present (gnat_expr))
 	  {
 	    tree gnu_expr = gnat_to_gnu (gnat_expr);
@@ -1464,12 +1465,14 @@  Pragma_to_gnu (Node_Id gnat_node)
 		post_error ("?-W switch not valid for Ada", gnat_node);
 		break;
 	      }
+	    if (cl_options[option_index].flags & CL_JOINED)
+	      arg = option_string + 1 + cl_options[option_index].opt_len;
 	  }
 	else
 	  option_index = 0;
 
 	set_default_handlers (&handlers);
-	control_warning_option (option_index, (int) kind, imply, location,
+	control_warning_option (option_index, (int) kind, arg, imply, location,
 				lang_mask, &handlers, &global_options,
 				&global_options_set, global_dc);
       }
--- gcc/testsuite/c-c++-common/pr68657-1.c.jj	2015-12-04 13:57:31.826538859 +0100
+++ gcc/testsuite/c-c++-common/pr68657-1.c	2015-12-04 13:59:32.331847233 +0100
@@ -0,0 +1,26 @@ 
+/* PR c/68657 */
+/* { dg-options "-Werror=sign-conversion -Werror=float-conversion -Werror=frame-larger-than=65536" } */
+
+void
+f1 (void)
+{
+  unsigned int a = -5;	/* { dg-error "negative integer implicitly converted to unsigned type" } */
+  (void) a;
+}
+
+int
+f2 (void)
+{
+  return 3.1f;	/* { dg-error "conversion to 'int' alters 'float' constant value" } */
+}
+
+int f3 (char *);
+
+int
+f4 (void)
+{
+  char buf[131072];
+  return f3 (buf);
+}		/* { dg-error "the frame size of 1\[0-9]* bytes is larger than 65536 bytes" } */
+
+/* { dg-prune-output "treated as errors" } */
--- gcc/testsuite/c-c++-common/pr68657-2.c.jj	2015-12-04 13:57:31.826538859 +0100
+++ gcc/testsuite/c-c++-common/pr68657-2.c	2015-12-04 13:59:37.715771655 +0100
@@ -0,0 +1,8 @@ 
+/* PR c/68657 */
+/* { dg-do compile } */
+/* { dg-options "-Werror=larger-than=65536" } */
+
+int a[131072];	/* { dg-error "size of 'a' is \[1-9]\[0-9]* bytes" } */
+int b[1024];	/* { dg-bogus "size of 'b' is \[1-9]\[0-9]* bytes" } */
+
+/* { dg-prune-output "treated as errors" } */
--- gcc/testsuite/c-c++-common/pr68657-3.c.jj	2015-12-04 14:09:42.300307466 +0100
+++ gcc/testsuite/c-c++-common/pr68657-3.c	2015-12-04 14:10:18.432816785 +0100
@@ -0,0 +1,13 @@ 
+/* PR c/68657 */
+/* { dg-do compile } */
+
+#pragma GCC diagnostic error "-Wlarger-than=65536"
+int a[131072];	/* { dg-error "size of 'a' is \[1-9]\[0-9]* bytes" } */
+int b[1024];	/* { dg-bogus "size of 'b' is \[1-9]\[0-9]* bytes" } */
+#pragma GCC diagnostic ignored "-Wlarger-than=65536"
+int c[131072];	/* { dg-bogus "size of 'c' is \[1-9]\[0-9]* bytes" } */
+int d[1024];	/* { dg-bogus "size of 'd' is \[1-9]\[0-9]* bytes" } */
+#pragma GCC diagnostic warning "-Wlarger-than=65536"
+int e[131072];	/* { dg-warning "size of 'e' is \[1-9]\[0-9]* bytes" } */
+int f[1024];	/* { dg-bogus "size of 'f' is \[1-9]\[0-9]* bytes" } */
+/* { dg-prune-output "treated as errors" } */