diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 630e06dffb6..6033a605f42 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/31989
+	PR target/31681
+	PR target/31666
+	* config/i386/i386.c (init_cumulative_args): Set maybe_vaarg to
+	true if function has no argument.
+
 2007-05-18  DJ Delorie  <dj@redhat.com>
 
 	* config/mips/mips.c (mips_offset_within_alignment_p): New.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 3c9445affdb..1bea8d7cb9e 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3051,7 +3051,10 @@ init_cumulative_args (CUMULATIVE_ARGS *cum,  /* Argument info to initialize */
     cum->mmx_nregs = MMX_REGPARM_MAX;
   cum->warn_sse = true;
   cum->warn_mmx = true;
-  cum->maybe_vaarg = (fntype ? type_has_variadic_args_p (fntype) : !libname);
+  cum->maybe_vaarg = (fntype
+		      ? (!TYPE_ARG_TYPES (fntype)
+			 || type_has_variadic_args_p (fntype))
+		      : !libname);
 
   if (!TARGET_64BIT)
     {