arm-protos.h (arm_return_in_memory): Remove public arm_return_in_memory() prototype.

	* arm-protos.h (arm_return_in_memory): Remove public
	arm_return_in_memory() prototype.
	* arm.c (arm_return_in_memory): Add static prototype, add target
	hook macro, change definition and comments.
	* arm.h (TARGET_RETURN_IN_MEMORY): Remove.

From-SVN: r136934

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d5e933d471ff19e0fd1fcbadf0fecbbe221591a..e5bbef9740dba95e92de82574e5428657d174976 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-16  Chung-Lin Tang  <ctang@marvell.com>
+
+       * arm-protos.h (arm_return_in_memory): Remove public
+       arm_return_in_memory() prototype.
+       * arm.c (arm_return_in_memory): Add static prototype, add target
+       hook macro, change definition and comments.
+       * arm.h (TARGET_RETURN_IN_MEMORY): Remove.
+
 2008-06-19  Ben Elliston  <bje@au.ibm.com>
 
        * dfp.h, dfp.c, config/dfp-bit.h, config/dfp-bit.c, real.h,

diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 1dbd3a18d2afac295e3d5bcf79a99e4a09901ebb..a2963494c480750bf00c5f679f71d2cbdb950b86 100644 (file)
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -42,9 +42,6 @@ extern unsigned int arm_dbx_register_number (unsigned int);
 extern void arm_output_fn_unwind (FILE *, bool);
   
 
-#ifdef TREE_CODE
-extern bool arm_return_in_memory (const_tree, const_tree);
-#endif
 #ifdef RTX_CODE
 extern bool arm_vector_mode_supported_p (enum machine_mode);
 extern int arm_hard_regno_mode_ok (unsigned int, enum machine_mode);

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 5df6a7722ed3be0f65e916d4a77bb46733fd9904..c7f223a6b6302c39bb112090db7664e59327d49b 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -166,6 +166,7 @@ static bool arm_default_short_enums (void);
 static bool arm_align_anon_bitfield (void);
 static bool arm_return_in_msb (const_tree);
 static bool arm_must_pass_in_stack (enum machine_mode, const_tree);
+static bool arm_return_in_memory (const_tree, const_tree);
 #ifdef TARGET_UNWIND_INFO
 static void arm_unwind_emit (FILE *, rtx);
 static bool arm_output_ttype (rtx);
@@ -333,6 +334,9 @@ static bool arm_allocate_stack_slots_for_args (void);
 #undef TARGET_RETURN_IN_MSB
 #define TARGET_RETURN_IN_MSB arm_return_in_msb
 
+#undef TARGET_RETURN_IN_MEMORY
+#define TARGET_RETURN_IN_MEMORY arm_return_in_memory
+
 #undef TARGET_MUST_PASS_IN_STACK
 #define TARGET_MUST_PASS_IN_STACK arm_must_pass_in_stack
 
@@ -2747,9 +2751,9 @@ arm_apply_result_size (void)
 }
 
 /* Decide whether a type should be returned in memory (true)
-   or in a register (false).  This is called by the macro
+   or in a register (false).  This is called as the target hook
    TARGET_RETURN_IN_MEMORY.  */
-bool
+static bool
 arm_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
 {
   HOST_WIDE_INT size;

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index b77a2ac5b8f7ef6e1b7dde6029b8731552519ab4..9f662f312977caeee7078cb22506a3799bf1a6d4 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -1478,11 +1478,6 @@ do {                                                                           \
    registers.  */
 #define APPLY_RESULT_SIZE arm_apply_result_size()
 
-/* How large values are returned */
-/* A C expression which can inhibit the returning of certain function values
-   in registers, based on the type of value.  */
-#define TARGET_RETURN_IN_MEMORY arm_return_in_memory
-
 /* Define DEFAULT_PCC_STRUCT_RETURN to 1 if all structure and union return
    values must be in memory.  On the ARM, they need only do so if larger
    than a word, or if they contain elements offset from zero in the struct.  */