diff options
author | Bo Thorsen <bo@gcc.gnu.org> | 2002-05-28 09:11:42 +0200 |
---|---|---|
committer | Bo Thorsen <bo@gcc.gnu.org> | 2002-05-28 09:11:42 +0200 |
commit | 4075db8f84acce0b7f3e3d6750b645842187832d (patch) | |
tree | e25b89c5a7c2f3e51af0398fa522f61e6a284320 /libffi | |
parent | 9c07557009ba8a90f19e4773bd3b24e47d486fcb (diff) | |
download | gcc-4075db8f84acce0b7f3e3d6750b645842187832d.zip gcc-4075db8f84acce0b7f3e3d6750b645842187832d.tar.gz gcc-4075db8f84acce0b7f3e3d6750b645842187832d.tar.bz2 |
Fix last commit. Sorry about that.
From-SVN: r53946
Diffstat (limited to 'libffi')
-rw-r--r-- | libffi/ChangeLog | 33 | ||||
-rw-r--r-- | libffi/src/x86/ffi.c | 21 |
2 files changed, 25 insertions, 29 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index db09041..e8eebbb 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +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. @@ -182,13 +187,13 @@ 2001-06-06 Andrew Haley <aph@redhat.com> - * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF. + * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF. 2001-06-03 Andrew Haley <aph@redhat.com> - * src/alpha/osf.S: Add unwind info. - * src/powerpc/sysv.S: Add unwind info. - * src/powerpc/ppc_closure.S: Likewise. + * src/alpha/osf.S: Add unwind info. + * src/powerpc/sysv.S: Add unwind info. + * src/powerpc/ppc_closure.S: Likewise. 2000-05-31 Jeff Sturm <jsturm@one-point.com> @@ -347,14 +352,14 @@ (Multilib support.): Add section. * Makefile.in: Rebuilt. * ltconfig (extra_compiler_flags, extra_compiler_flags_value): - New variables. Set for gcc using -print-multi-lib. Export them - to libtool. - (sparc64-*-linux-gnu*): Use libsuff 64 for search paths. - * ltmain.sh (B|b|V): Don't throw away gcc's -B, -b and -V options - for -shared links. - (extra_compiler_flags_value, extra_compiler_flags): Check these - for extra compiler options which need to be passed down in - compiler_flags. + New variables. Set for gcc using -print-multi-lib. Export them + to libtool. + (sparc64-*-linux-gnu*): Use libsuff 64 for search paths. + * ltmain.sh (B|b|V): Don't throw away gcc's -B, -b and -V options + for -shared links. + (extra_compiler_flags_value, extra_compiler_flags): Check these + for extra compiler options which need to be passed down in + compiler_flags. 2000-04-16 Anthony Green <green@redhat.com> @@ -363,7 +368,7 @@ 2000-04-14 Jakub Jelinek <jakub@redhat.com> - * include/ffi.h.in (SPARC64): Define for 64bit SPARC builds. + * include/ffi.h.in (SPARC64): Define for 64bit SPARC builds. Set SPARC FFI_DEFAULT_ABI based on SPARC64 define. * src/sparc/ffi.c (ffi_prep_args_v8): Renamed from ffi_prep_args. Replace all void * sizeofs with sizeof(int). @@ -473,7 +478,7 @@ * configure: Rebuilt. * configure.in: Change version to 2.00-beta. - * fficonfig.h.in: Rebuilt. + * fficonfig.h.in: Rebuilt. * acconfig.h (FFI_NO_STRUCTS, FFI_NO_RAW_API): Define. * src/x86/ffi.c (ffi_raw_call): Rename. diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c index ee67633..c2af395 100644 --- a/libffi/src/x86/ffi.c +++ b/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,19 +290,14 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, argp = (char *) ALIGN(argp, (*p_arg)->alignment); } - if (avn != 0) - { - avn--; - z = (*p_arg)->size; + 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 = (void*) argp; - p_argv++; - argp += z; - } + p_argv++; + argp += z; } return; |