--- a/gcc/config/mn10300/mn10300-protos.h	Tue May 25 18:58:51 2010 +0900
+++ b/gcc/config/mn10300/mn10300-protos.h	Tue Mar 22 17:18:12 2011 +0900
@@ -1,53 +1,57 @@
 /* Definitions of target machine for GNU compiler. Matsushita MN10300 series
-   Copyright (C) 2000, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003, 2004, 2005, 2007, 2009, 2010
+   Free Software Foundation, Inc.
    Contributed by Jeff Law (law@cygnus.com).
 
-This file is part of GCC.
+   This file is part of GCC.
 
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+   GCC is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GCC is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
+
+#define Mmode enum machine_mode
+#define Cstar const char *
+#define Rclas enum reg_class
 
 #ifdef RTX_CODE
-
-extern void mn10300_override_options (void);
-extern rtx legitimize_pic_address (rtx, rtx);
-extern int legitimate_pic_operand_p (rtx);
-extern void print_operand (FILE *, rtx, int);
-extern void print_operand_address (FILE *, rtx);
-extern void mn10300_print_reg_list (FILE *, int);
-extern int mn10300_get_live_callee_saved_regs (void);
-extern void mn10300_gen_multiple_store (int);
-extern void notice_update_cc (rtx, rtx);
-extern enum reg_class mn10300_secondary_reload_class (enum reg_class,
-						      enum machine_mode, rtx);
-extern const char *output_tst (rtx, rtx);
-extern int store_multiple_operation (rtx, enum machine_mode);
-extern int symbolic_operand (rtx, enum machine_mode);
-extern int impossible_plus_operand (rtx, enum machine_mode);
-
-extern bool mn10300_wide_const_load_uses_clr (rtx operands[2]);
-
-extern bool mn10300_function_value_regno_p (const unsigned int);
+extern rtx   mn10300_legitimize_pic_address (rtx, rtx);
+extern int   mn10300_legitimate_pic_operand_p (rtx);
+extern rtx   mn10300_legitimize_reload_address (rtx, Mmode, int, int, int);
+extern bool  mn10300_function_value_regno_p (const unsigned int);
+extern int   mn10300_get_live_callee_saved_regs (void);
+extern bool  mn10300_hard_regno_mode_ok (unsigned int, Mmode);
+extern bool  mn10300_legitimate_constant_p (rtx);
+extern bool  mn10300_modes_tieable (Mmode, Mmode);
+extern Cstar mn10300_output_add (rtx[3], bool);
+extern void  mn10300_print_operand (FILE *, rtx, int);
+extern void  mn10300_print_operand_address (FILE *, rtx);
+extern void  mn10300_print_reg_list (FILE *, int);
+extern Mmode mn10300_select_cc_mode (enum rtx_code, rtx, rtx);
+extern int   mn10300_store_multiple_operation (rtx, Mmode);
+extern int   mn10300_symbolic_operand (rtx, Mmode);
+extern void  mn10300_split_cbranch (Mmode, rtx, rtx);
+extern int   mn10300_split_and_operand_count (rtx);
+extern bool  mn10300_match_ccmode (rtx, Mmode);
 #endif /* RTX_CODE */
 
-#ifdef TREE_CODE
-extern struct rtx_def *function_arg (CUMULATIVE_ARGS *,
-				     enum machine_mode, tree, int);
-#endif /* TREE_CODE */
+extern bool  mn10300_regno_in_class_p (unsigned, int, bool);
+extern bool  mn10300_can_use_rets_insn (void);
+extern bool  mn10300_can_use_retf_insn (void);
+extern void  mn10300_expand_prologue (void);
+extern void  mn10300_expand_epilogue (void);
+extern int   mn10300_initial_offset (int, int);
+extern int   mn10300_frame_size (void);
 
-extern void expand_prologue (void);
-extern void expand_epilogue (void);
-extern int initial_offset (int, int);
-extern int can_use_return_insn (void);
-extern int mask_ok_for_mem_btst (int, int);
+#undef Mmode
+#undef Cstar
+#undef Rclas