Fix last commit. Sorry about that.

From-SVN: r53946

gcc/ChangeLog

@@ -8,6 +8,17 @@
 	and less-than-half-precision cases.
 	(num_trim, num_positive, num_div_op): Cast constants.
 
+2002-05-27  Bo Thorsen  <bo@suse.de>
+
+	* config/i386/libgcc-x86_64-glibc.ver: Copy this file from the
+	3.1 branch. The file was made by Jakub Jelinek.
+	* config/i386/linux64.h (MD_FALLBACK_FRAME_STATE_FOR): Add i386
+	support so multilib doesn't break. And don't define this at all
+	when -Dinhibit_libc is used.
+	(MULTILIB_DEFAULTS): Always set default to 64 bit compilation.
+	* config/i386/t-linux64: Implement full multilib support. Patch
+	originally done by Andreas Jaeger and Jakub Jelinek.
+
 2002-05-27  Roger Sayle  <roger@eyesopen.com>
 
 	* c-common.c: Add support for __attribute__((nothrow)) to specify

libffi/ChangeLog

+2002-05-28  Bo Thorsen  <bo@suse.de>
+
+	* src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove
+	the same unused avn var from this one too.
+
 2002-05-27  Roger Sayle  <roger@eyesopen.com>
 
 	* src/x86/ffi.c (ffi_prep_args): Remove reference to avn.

libffi/src/x86/ffi.c

@@ -267,7 +267,6 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
 {
   register unsigned int i;
   register int tmp;
-  register unsigned int avn;
   register void **p_argv;
   register char *argp;
   register ffi_type **p_arg;
@@ -280,12 +279,9 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
     argp += 4;
   }
 
-  avn = cif->nargs;
   p_argv = avalue;
 
-  for (i = cif->nargs, p_arg = cif->arg_types;
-       (i != 0) && (avn != 0);
-       i--, p_arg++)
+  for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++)
     {
       size_t z;
 
@@ -294,20 +290,15 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
 	argp = (char *) ALIGN(argp, (*p_arg)->alignment);
       }
 
-      if (avn != 0) 
-	{
-	  avn--;
       z = (*p_arg)->size;
 
-	  /* because we're little endian, this is 
-	     what it turns into.   */
+      /* because we're little endian, this is what it turns into.   */
 
       *p_argv = (void*) argp;
 
       p_argv++;
       argp += z;
     }
-    }
   
   return;
 }