From 15e1dac036941cf6f094ef8b4f11353d05968ac8 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 10 Jul 2008 03:51:04 +0000 Subject: [PATCH] re PR other/28322 (GCC new warnings and compatibility) 2008-07-10 Peter Maydell PR other/28322 * opts.c (print_ignored_options): report postponed diagnostics for unknown -Wno-* options as warnings, not errors. (postpone_unknown_option_error): renamed to postpone_unknown_option_warning. * gcc.dg/pr28322-2.c: check that emitted diagnostic for -Wno-foobar is a warning and not an error. From-SVN: r137687 --- gcc/ChangeLog | 10 ++++++++++ gcc/opts.c | 15 +++++++++------ gcc/testsuite/gcc.dg/pr28322-2.c | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e5fe0ede127..3e9ce90d36c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2008-07-10 Peter Maydell + + PR other/28322 + * opts.c (print_ignored_options): report postponed diagnostics for + unknown -Wno-* options as warnings, not errors. + (postpone_unknown_option_error): renamed to + postpone_unknown_option_warning. + * gcc.dg/pr28322-2.c: check that emitted diagnostic for -Wno-foobar + is a warning and not an error. + 2008-07-09 Doug Kwan Revert: diff --git a/gcc/opts.c b/gcc/opts.c index 8431a406bd7..7e8e96c4dad 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -457,14 +457,17 @@ complain_wrong_lang (const char *text, const struct cl_option *option, /* Buffer the unknown option described by the string OPT. Currently, we only complain about unknown -Wno-* options if they may have - prevented a diagnostic. Otherwise, we just ignore them. */ + prevented a diagnostic. Otherwise, we just ignore them. + Note that if we do complain, it is only as a warning, not an error; + passing the compiler an unrecognised -Wno-* option should never + change whether the compilation succeeds or fails. */ -static void postpone_unknown_option_error(const char *opt) +static void postpone_unknown_option_warning(const char *opt) { VEC_safe_push (const_char_p, heap, ignored_options, opt); } -/* Produce an error for each option previously buffered. */ +/* Produce a warning for each option previously buffered. */ void print_ignored_options (void) { @@ -476,7 +479,7 @@ void print_ignored_options (void) { const char *opt; opt = VEC_pop (const_char_p, ignored_options); - error ("unrecognized command line option \"%s\"", opt); + warning (0, "unrecognized command line option \"%s\"", opt); } input_location = saved_loc; @@ -513,9 +516,9 @@ handle_option (const char **argv, unsigned int lang_mask) opt_index = find_opt (opt + 1, lang_mask | CL_COMMON | CL_TARGET); if (opt_index == cl_options_count && opt[1] == 'W') { - /* We don't generate errors for unknown -Wno-* options + /* We don't generate warnings for unknown -Wno-* options unless we issue diagnostics. */ - postpone_unknown_option_error (argv[0]); + postpone_unknown_option_warning (argv[0]); result = 1; goto done; } diff --git a/gcc/testsuite/gcc.dg/pr28322-2.c b/gcc/testsuite/gcc.dg/pr28322-2.c index 8fde7b21aa3..89dd15390f8 100644 --- a/gcc/testsuite/gcc.dg/pr28322-2.c +++ b/gcc/testsuite/gcc.dg/pr28322-2.c @@ -8,5 +8,5 @@ int foo (void) return i; } -/* { dg-message "unrecognized command line option .-Wno-foobar." "" { target *-*-* } 0 } */ +/* { dg-warning "unrecognized command line option .-Wno-foobar." "" { target *-*-* } 0 } */ -- 2.30.2