diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86502ad3410..7a3bf29e4cd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-26  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR middle-end/37316
+	* pa.c (function_arg_padding):  Pad complex and vector types upward in
+	64-bit runtime.
+	(function_arg): Use BLKmode for PARALLEL in 64-bit runtime.
+
 2008-10-26  Matthias Klose  <doko@ubuntu.com>
 
 	* doc/install.texi: Document requirements on antlr.
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 3d3c96dc087..e06a2ec4809 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -5888,7 +5888,11 @@ enum direction
 function_arg_padding (enum machine_mode mode, const_tree type)
 {
   if (mode == BLKmode
-      || (TARGET_64BIT && type && AGGREGATE_TYPE_P (type)))
+      || (TARGET_64BIT
+	  && type
+	  && (AGGREGATE_TYPE_P (type)
+	      || TREE_CODE (type) == COMPLEX_TYPE
+	      || TREE_CODE (type) == VECTOR_TYPE)))
     {
       /* Return none if justification is not required.  */
       if (type
@@ -9277,7 +9281,7 @@ function_arg (CUMULATIVE_ARGS *cum, enum machine_mode mode, tree type,
 	      offset += 8;
 	    }
 
-	  return gen_rtx_PARALLEL (mode, gen_rtvec_v (ub, loc));
+	  return gen_rtx_PARALLEL (BLKmode, gen_rtvec_v (ub, loc));
 	}
      }
   else