Index: config/mep/t-mep
===================================================================
--- config/mep/t-mep	(revision 163844)
+++ config/mep/t-mep	(working copy)
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # GCC makefile fragment for MeP
-# Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009
+# Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009, 2010
 # Free Software Foundation, Inc.
 # Contributed by Red Hat Inc
 #
@@ -22,7 +22,7 @@
 
 # Force genpreds to be rebuilt in case MeP-Integrator changed the predicates
 
-GTM_H = tm.h $(tm_file_list) $(srcdir)/config/mep/mep-intrin.h
+GTM_H = tm.h $(tm_file_list) $(srcdir)/config/mep/mep-intrin.h insn-constants.h
 
 # Use -O0 instead of -O2 so we don't get complex relocations
 
Index: config/mep/mep-protos.h
===================================================================
--- config/mep/mep-protos.h	(revision 163844)
+++ config/mep/mep-protos.h	(working copy)
@@ -1,5 +1,5 @@
 /* Prototypes for exported functions defined in mep.c
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free
    Software Foundation, Inc.
    Contributed by Red Hat Inc (dj@redhat.com)
 
@@ -19,7 +19,7 @@
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-extern void mep_conditional_register_usage (char *, char *);
+extern void mep_conditional_register_usage (void);
 extern void mep_optimization_options (void);
 extern void mep_override_options (void);
 extern int mep_regno_reg_class (int);
Index: config/mep/mep.c
===================================================================
--- config/mep/mep.c	(revision 163844)
+++ config/mep/mep.c	(working copy)
@@ -354,7 +354,7 @@
 }
 
 void
-mep_conditional_register_usage (char *fixed_regs, char *call_used_regs)
+mep_conditional_register_usage (void)
 {
   int i;
 
Index: config/mep/mep.h
===================================================================
--- config/mep/mep.h	(revision 163844)
+++ config/mep/mep.h	(working copy)
@@ -1,5 +1,5 @@
 /* Definitions for Toshiba Media Processor
-   Copyright (C) 2001, 2003, 2004, 2005, 2007, 2008, 2009
+   Copyright (C) 2001, 2003, 2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
@@ -276,7 +276,7 @@
   }
 
 #define CONDITIONAL_REGISTER_USAGE \
-	mep_conditional_register_usage (fixed_regs, call_used_regs);
+	mep_conditional_register_usage ();
 
 #define REG_ALLOC_ORDER {						\
   /* core registers */							\