2009-04-22 Manuel Lopez-Ibanez <manu@gcc.gnu.org>

	* Makefile.in: Update dependencies.
	* errors.c (warning): Remove unused parameter 'opt'. Returns
	'void'.
	* errors.h: Remove bogus comment about compatibility.
	(warning): Update declaration.
	* genautomata.c: Update all calls to warning.
	* gimple.c: Do not include errors.h. Include toplev.h.
	* tree-ssa-structalias.c: Do not include errors.h.
	* omega.c: Likewise.
	* tree-ssa-reassoc.c: Likewise.
	* config/spu/spu-c.c: Likewise.
	* config/spu/t-spu-elf: Update dependencies.


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

9 files changed, 39 insertions, 36 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18a3573a338..4218dca0d2a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+2009-04-22  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	* Makefile.in: Update dependencies.
+	* errors.c (warning): Remove unused parameter 'opt'. Returns
+	'void'.
+	* errors.h: Remove bogus comment about compatibility.
+	(warning): Update declaration.
+	* genautomata.c: Update all calls to warning.
+	* gimple.c: Do not include errors.h. Include toplev.h.
+	* tree-ssa-structalias.c: Do not include errors.h.
+	* omega.c: Likewise.
+	* tree-ssa-reassoc.c: Likewise.
+	* config/spu/spu-c.c: Likewise.
+	* config/spu/t-spu-elf: Update dependencies.
+
 2009-04-22  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/39824
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 32ea68eb445..743cf104363 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2344,8 +2344,7 @@ tree-browser.o : tree-browser.c tree-browser.def $(CONFIG_H) $(SYSTEM_H) \
    $(TREE_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) \
    $(TM_H) coretypes.h
 omega.o : omega.c omega.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   errors.h $(GGC_H) $(TREE_H) $(DIAGNOSTIC_H) varray.h $(TREE_PASS_H) \
-   $(PARAMS_H)
+   $(GGC_H) $(TREE_H) $(DIAGNOSTIC_H) varray.h $(TREE_PASS_H) $(PARAMS_H)
 tree-chrec.o: tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(GGC_H) $(TREE_H) $(REAL_H) $(SCEV_H) $(TREE_PASS_H) $(PARAMS_H) \
    $(DIAGNOSTIC_H) $(CFGLOOP_H) $(TREE_FLOW_H)
@@ -2411,7 +2410,7 @@ tree-object-size.o: tree-object-size.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) $(TREE_H) $(TOPLEV_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \
    $(TREE_PASS_H) tree-ssa-propagate.h
 gimple.o : gimple.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
-   $(GGC_H) $(GIMPLE_H) $(GIMPLE_H) $(DIAGNOSTIC_H) gt-gimple.h \
+   $(GGC_H) $(GIMPLE_H) $(TOPLEV_H) $(DIAGNOSTIC_H) gt-gimple.h \
    $(TREE_FLOW_H) value-prof.h $(FLAGS_H)
 gimple-pretty-print.o : gimple-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \
    $(TREE_H) $(DIAGNOSTIC_H) $(REAL_H) $(HASHTAB_H) $(TREE_FLOW_H) \
@@ -2475,7 +2474,7 @@ passes.o : passes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    gt-passes.h $(DF_H) $(PREDICT_H)
 
 plugin.o : plugin.c $(PLUGIN_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   errors.h $(TOPLEV_H) $(TREE_H) $(TREE_PASS_H) intl.h
+   $(TOPLEV_H) $(TREE_H) $(TREE_PASS_H) intl.h
 
 plugin-version.o : plugin-version.c $(SYSTEM_H) gcc-plugin.h configargs.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
@@ -2924,7 +2923,7 @@ ira-build.o: ira-build.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(PARAMS_H) $(DF_H) sparseset.h $(IRA_INT_H)
 ira-costs.o: ira-costs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(TARGET_H) $(RTL_H) insn-config.h $(RECOG_H) \
-   $(REGS_H) hard-reg-set.h $(FLAGS_H) errors.h \
+   $(REGS_H) hard-reg-set.h $(FLAGS_H) \
    $(EXPR_H) $(BASIC_BLOCK_H) $(TM_P_H) \
    $(IRA_INT_H)
 ira-conflicts.o: ira-conflicts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 6ab7f3bb920..6e37fc532ea 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -25,7 +25,6 @@
 #include "function.h"
 #include "rtl.h"
 #include "expr.h"
-#include "errors.h"
 #include "tm_p.h"
 #include "langhooks.h"
 #include "insn-config.h"
diff --git a/gcc/config/spu/t-spu-elf b/gcc/config/spu/t-spu-elf
index f8c5ba5b01d..97341327501 100644
--- a/gcc/config/spu/t-spu-elf
+++ b/gcc/config/spu/t-spu-elf
@@ -93,6 +93,6 @@ spu-c.o: $(srcdir)/config/spu/spu-c.c \
     $(srcdir)/config/spu/spu-builtins.h \
     $(srcdir)/config/spu/spu-builtins.def \
     $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(CPPLIB_H) \
-    $(TM_P_H) c-pragma.h errors.h coretypes.h $(TM_H) insn-codes.h
+    $(TM_P_H) c-pragma.h coretypes.h $(TM_H) insn-codes.h
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/spu/spu-c.c
 
diff --git a/gcc/errors.c b/gcc/errors.c
index fcc3446d270..d89e14d94d6 100644
--- a/gcc/errors.c
+++ b/gcc/errors.c
@@ -40,8 +40,8 @@ int have_error = 0;
 
 /* Print a warning message - output produced, but there may be problems.  */
 
-bool
-warning (int opt ATTRIBUTE_UNUSED, const char *format, ...)
+void
+warning (const char *format, ...)
 {
   va_list ap;
 
@@ -50,7 +50,6 @@ warning (int opt ATTRIBUTE_UNUSED, const char *format, ...)
   vfprintf (stderr, format, ap);
   va_end (ap);
   fputc('\n', stderr);
-  return true;
 }
 
 
diff --git a/gcc/errors.h b/gcc/errors.h
index 10d52c72d2d..c66054368da 100644
--- a/gcc/errors.h
+++ b/gcc/errors.h
@@ -29,11 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_ERRORS_H
 #define GCC_ERRORS_H
 
-/* The first parameter is for compatibility with the non-generator
-   version of warning().  For those, you'd pass an OPT_W* value from
-   options.h, but in generator programs it has no effect, so it's OK
-   to just pass zero for calls from generator-only files.  */
-extern bool warning (int, const char *, ...) ATTRIBUTE_PRINTF_2 ATTRIBUTE_COLD;
+extern void warning (const char *, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_COLD;
 extern void error (const char *, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_COLD;
 extern void fatal (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_1 ATTRIBUTE_COLD;
 extern void internal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_1 ATTRIBUTE_COLD;
diff --git a/gcc/genautomata.c b/gcc/genautomata.c
index 0f5a4086704..e78eea2c258 100644
--- a/gcc/genautomata.c
+++ b/gcc/genautomata.c
@@ -2314,8 +2314,7 @@ add_presence_absence (unit_set_el_t dest_list,
 			  no_error_flag = 0;
 			}
 		      else
-			warning
-			  (0, "unit `%s' excludes and requires presence of `%s'",
+			warning ("unit `%s' excludes and requires presence of `%s'",
 			   dst->unit_decl->name, unit->name);
 		    }
 		}
@@ -2328,15 +2327,13 @@ add_presence_absence (unit_set_el_t dest_list,
 		  {
 		    if (!w_flag)
 		      {
-			error
-			  ("unit `%s' requires absence and presence of `%s'",
-			   dst->unit_decl->name, unit->name);
+			error ("unit `%s' requires absence and presence of `%s'",
+			       dst->unit_decl->name, unit->name);
 			no_error_flag = 0;
 		      }
 		    else
-		      warning
-			(0, "unit `%s' requires absence and presence of `%s'",
-			 dst->unit_decl->name, unit->name);
+		      warning ("unit `%s' requires absence and presence of `%s'",
+			       dst->unit_decl->name, unit->name);
 		  }
 	    if (no_error_flag)
 	      {
@@ -2402,7 +2399,7 @@ insert_bypass (struct bypass_decl *bypass)
 		  error ("the same bypass `%s - %s' is already defined",
 			 bypass->out_insn_name, bypass->in_insn_name);
 		else
-		  warning (0, "the same bypass `%s - %s' is already defined",
+		  warning ("the same bypass `%s - %s' is already defined",
 			   bypass->out_insn_name, bypass->in_insn_name);
 	      }
 	    else if (!w_flag)
@@ -2411,7 +2408,7 @@ insert_bypass (struct bypass_decl *bypass)
 		     bypass->bypass_guard_name);
 	    else
 	      warning
-		(0, "the same bypass `%s - %s' (guard %s) is already defined",
+		("the same bypass `%s - %s' (guard %s) is already defined",
 		 bypass->out_insn_name, bypass->in_insn_name,
 		 bypass->bypass_guard_name);
 	    return;
@@ -2465,7 +2462,7 @@ process_decls (void)
 		error ("repeated declaration of automaton `%s'",
 		       DECL_AUTOMATON (decl)->name);
 	      else
-		warning (0, "repeated declaration of automaton `%s'",
+		warning ("repeated declaration of automaton `%s'",
 			 DECL_AUTOMATON (decl)->name);
 	    }
 	}
@@ -2664,7 +2661,7 @@ check_automaton_usage (void)
 	  if (!w_flag)
 	    error ("automaton `%s' is not used", DECL_AUTOMATON (decl)->name);
 	  else
-	    warning (0, "automaton `%s' is not used",
+	    warning ("automaton `%s' is not used",
 		     DECL_AUTOMATON (decl)->name);
 	}
     }
@@ -2778,14 +2775,14 @@ check_usage (void)
 	  if (!w_flag)
 	    error ("unit `%s' is not used", DECL_UNIT (decl)->name);
 	  else
-	    warning (0, "unit `%s' is not used", DECL_UNIT (decl)->name);
+	    warning ("unit `%s' is not used", DECL_UNIT (decl)->name);
 	}
       else if (decl->mode == dm_reserv && !DECL_RESERV (decl)->reserv_is_used)
 	{
 	  if (!w_flag)
 	    error ("reservation `%s' is not used", DECL_RESERV (decl)->name);
 	  else
-	    warning (0, "reservation `%s' is not used", DECL_RESERV (decl)->name);
+	    warning ("reservation `%s' is not used", DECL_RESERV (decl)->name);
 	}
     }
 }
@@ -9234,10 +9231,9 @@ check_automata_insn_issues (void)
 			   automaton->corresponding_automaton_decl->name,
 			   reserv_ainsn->insn_reserv_decl->name);
 		  else
-		    warning
-		      (0, "Automaton `%s': Insn `%s' will never be issued",
-		       automaton->corresponding_automaton_decl->name,
-		       reserv_ainsn->insn_reserv_decl->name);
+		    warning ("Automaton `%s': Insn `%s' will never be issued",
+			     automaton->corresponding_automaton_decl->name,
+			     reserv_ainsn->insn_reserv_decl->name);
 		}
 	      else
 		{
@@ -9245,7 +9241,7 @@ check_automata_insn_issues (void)
 		    error ("Insn `%s' will never be issued",
 			   reserv_ainsn->insn_reserv_decl->name);
 		  else
-		    warning (0, "Insn `%s' will never be issued",
+		    warning ("Insn `%s' will never be issued",
 			     reserv_ainsn->insn_reserv_decl->name);
 		}
 	  }
diff --git a/gcc/gimple.c b/gcc/gimple.c
index 5487cbc380d..db7f872b5cc 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -25,10 +25,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "tree.h"
 #include "ggc.h"
-#include "errors.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "gimple.h"
+#include "toplev.h"
 #include "diagnostic.h"
 #include "tree-flow.h"
 #include "value-prof.h"
diff --git a/gcc/omega.c b/gcc/omega.c
index 8f0470f6dfd..1a8b37f0909 100644
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "errors.h"
 #include "ggc.h"
 #include "tree.h"
 #include "diagnostic.h"