* config/sh/sh-protos.h (sh_promote_function_mode): Remove.

	* config/sh/sh.c (sh_promote_function_mode): Wrap long lines.
	(TARGET_PROMOTE_FUNCTION_MODE): Define.
	(TARGET_PROMOTE_FUNCTION_ARGS): Remove.
	(sh_promote_function_mode): Fix typo.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38b3343..3fb3452 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-03  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+       * config/sh/sh-protos.h (sh_promote_function_mode): Remove.
+       * config/sh/sh.c (sh_promote_function_mode): Wrap long lines.
+       (TARGET_PROMOTE_FUNCTION_MODE): Define.
+       (TARGET_PROMOTE_FUNCTION_ARGS): Remove.
+       (sh_promote_function_mode): Fix typo.
+
 2009-08-03  Andreas Krebbel  <krebbel1@de.ibm.com>
 
        * explow.c (promote_mode): Mark TYPE and PUNSIGNEDP as

diff --git a/gcc/config/sh/sh-protos.h b/gcc/config/sh/sh-protos.h
index dec662b..35cd730 100644 (file)
--- a/gcc/config/sh/sh-protos.h
+++ b/gcc/config/sh/sh-protos.h
@@ -166,8 +166,6 @@ extern int sh_pass_in_reg_p (CUMULATIVE_ARGS *, enum machine_mode, tree);
 extern void sh_init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, tree, signed int, enum machine_mode);
 extern bool sh_promote_prototypes (const_tree);
 extern rtx sh_dwarf_register_span (rtx);
-extern enum machine_mode sh_promote_function_mode (const_tree, enum machine_mode,
-                                                  int *, const_tree, int);
 
 extern rtx replace_n_hard_rtx (rtx, rtx *, int , int);
 extern int shmedia_cleanup_truncate (rtx *, void *);

diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 60bb865..337be6b 100644 (file)
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -257,8 +257,10 @@ static bool sh_pretend_outgoing_varargs_named (CUMULATIVE_ARGS *);
 static tree sh_build_builtin_va_list (void);
 static void sh_va_start (tree, rtx);
 static tree sh_gimplify_va_arg_expr (tree, tree, gimple_seq *, gimple_seq *);
-static enum machine_mode sh_promote_function_mode (const_tree type, enum machine_mode,
-                                                  int *punsignedp, const_tree funtype,
+static enum machine_mode sh_promote_function_mode (const_tree type,
+                                                  enum machine_mode,
+                                                  int *punsignedp,
+                                                  const_tree funtype,
                                                   int for_return);
 static bool sh_pass_by_reference (CUMULATIVE_ARGS *, enum machine_mode,
                                  const_tree, bool);
@@ -440,8 +442,8 @@ static const struct attribute_spec sh_attribute_table[] =
 
 #undef TARGET_PROMOTE_PROTOTYPES
 #define TARGET_PROMOTE_PROTOTYPES sh_promote_prototypes
-#undef TARGET_PROMOTE_FUNCTION_ARGS
-#define TARGET_PROMOTE_FUNCTION_ARGS sh_promote_function_mode
+#undef TARGET_PROMOTE_FUNCTION_MODE
+#define TARGET_PROMOTE_FUNCTION_MODE sh_promote_function_mode
 
 #undef TARGET_STRUCT_VALUE_RTX
 #define TARGET_STRUCT_VALUE_RTX sh_struct_value_rtx
@@ -7902,7 +7904,7 @@ sh_promote_function_mode (const_tree type, enum machine_mode mode,
                          int *punsignedp, const_tree funtype, int for_return)
 {
   if (sh_promote_prototypes (funtype))
-    return promote_mode (type, machine_mode, punsignedp);
+    return promote_mode (type, mode, punsignedp);
   else
     return mode;
 }