Index: gcc/gcc/calls.c
===================================================================
--- gcc.orig/gcc/calls.c
+++ gcc/gcc/calls.c
@@ -1189,7 +1189,7 @@ initialize_argument_information (int num
 static int
 compute_argument_block_size (int reg_parm_stack_space,
 			     struct args_size *args_size,
-			     tree fndecl,
+			     tree fndecl ATTRIBUTE_UNUSED,
 			     int preferred_stack_boundary ATTRIBUTE_UNUSED)
 {
   int unadjusted_args_size = args_size->constant;
@@ -3281,7 +3281,7 @@ emit_library_call_value_1 (int retval, r
   rtx fun;
   /* Todo, choose the correct decl type of orgfun. Sadly this information
      isn't present here, so we default to native calling abi here.  */
-  tree fndecl = NULL_TREE; /* library calls default to host calling abi ? */
+  tree fndecl ATTRIBUTE_UNUSED = NULL_TREE; /* library calls default to host calling abi ? */
   int inc;
   int count;
   rtx argblock = 0;
Index: gcc/gcc/target-def.h
===================================================================
--- gcc.orig/gcc/target-def.h
+++ gcc/gcc/target-def.h
@@ -545,7 +545,9 @@
 #define TARGET_PROMOTE_PROTOTYPES hook_bool_const_tree_false
 
 #define TARGET_STRUCT_VALUE_RTX hook_rtx_tree_int_null
+#ifndef TARGET_RETURN_IN_MEMORY
 #define TARGET_RETURN_IN_MEMORY default_return_in_memory
+#endif
 #define TARGET_RETURN_IN_MSB hook_bool_const_tree_false
 
 #define TARGET_EXPAND_BUILTIN_SAVEREGS default_expand_builtin_saveregs
=