diff options
| author | Richard Sandiford <rdsandiford@googlemail.com> | 2014-02-13 09:22:04 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2014-02-13 09:22:04 +0000 |
| commit | 9f8da9073b22c41c9cddbffa847f34e408d1322c (patch) | |
| tree | abff9a32d5a472a42bdd867c06f33b494a731f25 | |
| parent | 1de01e3ebfbaa00291727cdb718850bfa1b4d0ea (diff) | |
| download | gcc-9f8da9073b22c41c9cddbffa847f34e408d1322c.zip gcc-9f8da9073b22c41c9cddbffa847f34e408d1322c.tar.gz gcc-9f8da9073b22c41c9cddbffa847f34e408d1322c.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/opts.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/gomp/simd-clones-5.c | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0b90f0e..c31875d 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. @@ -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 0f1bcd4..07e0684 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 801c24f..84785e1 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) |