diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbdd78fa9228..3d892f63f2f1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,13 +1,19 @@
+2008-05-15  Diego Novillo  <dnovillo@google.com>
+
+	* config/arm/arm.c (arm_return_in_memory): Fix return
+	type.
+	* config/arm/arm-protos.h (arm_return_in_memory): Likewise.
+
 2008-05-15  Adam Nemet  <anemet@caviumnetworks.com>
 
 	PR middle-end/36194
-        * combine.c (check_conversion): Rename back to check_promoted_subreg. 
-        Don't call record_truncated_value from here. 
-        (record_truncated_value): Turn it into a for_each_rtx callback. 
-        (record_truncated_values): New function. 
-        (combine_instructions): Call note_uses with 
-        record_truncated_values.  Change name of check_conversion to 
-        check_promoted_subreg. 
+	* combine.c (check_conversion): Rename back to check_promoted_subreg. 
+	Don't call record_truncated_value from here. 
+	(record_truncated_value): Turn it into a for_each_rtx callback. 
+	(record_truncated_values): New function. 
+	(combine_instructions): Call note_uses with 
+	record_truncated_values.  Change name of check_conversion to 
+	check_promoted_subreg. 
 
 2008-05-15  Janis Johnson  <janis187@us.ibm.com>
 
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index e4540ec125df..1dbd3a18d2af 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -43,7 +43,7 @@ extern void arm_output_fn_unwind (FILE *, bool);
   
 
 #ifdef TREE_CODE
-extern int arm_return_in_memory (const_tree, const_tree);
+extern bool arm_return_in_memory (const_tree, const_tree);
 #endif
 #ifdef RTX_CODE
 extern bool arm_vector_mode_supported_p (enum machine_mode);
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 3a8117288a66..1c7002b8be42 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2737,7 +2737,7 @@ 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
    TARGET_RETURN_IN_MEMORY.  */
-int
+bool
 arm_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED)
 {
   HOST_WIDE_INT size;