2012-04-29 Manuel López-Ibáñez <manu@gcc.gnu.org>

        * opts.c (finish_options): Do not handle -Wmissing-noreturn here.
        * common.opt (Wmissing-noreturn): Alias of -Wsuggest-attribute=noreturn.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186943 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c0e973..f90cceb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-29  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+        * opts.c (finish_options): Do not handle -Wmissing-noreturn here.
+        * common.opt (Wmissing-noreturn): Alias of -Wsuggest-attribute=noreturn.
+
 2012-04-29  Hans-Peter Nilsson  <hp@axis.com>
 
        PR target/53156

diff --git a/gcc/common.opt b/gcc/common.opt
index 14c88bf..af02992 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -567,8 +567,7 @@ Common Var(warn_unsafe_loop_optimizations) Warning
 Warn if the loop cannot be optimized due to nontrivial assumptions.
 
 Wmissing-noreturn
-Common Var(warn_missing_noreturn) Warning
-Warn about functions which might be candidates for __attribute__((noreturn))
+Common Alias(Wsuggest-attribute=noreturn)
 
 Woverflow
 Common Var(warn_overflow) Init(1) Warning

diff --git a/gcc/opts.c b/gcc/opts.c
index ab2de8f..22c7590 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -667,10 +667,6 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
   if (opts->x_flag_tm && opts->x_flag_non_call_exceptions)
     sorry ("transactional memory is not supported with non-call exceptions");
 
-  /* -Wmissing-noreturn is alias for -Wsuggest-attribute=noreturn.  */
-  if (opts->x_warn_missing_noreturn)
-    opts->x_warn_suggest_attribute_noreturn = true;
-    
   /* Unless the user has asked for section anchors, we disable toplevel
      reordering at -O0 to disable transformations that might be surprising
      to end users and to get -fno-toplevel-reorder tested.  */