diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0b90f0eee2b..c31875d0903 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* opts.c (option_name): Remove "enabled by default" rider.
+
 2014-02-12  John David Anglin  <danglin@gcc.gnu.org>
 
 	* config/pa/pa.c (pa_option_override): Remove auto increment FIXME.
diff --git a/gcc/opts.c b/gcc/opts.c
index 7dee0e71b15..5dd442fd414 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;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0f1bcd4d37f..07e068456b7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-13  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gcc.dg/gomp/simd-clones-5.c: Update comment for new warning message.
+
 2014-02-12  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/torture/float128-mul-underflow.c,
diff --git a/gcc/testsuite/gcc.dg/gomp/simd-clones-5.c b/gcc/testsuite/gcc.dg/gomp/simd-clones-5.c
index 801c24f34af..84785e14816 100644
--- a/gcc/testsuite/gcc.dg/gomp/simd-clones-5.c
+++ b/gcc/testsuite/gcc.dg/gomp/simd-clones-5.c
@@ -3,7 +3,7 @@
 
 /* ?? The -w above is to inhibit the following warning for now:
    a.c:2:6: warning: AVX vector argument without AVX enabled changes
-   the ABI [enabled by default].  */
+   the ABI.  */
 
 #pragma omp declare simd notinbranch simdlen(4)
 void foo (int *a)