bfin.h (TARGET_RETURN_IN_MEMORY): Don't define here.

	* config/bfin/bfin.h (TARGET_RETURN_IN_MEMORY): Don't define here.
	* config/bfin/bfin-protos.h (bfin_return_in_memory): Don't declare.
	* config/bfin/bfin.c (bfin_return_in_memory): Now static.  Return bool.
	(TARGET_RETURN_IN_MEMORY): Define.

From-SVN: r135344

gcc/ChangeLog

+2008-05-15  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config/bfin/bfin.h (TARGET_RETURN_IN_MEMORY): Don't define here.
+	* config/bfin/bfin-protos.h (bfin_return_in_memory): Don't declare.
+	* config/bfin/bfin.c (bfin_return_in_memory): Now static.  Return bool.
+	(TARGET_RETURN_IN_MEMORY): Define.
+
 2008-05-15  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/36244

gcc/config/bfin/bfin-protos.h

@@ -120,7 +120,6 @@ extern void asm_conditional_branch (rtx, rtx *, int, int);
 extern rtx bfin_gen_compare (rtx, Mmode);
 
 extern int bfin_local_alignment (tree, int);
-extern int bfin_return_in_memory (const_tree, const_tree);
 extern void initialize_trampoline (rtx, rtx, rtx);
 extern bool bfin_legitimate_address_p (Mmode, rtx, int);
 extern rtx bfin_va_arg (tree, tree);

gcc/config/bfin/bfin.c

@@ -1842,7 +1842,7 @@ bfin_pass_by_reference (CUMULATIVE_ARGS *cum ATTRIBUTE_UNUSED,
    or in a register (false).  This is called by the macro
    TARGET_RETURN_IN_MEMORY.  */
 
-int
+static bool
 bfin_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
 {
   int size = int_size_in_bytes (type);
@@ -5913,4 +5913,7 @@ bfin_expand_builtin (tree exp, rtx target ATTRIBUTE_UNUSED,
 #undef TARGET_CANNOT_FORCE_CONST_MEM
 #define TARGET_CANNOT_FORCE_CONST_MEM bfin_cannot_force_const_mem
 
+#undef TARGET_RETURN_IN_MEMORY
+#define TARGET_RETURN_IN_MEMORY bfin_return_in_memory
+
 struct gcc_target targetm = TARGET_INITIALIZER;

gcc/config/bfin/bfin.h

@@ -841,7 +841,6 @@ typedef struct {
 #define FUNCTION_VALUE_REGNO_P(N) ((N) == REG_R0)
 
 #define DEFAULT_PCC_STRUCT_RETURN 0
-#define TARGET_RETURN_IN_MEMORY bfin_return_in_memory
 
 /* Before the prologue, the return address is in the RETS register.  */
 #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, REG_RETS)