[patch committed] Fix build failure on SH

Kaz Kojima kkojima@rr.iij4u.or.jp
Mon Aug 3 10:34:00 GMT 2009


I've applied the attached obvious patch which fixes build
failure on SH.

Regards,
	kaz
--
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.

diff -up ORIG/trunk/gcc/config/sh/sh-protos.h trunk/gcc/config/sh/sh-protos.h
--- ORIG/trunk/gcc/config/sh/sh-protos.h	2009-08-03 11:04:53.000000000 +0900
+++ trunk/gcc/config/sh/sh-protos.h	2009-08-03 13:09:19.000000000 +0900
@@ -166,8 +166,6 @@ extern int sh_pass_in_reg_p (CUMULATIVE_
 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 -up ORIG/trunk/gcc/config/sh/sh.c trunk/gcc/config/sh/sh.c
--- ORIG/trunk/gcc/config/sh/sh.c	2009-08-03 11:04:53.000000000 +0900
+++ trunk/gcc/config/sh/sh.c	2009-08-03 13:47:55.000000000 +0900
@@ -257,8 +257,10 @@ static bool sh_pretend_outgoing_varargs_
 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_at
 
 #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 typ
 			  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;
 }



More information about the Gcc-patches mailing list