diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf390c0cb587..4ac79c6c828a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-13  Bob Wilson  <bob.wilson@acm.org>
+
+	* config/xtensa/xtensa.c (xtensa_gimplify_va_arg_expr): Swap
+	arguments for COND_EXPR in big-endian adjustment code.
+
 2004-07-13  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* pa-64.h (ARG_POINTER_REGNUM, STATIC_CHAIN_REGNUM): Delete.
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index b3bd840ce046..09f835282fe3 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -2623,7 +2623,7 @@ xtensa_gimplify_va_arg_expr (tree valist, tree type, tree *pre_p,
     {
       t = size_int (PARM_BOUNDARY / BITS_PER_UNIT);
       t = fold (build (GE_EXPR, boolean_type_node, type_size, t));
-      t = fold (build (COND_EXPR, sizetype, t, type_size, va_size));
+      t = fold (build (COND_EXPR, sizetype, t, va_size, type_size));
       size = t;
     }
   else