From 4075db8f84acce0b7f3e3d6750b645842187832d Mon Sep 17 00:00:00 2001 From: Bo Thorsen Date: Tue, 28 May 2002 09:11:42 +0200 Subject: Fix last commit. Sorry about that. From-SVN: r53946 --- gcc/ChangeLog | 11 +++++++++++ libffi/ChangeLog | 33 +++++++++++++++++++-------------- libffi/src/x86/ffi.c | 21 ++++++--------------- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2444ea2..1862316 100644 --- a/gcc/ChangeLog +++ b/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 + + * 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 * c-common.c: Add support for __attribute__((nothrow)) to specify 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 + + * src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove + the same unused avn var from this one too. + 2002-05-27 Roger Sayle * src/x86/ffi.c (ffi_prep_args): Remove reference to avn. @@ -182,13 +187,13 @@ 2001-06-06 Andrew Haley - * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF. + * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF. 2001-06-03 Andrew Haley - * 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 @@ -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 @@ -363,7 +368,7 @@ 2000-04-14 Jakub Jelinek - * 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; -- cgit v1.1