diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e51f8510bbaec795ec1d7b90dfcfb5a991b6e18..3efe49a5748e75797e9071abdeb09c87c3447de0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-10  Ben Elliston  <bje@au.ibm.com>
+
+	PR target/36800
+	* config/rs6000/rs6000.c (rs6000_gimplify_va_arg): Do not set
+	regalign for the reg == fpr and TDmode case.
+
 2009-04-09  David Ayers  <ayers@fsfe.org>
 
 	PR objc/29200
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 07fa33e3f1a7a4d45b7636d1eef37eb3188b32db..235298935c3ef04d0bed64cac38925163dc290b1 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -7092,7 +7092,6 @@ rs6000_gimplify_va_arg (tree valist, tree type, gimple_seq *pre_p,
 	 reg number is 0 for f1, so we want to make it odd.  */
       else if (reg == fpr && TYPE_MODE (type) == TDmode)
 	{
-	  regalign = 1;
 	  t = build2 (BIT_IOR_EXPR, TREE_TYPE (reg), unshare_expr (reg),
 		      build_int_cst (TREE_TYPE (reg), 1));
 	  u = build2 (MODIFY_EXPR, void_type_node, unshare_expr (reg), t);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 01a21a47b85fd388ccde8e0322d71c27a50dc105..c346b6129dab8ec879437342098fa784261c1627 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-10  Ben Elliston  <bje@au.ibm.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	PR target/36800
+	* gcc.dg/dfp/pr36800.c: New.
+
 2009-04-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 	    Rafael Avila de Espindola  <espindola@google.com>
 
diff --git a/gcc/testsuite/gcc.dg/dfp/pr36800.c b/gcc/testsuite/gcc.dg/dfp/pr36800.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b899cf0e7f948b6c7a849cd0e38b2b81e012c71
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/pr36800.c
@@ -0,0 +1,32 @@
+/* { dg-do run } */
+/* { dg-options "-std=gnu99" } */
+
+#include <stdarg.h>
+extern void abort (void);
+
+void
+f (int a, ...)
+{
+  va_list ap;
+  if (a != 0)
+    abort ();
+  va_start (ap, a);
+  if (va_arg (ap, _Decimal128) != 1.2DL)
+    abort ();
+  if (va_arg (ap, _Decimal128) != 2.34DL)
+    abort ();
+  if (va_arg (ap, _Decimal128) != 3.456DL)
+    abort ();
+  if (va_arg (ap, _Decimal128) != 4.567DL)
+    abort ();
+  if (va_arg (ap, double) != 5.125)
+    abort ();
+  va_end (ap);
+}
+
+int
+main (void)
+{
+  f (0, 1.2DL, 2.34DL, 3.456DL, 4.567DL, 5.125);
+  return 0;
+}