--- a/gcc/config/mep/mep-protos.h	Tue May 25 18:58:51 2010 +0900
+++ b/gcc/config/mep/mep-protos.h	Tue Mar 22 17:18:12 2011 +0900
@@ -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,9 +19,6 @@
 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_optimization_options (void);
-extern void mep_override_options (void);
 extern int mep_regno_reg_class (int);
 extern int mep_reg_class_from_constraint (int, const char *);
 extern bool mep_const_ok_for_letter_p (HOST_WIDE_INT, int);
@@ -37,9 +34,7 @@
 extern bool mep_multi_slot (rtx);
 extern bool mep_legitimate_address (enum machine_mode, rtx, int);
 extern int mep_legitimize_address (rtx *, rtx, enum machine_mode);
-#ifdef MAX_RELOADS
-extern int mep_legitimize_reload_address (rtx *, enum machine_mode, int, enum reload_type, int);
-#endif
+extern int mep_legitimize_reload_address (rtx *, enum machine_mode, int, /*enum reload_type*/ int, int);
 extern int mep_core_address_length (rtx, int);
 extern int mep_cop_address_length (rtx, int);
 extern bool mep_expand_mov (rtx *, enum machine_mode);
@@ -53,8 +48,8 @@
 extern const char *mep_emit_cbranch (rtx *, int);
 extern void mep_expand_call (rtx *, int);
 extern rtx mep_find_base_term (rtx);
-extern int mep_secondary_input_reload_class (enum reg_class, enum machine_mode, rtx);
-extern int mep_secondary_output_reload_class (enum reg_class, enum machine_mode, rtx);
+extern enum reg_class mep_secondary_input_reload_class (enum reg_class, enum machine_mode, rtx);
+extern enum reg_class mep_secondary_output_reload_class (enum reg_class, enum machine_mode, rtx);
 extern bool mep_secondary_memory_needed (enum reg_class, enum reg_class,
 					 enum machine_mode);
 extern void mep_expand_reload (rtx *, enum machine_mode);
@@ -77,10 +72,8 @@
 extern void mep_print_operand (FILE *, rtx, int);
 extern void mep_final_prescan_insn (rtx, rtx *, int);
 extern void mep_init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, tree);
-extern rtx mep_function_arg (CUMULATIVE_ARGS, enum machine_mode, tree, int);
-extern void mep_arg_advance (CUMULATIVE_ARGS *, enum machine_mode, tree, int);
 extern bool mep_return_in_memory (const_tree, const_tree);
-extern rtx mep_function_value (tree, tree);
+extern rtx mep_function_value (const_tree, const_tree);
 extern rtx mep_libcall_value (enum machine_mode);
 extern void mep_asm_output_opcode (FILE *, const char *);
 extern void mep_note_pragma_disinterrupt (const char *);
@@ -108,6 +101,14 @@
 extern bool mep_cannot_change_mode_class (enum machine_mode, enum machine_mode,
 					  enum reg_class);
 
+/* These are called from mep-pragmas (front end) and then call into
+   the RTL layer to re-initialize the register tables once we're done
+   changing them via pragmas.  */
+extern void mep_save_register_info (void);
+extern void mep_reinit_regs (void);
+extern void mep_init_regs (void);
+
+
 extern int cgen_h_uint_6a1_immediate (rtx, enum machine_mode);
 extern int cgen_h_uint_7a1_immediate (rtx, enum machine_mode);
 extern int cgen_h_uint_8a1_immediate (rtx, enum machine_mode);