Index: gcc/config/rs6000/rs6000.h
===================================================================
--- gcc/config/rs6000/rs6000.h	(revision 162457)
+++ gcc/config/rs6000/rs6000.h	(working copy)
@@ -1673,6 +1673,8 @@ typedef struct rs6000_args
    int sysv_gregno;		/* next available GP register */
    int intoffset;		/* running offset in struct (darwin64) */
    int use_stack;		/* any part of struct on stack (darwin64) */
+  int floats_in_gpr;		/* count of SFmode floats taking up
+				   GPR space (darwin64) */
    int named;			/* false for varargs params */
  } CUMULATIVE_ARGS;

Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c	(revision 162457)
+++ gcc/config/rs6000/rs6000.c	(working copy)
@@ -1154,7 +1154,7 @@ static rtx rs6000_complex_function_value (enum mac
  static rtx rs6000_spe_function_arg (CUMULATIVE_ARGS *,
  				    enum machine_mode, tree);
  static void rs6000_darwin64_record_arg_advance_flush  
(CUMULATIVE_ARGS *,
-						      HOST_WIDE_INT);
+						      HOST_WIDE_INT, int);
  static void rs6000_darwin64_record_arg_advance_recurse  
(CUMULATIVE_ARGS *,