opts.c (option_name): Remove "enabled by default" rider.

gcc/
	* opts.c (option_name): Remove "enabled by default" rider.

gcc/testsuite/
	* gcc.dg/gomp/simd-clones-5.c: Update comment for new warning message.

From-SVN: r207747

1 files changed, 4 insertions, 8 deletions

diff --git a/gcc/opts.c b/gcc/opts.c
index 7dee0e7..5dd442f 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -2216,14 +2216,10 @@ option_name (diagnostic_context *context, int option_index,
 	return xstrdup (cl_options[option_index].opt_text);
     }
   /* A warning without option classified as an error.  */
-  else if (orig_diag_kind == DK_WARNING || orig_diag_kind == DK_PEDWARN
-	   || diag_kind == DK_WARNING)
-    {
-      if (context->warning_as_error_requested)
-	return xstrdup (cl_options[OPT_Werror].opt_text);
-      else
-	return xstrdup (_("enabled by default"));
-    }
+  else if ((orig_diag_kind == DK_WARNING || orig_diag_kind == DK_PEDWARN
+	    || diag_kind == DK_WARNING)
+	   && context->warning_as_error_requested)
+    return xstrdup (cl_options[OPT_Werror].opt_text);
   else
     return NULL;
 }