*** empty log message ***

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38929 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 1 deletions

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 1ad33f24826..b7db928d48c 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -2801,8 +2801,13 @@ std_expand_builtin_va_start (stdarg_p, valist, nextarg)
 
   if (! stdarg_p)
     {
+      /* The dummy named parameter is declared as a 'word' sized
+	 object, but if a 'word' is smaller than an 'int', it would
+	 have been promoted to int when it was added to the arglist.  */
       int align = PARM_BOUNDARY / BITS_PER_UNIT;
-      int offset = (((UNITS_PER_WORD + align - 1) / align) * align);
+      int size = MAX (UNITS_PER_WORD,
+		      GET_MODE_SIZE (TYPE_MODE (integer_type_node)));
+      int offset = ((size + align - 1) / align) * align;
       nextarg = plus_constant (nextarg, -offset);
     }