Changeset 1391 for branches/GNU/src/gcc/libffi

Timestamp:

Apr 27, 2004, 8:39:34 PM (21 years ago)

Author:

bird

Message:

GCC v3.3.3 sources.

Location:

branches/GNU/src/gcc

Files:

• . (modified) (1 prop)
• libffi/ChangeLog (modified) (10 diffs, 1 prop)
• libffi/ChangeLog.libgcj (modified) (1 diff, 1 prop)
• libffi/Makefile.am (modified) (6 diffs, 1 prop)
• libffi/Makefile.in (modified) (14 diffs, 1 prop)
• libffi/README (modified) (1 diff, 1 prop)
• libffi/configure (modified) (105 diffs, 1 prop)
• libffi/configure.in (modified) (9 diffs, 1 prop)
• libffi/fficonfig.h.in (modified) (2 diffs, 1 prop)
• libffi/include/Makefile.in (modified) (4 diffs, 1 prop)
• libffi/include/ffi.h.in (modified) (7 diffs, 1 prop)
• libffi/src/arm/ffi.c (modified) (4 diffs, 1 prop)
• libffi/src/arm/sysv.S (modified) (2 diffs, 1 prop)
• libffi/src/ffitest.c (modified) (19 diffs, 1 prop)
• libffi/src/java_raw_api.c (modified) (5 diffs, 1 prop)
• libffi/src/m68k/ffi.c (modified) (5 diffs, 1 prop)
• libffi/src/mips/ffi.c (modified) (5 diffs, 1 prop)
• libffi/src/powerpc/aix_closure.S (modified) (5 diffs, 1 prop)
• libffi/src/powerpc/darwin.S (modified) (5 diffs, 1 prop)
• libffi/src/powerpc/darwin_closure.S (modified) (5 diffs, 1 prop)
• libffi/src/powerpc/ffi.c (modified) (5 diffs, 1 prop)
• libffi/src/powerpc/ffi_darwin.c (modified) (4 diffs, 1 prop)
• libffi/src/prep_cif.c (modified) (3 diffs, 1 prop)
• libffi/src/sparc/ffi.c (modified) (6 diffs, 1 prop)
• libffi/src/sparc/v8.S (modified) (3 diffs, 1 prop)
• libffi/src/sparc/v9.S (modified) (4 diffs, 1 prop)
• libffi/src/types.c (modified) (4 diffs, 1 prop)
• libffi/src/x86/ffi.c (modified) (16 diffs, 1 prop)
• libffi/src/x86/sysv.S (modified) (3 diffs, 1 prop)
• libffi/src/x86/win32.S (modified) (3 diffs, 1 prop)

branches/GNU/src/gcc

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out

branches/GNU/src/gcc/libffi/ChangeLog

@@ -1 @@
-2003-02-05  Release Manager
-
-        * GCC 3.2.2 Released.
+2004-02-14  Release Manager
+
+        * GCC 3.3.3 Released.
+
+2003-10-16  Release Manager
+
+        * GCC 3.3.2 Released.
+
+2003-09-09  Alan Modra  <amodra@bigpond.net.au>
+
+        * configure: Regenerate.
+
+2003-08-08  Kean Johnston  <jkj@sco.com>
+
+        * configure.in: Add support for sco3.2v5.0*
+        * configure: Regenerated
+
+2003-08-04  Release Manager
+
+        * GCC 3.3.1 Released.
+
+2003-08-04  Release Manager
+
+        * GCC 3.3.1 Released.
+
+2003-07-11  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+        * README: Note that libffi is not part of GCC.  Update the project
+        URL and status.
+
+2003-05-13  Release Manager
+
+        * GCC 3.3 Released.
+
+2003-05-13  Release Manager
+
+        * GCC 3.3 Released.
+
+2003-05-13  Release Manager
+
+        * GCC 3.3 Released.
+
+2003-05-07  Jeff Sturm  <jsturm@one-point.com>
+
+        Fixes PR bootstrap/10656
+        * configure.in (HAVE_AS_REGISTER_PSEUDO_OP): Test assembler
+        support for .register pseudo-op.
+        * src/sparc/v8.S: Use it.
+        * fficonfig.h.in: Rebuilt.
+        * configure: Rebuilt.
+
+2003-04-04  Loren J. Rittle  <ljrittle@acm.org>
+
+        * include/Makefile.in: Regenerate.
+
+2003-03-22  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
+
+        * libffi/include/ffi.h.in: Define X86 instead of X86_64 in 32
+        bit mode.
+        * libffi/src/x86/ffi.c (ffi_closure_SYSV, ffi_closure_raw_SYSV):
+        Receive closure pointer through parameter, read args using
+        __builtin_dwarf_cfa.
+        (FFI_INIT_TRAMPOLINE): Send closure reference through eax.
+
+2003-02-06  Andreas Tobler <a.tobler@schweiz.ch>
+
+        * libffi/src/powerpc/darwin_closure.S:
+        Fix alignement bug, allocate 8 bytes for the result.
+        * libffi/src/powerpc/aix_closure.S:
+        Likewise.
+        * libffi/src/powerpc/ffi_darwin.c:
+        Update stackframe description for aix/darwin_closure.S.
+
+2003-01-31  Christian Cornelssen  <ccorn@cs.tu-berlin.de>,
+            Andreas Schwab  <schwab@suse.de>
+
+        * configure.in: Adjust command to source config-ml.in to account
+        for changes to the libffi_basedir definition.
+        (libffi_basedir): Remove ${srcdir} from value and include trailing
+        slash if nonempty.
+
+        * configure: Regenerate.
 
 2003-01-29  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
@@ -7 +86 @@
         * src/powerpc/ppc_closure.S: Recode to fit shared libs.
 
-2002-11-19  Release Manager
-
-        * GCC 3.2.1 Released.
-
-2002-11-19  Release Manager
-
-        * GCC 3.2.1 Released.
-
-2002-11-18  Release Manager
-
-        * GCC 3.2.1 Released.
-
-2002-10-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+2003-01-28  Andrew Haley  <aph@redhat.com>
+
+        * include/ffi.h.in: Enable FFI_CLOSURES for x86_64.
+        * src/x86/ffi64.c (ffi_prep_closure): New.
+        (ffi_closure_UNIX64_inner): New.
+        * src/x86/unix64.S (ffi_closure_UNIX64): New.
+
+2003-01-22  Andrew Haley  <aph@redhat.com>
+
+        * src/powerpc/darwin.S (_ffi_call_AIX): Add Augmentation size to
+        unwind info.
+
+2003-01-21  Andreas Tobler  <a.tobler@schweiz.ch>
+
+        * src/powerpc/darwin.S: Add unwind info.
+        * src/powerpc/darwin_closure.S: Likewise.
+
+2003-01-14  Andrew Haley  <aph@redhat.com>
+
+        * src/x86/ffi64.c (ffi_prep_args): Check for void retval.
+        (ffi_prep_cif_machdep): Likewise.
+        * src/x86/unix64.S: Add unwind info.
+
+2003-01-14  Andreas Jaeger  <aj@suse.de>
+
+        * src/ffitest.c (main): Only use ffi_closures if those are
+        supported.
+
+2003-01-13  Andreas Tobler <a.tobler@schweiz.ch>
+
+        * libffi/src/ffitest.c
+        add closure testcases
+
+2003-01-13 Kevin B. Hendricks <khendricks@ivey.uwo.ca>
+
+        * libffi/src/powerpc/ffi.c
+        fix alignment bug for float (4 byte aligned iso 8 byte)
+
+2003-01-03  Jeff Sturm  <jsturm@one-point.com>
+
+        * include/ffi.h.in: Add closure defines for SPARC, SPARC64.
+        * src/ffitest.c (main): Use static storage for closure.
+        * src/sparc/ffi.c (ffi_prep_closure, ffi_closure_sparc_inner): New.
+        * src/sparc/v8.S (ffi_closure_v8): New.
+        * src/sparc/v9.S (ffi_closure_v9): New.
+
+2002-11-10  Ranjit Mathew <rmathew@hotmail.com>
+
+        * include/ffi.h.in: Added FFI_STDCALL ffi_type
+          enumeration for X86_WIN32.
+        * src/x86/win32.S: Added ffi_call_STDCALL function
+          definition.
+        * src/x86/ffi.c (ffi_call/ffi_raw_call): Added
+          switch cases for recognising FFI_STDCALL and
+          calling ffi_call_STDCALL if target is X86_WIN32.
+        * src/ffitest.c (my_stdcall_strlen/stdcall_many):
+          stdcall versions of the "my_strlen" and "many"
+          test functions (for X86_WIN32).
+          Added test cases to test stdcall invocation using
+          these functions.
+
+2002-11-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+        * src/s390/sysv.S (.eh_frame section): Make section read-only.
+
+2002-11-26  Jim Wilson  <wilson@redhat.com>
+
+        * src/types.c (FFI_TYPE_POINTER): Has size 8 on IA64.
+
+2002-11-15  Ulrich Weigand  <uweigand@de.ibm.com>
+
+        * src/s390/sysv.S (.eh_frame section): Adapt to pcrel FDE encoding.
+
+2002-11-11  DJ Delorie  <dj@redhat.com>
+
+        * configure.in: Look for common files in the right place.
+
+2002-10-08  Ulrich Weigand  <uweigand@de.ibm.com>
+
+        * src/java_raw_api.c (ffi_java_raw_to_ptrarray): Interpret
+        raw data as _Jv_word values, not ffi_raw.
+        (ffi_java_ptrarray_to_raw): Likewise.
+        (ffi_java_rvalue_to_raw): New function.
+        (ffi_java_raw_call): Call it.
+        (ffi_java_raw_to_rvalue): New function.
+        (ffi_java_translate_args): Call it.
+        * src/ffitest.c (closure_test_fn): Interpret return value
+        as ffi_arg, not int.
+        * src/s390/ffi.c (ffi_prep_cif_machdep): Add missing
+        FFI_TYPE_POINTER case.
+        (ffi_closure_helper_SYSV): Likewise.  Also, assume return
+        values extended to word size.
+
+2002-10-02  Andreas Jaeger  <aj@suse.de>
+
+        * src/x86/ffi64.c (ffi_prep_cif_machdep): Remove debug output.
+
+2002-10-01  Bo Thorsen  <bo@smetana.suse.de>
+
+        * include/ffi.h.in: Fix i386 win32 compilation.
+
+2002-09-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+        * configure.in: Add s390x-*-linux-* target.
+        * configure: Regenerate.
+        * include/ffi.h.in: Define S390X for s390x targets.
+        (FFI_CLOSURES): Define for s390/s390x.
+        (FFI_TRAMPOLINE_SIZE): Likewise.
+        (FFI_NATIVE_RAW_API): Likewise.
+        * src/prep_cif.c (ffi_prep_cif): Do not compute stack space for s390.
+        * src/types.c (FFI_TYPE_POINTER): Use 8-byte pointers on s390x.
+        * src/s390/ffi.c: Major rework of existing code.  Add support for 
+        s390x targets.  Add closure support.
+        * src/s390/sysv.S: Likewise.
+
+2002-09-29  Richard Earnshaw  <rearnsha@arm.com>
+
+        * src/arm/sysv.S: Fix typo.
+
+2002-09-28  Richard Earnshaw  <rearnsha@arm.com>
+
+        * src/arm/sysv.S: If we don't have machine/asm.h and the pre-processor
+        has defined __USER_LABEL_PREFIX__, then use it in CNAME.
+        (ffi_call_SYSV): Handle soft-float.
+
+2002-09-27  Bo Thorsen  <bo@suse.de>
+
+        * include/ffi.h.in: Fix multilib x86-64 support.
+
+2002-09-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
         * Makefile.am (all-multi): Fix multilib parallel build.
 
-2002-08-14  Release Manager
-
-        * GCC 3.2 Released.
-
-2002-07-25  Release Manager
-
-        * GCC 3.1.1 Released.
-
-2002-05-28  Bo Thorsen  <bo@suse.de>
-
-        * src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove avn
-        here too.
+2002-07-19  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+        * configure.in (sh[34]*-*-linux*): Add brackets.
+        * configure: Regenerate.
+
+2002-07-18  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+        * Makefile.am: Add SH support.
+        * Makefile.in: Regenerate.
+        * configure.in (sh-*-linux*, sh[34]*-*-linux*): Add target.
+        * configure: Regenerate.
+        * include/ffi.h.in: Add SH support.
+        * src/sh/ffi.c: New file.
+        * src/sh/sysv.S: New file.
+        * src/types.c: Add SH support.
+
+2002-07-16  Bo Thorsen  <bo@suse.de>
+
+        * src/x86/ffi64.c: New file that adds x86-64 support.
+        * src/x86/unix64.S: New file that handles argument setup for
+        x86-64.
+        * src/x86/sysv.S: Don't use this on x86-64.
+        * src/x86/ffi.c: Don't use this on x86-64.
+        Remove unused vars.
+        * src/prep_cif.c (ffi_prep_cif): Don't do stack size calculation
+        for x86-64.
+        * src/ffitest.c (struct6): New test that tests a special case in
+        the x86-64 ABI.
+        (struct7): Likewise.
+        (struct8): Likewise.
+        (struct9): Likewise.
+        (closure_test_fn): Silence warning about this when it's not used.
+        (main): Add the new tests.
+        (main): Fix a couple of wrong casts and silence some compiler warnings.
+        * include/ffi.h.in: Add x86-64 ABI definition.
+        * fficonfig.h.in: Regenerate.
+        * Makefile.am: Add x86-64 support.
+        * configure.in: Likewise.
+        * Makefile.in: Regenerate.
+        * configure: Likewise.
+
+2002-06-24  Bo Thorsen  <bo@suse.de>
+
+        * src/types.c: Merge settings for similar architectures.
+        Add x86-64 sizes and alignments.
+
+2002-06-23  Bo Thorsen  <bo@suse.de>
+
+        * src/arm/ffi.c (ffi_prep_args): Remove unused vars.
+        * src/sparc/ffi.c (ffi_prep_args_v8): Likewise.
+        * src/mips/ffi.c (ffi_prep_args): Likewise.
+        * src/m68k/ffi.c (ffi_prep_args): Likewise.
+
+2002-07-18  H.J. Lu  (hjl@gnu.org)
+
+        * Makefile.am (TARGET_SRC_MIPS_LINUX): New.
+        (libffi_la_SOURCES): Support MIPS_LINUX.
+        (libffi_convenience_la_SOURCES): Likewise.
+        * Makefile.in: Regenerated.
+
+        * configure.in (mips64*-*): Skip.
+        (mips*-*-linux*): New.
+        * configure: Regenerated.
+
+        * src/mips/ffi.c: Include <sgidefs.h>.
+
+2002-06-06  Ulrich Weigand  <uweigand@de.ibm.com>
+
+        * src/s390/sysv.S: Save/restore %r6.  Add DWARF-2 unwind info.
 
 2002-05-27  Roger Sayle  <roger@eyesopen.com>
@@ -45 +298 @@
         fix formatting.
 
-2002-05-14  Release Manager
-
-        * GCC 3.1 Released.
-
-2002-05-14  Release Manager
-
-        * GCC 3.1 Released.
+2002-05-13  Andreas Tobler  <a.tobler@schweiz.ch>
+
+        * src/powerpc/ffi_darwin.c (ffi_prep_closure): Declare fd at
+        beginning of function (for older apple cc).
 
 2002-05-08  Alexandre Oliva  <aoliva@redhat.com>
@@ -59 +309 @@
         * configure: Rebuilt.
 
+2002-05-05  Jason Thorpe  <thorpej@wasabisystems.com>
+
+        * configure.in (sparc64-*-netbsd*): Add target.
+        (sparc-*-netbsdelf*): Likewise.
+        * configure: Regenerate.
+
 2002-04-28  David S. Miller  <davem@redhat.com>
 
         * configure.in, configure: Fix SPARC test in previous change.
+
+2002-04-29  Gerhard Tonn  <GerhardTonn@swol.de>
+
+        * Makefile.am: Add Linux for S/390 support.
+        * Makefile.in: Regenerate.
+        * configure.in: Add Linux for S/390 support.
+        * configure: Regenerate.
+        * include/ffi.h.in: Add Linux for S/390 support.
+        * src/s390/ffi.c: New file from libffi CVS tree.
+        * src/s390/sysv.S: New file from libffi CVS tree.
 
 2002-04-28  Jakub Jelinek  <jakub@redhat.com>
@@ -85 +351 @@
         * src/sparc/v8.S: Make .eh_frame dependent on target word size.
 
+2002-04-06  Jason Thorpe  <thorpej@wasabisystems.com>
+
+        * configure.in (alpha*-*-netbsd*): Add target.
+        * configure: Regenerate.
+
 2002-04-04  Jeff Sturm  <jsturm@one-point.com>
 
         * src/sparc/v8.S: Add unwind info.
         * src/sparc/v9.S: Likewise.
-
-2002-04-01  Loren J. Rittle  <ljrittle@acm.org>
-
-        * configure.in: Enable alpha*-*-freebsd*.
-        * configure: Rebuilt.
 
 2002-03-30  Krister Walfridsson  <cato@df.lth.se>
@@ -105 +371 @@
         * src/mips/n32.s: Delete
         * src/mips/o32.s: Delete
+
+2002-03-21  Loren J. Rittle  <ljrittle@acm.org>
+
+        * configure.in: Enable alpha*-*-freebsd*.
+        * configure: Rebuilt.
 
 2002-03-17  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
@@ -202 +473 @@
 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>
@@ -367 +638 @@
         * 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>
@@ -383 +654 @@
 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.
@@ -493 +764 @@
         * 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.
 

branches/GNU/src/gcc/libffi/ChangeLog.libgcj

@@ +1 @@
+2003-02-20  Alexandre Oliva  <aoliva@redhat.com>
+
+        * configure.in: Propagate ORIGINAL_LD_FOR_MULTILIBS to
+        config.status.
+        * configure: Rebuilt.
+
 2002-01-27  Alexandre Oliva  <aoliva@redhat.com>
 

branches/GNU/src/gcc/libffi/Makefile.am

@@ -9 +9 @@
                 src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S \
                 src/x86/ffi.c src/x86/sysv.S src/x86/win32.S \
+                src/x86/ffi64.c src/x86/unix64.S \
                 src/alpha/ffi.c src/alpha/osf.S \
                 src/m68k/ffi.c src/m68k/sysv.S \
@@ -16 +17 @@
                 src/powerpc/darwin.S src/powerpc/aix.S \
                 src/powerpc/darwin_closure.S src/powerpc/aix_closures.S \
-                src/arm/ffi.c src/arm/sysv.S
+                src/arm/ffi.c src/arm/sysv.S \
+                src/s390/ffi.c src/s390/sysv.S \
+                src/sh/ffi.c src/sh/sysv.S
 
 VPATH = @srcdir@:@srcdir@/src:@srcdir@/src/@TARGETDIR@
@@ -84 +87 @@
 
 TARGET_SRC_MIPS_GCC = src/mips/ffi.c src/mips/o32.S src/mips/n32.S
+TARGET_SRC_MIPS_LINUX = src/mips/ffi.c src/mips/o32.S
 TARGET_SRC_MIPS_SGI = src/mips/ffi.c src/mips/o32.s src/mips/n32.s
 TARGET_SRC_X86 = src/x86/ffi.c src/x86/sysv.S
@@ -95 +99 @@
 TARGET_SRC_POWERPC_DARWIN = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
 TARGET_SRC_ARM =  src/arm/sysv.S src/arm/ffi.c
+TARGET_SRC_S390 =  src/s390/sysv.S src/s390/ffi.c
+TARGET_SRC_X86_64 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
+TARGET_SRC_SH =  src/sh/sysv.S src/sh/ffi.c
 
 ##libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c $(TARGET_SRC_@TARGET@)
@@ -104 +111 @@
 libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
 endif
+if MIPS_LINUX
+libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
+libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
+endif
 if MIPS_SGI
 libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
@@ -147 +158 @@
 libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
 libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
+endif
+if S390
+libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
+libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
+endif
+if X86_64
+libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
+libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
+endif
+if SH
+libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
+libfficonvenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
 endif
 

branches/GNU/src/gcc/libffi/Makefile.in

@@ -92 +92 @@
                 src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S \
                 src/x86/ffi.c src/x86/sysv.S src/x86/win32.S \
+                src/x86/ffi64.c src/x86/unix64.S \
                 src/alpha/ffi.c src/alpha/osf.S \
                 src/m68k/ffi.c src/m68k/sysv.S \
@@ -99 +100 @@
                 src/powerpc/darwin.S src/powerpc/aix.S \
                 src/powerpc/darwin_closure.S src/powerpc/aix_closures.S \
-                src/arm/ffi.c src/arm/sysv.S
+                src/arm/ffi.c src/arm/sysv.S \
+                src/s390/ffi.c src/s390/sysv.S \
+                src/sh/ffi.c src/sh/sysv.S
 
 
@@ -163 +166 @@
 
 TARGET_SRC_MIPS_GCC = src/mips/ffi.c src/mips/o32.S src/mips/n32.S
+TARGET_SRC_MIPS_LINUX = src/mips/ffi.c src/mips/o32.S
 TARGET_SRC_MIPS_SGI = src/mips/ffi.c src/mips/o32.s src/mips/n32.s
 TARGET_SRC_X86 = src/x86/ffi.c src/x86/sysv.S
@@ -174 +178 @@
 TARGET_SRC_POWERPC_DARWIN = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
 TARGET_SRC_ARM = src/arm/sysv.S src/arm/ffi.c
+TARGET_SRC_S390 = src/s390/sysv.S src/s390/ffi.c
+TARGET_SRC_X86_64 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
+TARGET_SRC_SH = src/sh/sysv.S src/sh/ffi.c
 
 libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \
@@ -179 +186 @@
 
 @MIPS_GCC_TRUE@libffi_la_SOURCES = @MIPS_GCC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
+@MIPS_LINUX_TRUE@libffi_la_SOURCES = @MIPS_LINUX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
 @MIPS_SGI_TRUE@libffi_la_SOURCES = @MIPS_SGI_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
 @X86_TRUE@libffi_la_SOURCES = @X86_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
@@ -190 +198 @@
 @POWERPC_DARWIN_TRUE@libffi_la_SOURCES = @POWERPC_DARWIN_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
 @ARM_TRUE@libffi_la_SOURCES = @ARM_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
+@S390_TRUE@libffi_la_SOURCES = @S390_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
+@X86_64_TRUE@libffi_la_SOURCES = @X86_64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
+@SH_TRUE@libffi_la_SOURCES = @SH_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
 @MIPS_GCC_TRUE@libffi_convenience_la_SOURCES = @MIPS_GCC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
+@MIPS_LINUX_TRUE@libffi_convenience_la_SOURCES = @MIPS_LINUX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
 @MIPS_SGI_TRUE@libffi_convenience_la_SOURCES = @MIPS_SGI_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)
 @X86_TRUE@libffi_convenience_la_SOURCES = @X86_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
@@ -202 +214 @@
 @POWERPC_DARWIN_TRUE@libffi_convenience_la_SOURCES = @POWERPC_DARWIN_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
 @ARM_TRUE@libffi_convenience_la_SOURCES = @ARM_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
+@S390_TRUE@libffi_convenience_la_SOURCES = @S390_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
+@X86_64_TRUE@libffi_convenience_la_SOURCES = @X86_64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
+@SH_TRUE@libfficonvenience_la_SOURCES = @SH_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
 
 AM_CFLAGS = -fexceptions
@@ -209 +224 @@
 INCLUDES = -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/${libffi_basedir}/../mkinstalldirs
 CONFIG_HEADER = fficonfig.h
 CONFIG_CLEAN_FILES = 
@@ -221 +236 @@
 libffi_convenience_la_LDFLAGS = 
 libffi_convenience_la_LIBADD = 
-@POWERPC_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
-@POWERPC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
-@POWERPC_TRUE@src/java_raw_api.lo src/powerpc/ffi.lo \
-@POWERPC_TRUE@src/powerpc/sysv.lo src/powerpc/ppc_closure.lo
 @ALPHA_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
 @ALPHA_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
@@ -235 +246 @@
 @MIPS_GCC_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \
 @MIPS_GCC_TRUE@src/mips/n32.lo
+@S390_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@S390_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@S390_TRUE@src/s390/sysv.lo src/s390/ffi.lo
+@M68K_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
+@X86_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@X86_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@X86_TRUE@src/x86/ffi.lo src/x86/sysv.lo
+@POWERPC_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
+@POWERPC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
+@POWERPC_TRUE@src/java_raw_api.lo src/powerpc/ffi.lo \
+@POWERPC_TRUE@src/powerpc/sysv.lo src/powerpc/ppc_closure.lo
+@MIPS_LINUX_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
+@MIPS_LINUX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
+@MIPS_LINUX_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo
 @X86_WIN32_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
 @X86_WIN32_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
 @X86_WIN32_TRUE@src/java_raw_api.lo src/x86/ffi.lo src/x86/win32.lo
-@M68K_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
+@X86_64_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
+@X86_64_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
+@X86_64_TRUE@src/java_raw_api.lo src/x86/ffi64.lo src/x86/unix64.lo \
+@X86_64_TRUE@src/x86/ffi.lo src/x86/sysv.lo
 @SPARC_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
 @SPARC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
@@ -249 +277 @@
 @POWERPC_AIX_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \
 @POWERPC_AIX_TRUE@src/powerpc/aix.lo src/powerpc/aix_closures.lo
-@X86_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@X86_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@X86_TRUE@src/x86/ffi.lo src/x86/sysv.lo
-@ARM_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@ARM_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@ARM_TRUE@src/arm/sysv.lo src/arm/ffi.lo
+@MIPS_SGI_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
+@MIPS_SGI_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
+@MIPS_SGI_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \
+@MIPS_SGI_TRUE@src/mips/n32.lo
 @POWERPC_DARWIN_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
 @POWERPC_DARWIN_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
@@ -260 +286 @@
 @POWERPC_DARWIN_TRUE@src/powerpc/darwin.lo \
 @POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo
-@MIPS_SGI_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
-@MIPS_SGI_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
-@MIPS_SGI_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \
-@MIPS_SGI_TRUE@src/mips/n32.lo
+@ARM_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@ARM_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@ARM_TRUE@src/arm/sysv.lo src/arm/ffi.lo
 libffi_la_LIBADD = 
+@SH_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo src/types.lo \
+@SH_TRUE@src/raw_api.lo src/java_raw_api.lo src/sh/sysv.lo \
+@SH_TRUE@src/sh/ffi.lo
+@IA64_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo
+@X86_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo src/types.lo \
+@X86_TRUE@src/raw_api.lo src/java_raw_api.lo src/x86/ffi.lo \
+@X86_TRUE@src/x86/sysv.lo
 @POWERPC_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
 @POWERPC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
 @POWERPC_TRUE@src/powerpc/ffi.lo src/powerpc/sysv.lo \
 @POWERPC_TRUE@src/powerpc/ppc_closure.lo
-@ALPHA_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@ALPHA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@ALPHA_TRUE@src/alpha/ffi.lo src/alpha/osf.lo
-@IA64_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo
-@MIPS_GCC_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@MIPS_GCC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@MIPS_GCC_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo
-@X86_WIN32_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@X86_WIN32_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@X86_WIN32_TRUE@src/x86/ffi.lo src/x86/win32.lo
-@M68K_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
+@MIPS_LINUX_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@MIPS_LINUX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@MIPS_LINUX_TRUE@src/mips/ffi.lo src/mips/o32.lo
 @SPARC_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
 @SPARC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
@@ -291 +313 @@
 @POWERPC_AIX_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/aix.lo \
 @POWERPC_AIX_TRUE@src/powerpc/aix_closures.lo
-@X86_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo src/types.lo \
-@X86_TRUE@src/raw_api.lo src/java_raw_api.lo src/x86/ffi.lo \
-@X86_TRUE@src/x86/sysv.lo
+@MIPS_SGI_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@MIPS_SGI_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@MIPS_SGI_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo
 @ARM_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo src/types.lo \
 @ARM_TRUE@src/raw_api.lo src/java_raw_api.lo src/arm/sysv.lo \
 @ARM_TRUE@src/arm/ffi.lo
+@ALPHA_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@ALPHA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@ALPHA_TRUE@src/alpha/ffi.lo src/alpha/osf.lo
+@MIPS_GCC_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@MIPS_GCC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@MIPS_GCC_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo
+@S390_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@S390_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@S390_TRUE@src/s390/sysv.lo src/s390/ffi.lo
+@M68K_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo
+@X86_WIN32_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@X86_WIN32_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@X86_WIN32_TRUE@src/x86/ffi.lo src/x86/win32.lo
+@X86_64_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
+@X86_64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+@X86_64_TRUE@src/x86/ffi64.lo src/x86/unix64.lo src/x86/ffi.lo \
+@X86_64_TRUE@src/x86/sysv.lo
 @POWERPC_DARWIN_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
 @POWERPC_DARWIN_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
 @POWERPC_DARWIN_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/darwin.lo \
 @POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo
-@MIPS_SGI_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
-@MIPS_SGI_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
-@MIPS_SGI_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo
 noinst_PROGRAMS =  ffitest$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)
@@ -579 +617 @@
         $(mkinstalldirs) $(distdir)/src/alpha $(distdir)/src/arm \
            $(distdir)/src/m68k $(distdir)/src/mips \
-           $(distdir)/src/powerpc $(distdir)/src/sparc \
-           $(distdir)/src/x86
+           $(distdir)/src/powerpc $(distdir)/src/s390 $(distdir)/src/sh \
+           $(distdir)/src/sparc $(distdir)/src/x86
         @for file in $(DISTFILES); do \
           if test -f $$file; then d=.; else d=$(srcdir); fi; \

branches/GNU/src/gcc/libffi/README

@@ -1 @@
-README for libffi-2.00
+This directory contains the libffi package, which is not part of GCC but
+shipped with GCC as convenience.
+
+Status
+======
 
 libffi-2.00 has not been released yet! This is a development snapshot!
 
-libffi-1.20 was released on [SOME FUTURE DAY]. Check the libffi web
-page for updates: <URL:http://sourceware.cygnus.com/libffi/>.
+libffi-1.20 was released on October 5, 1998. Check the libffi web
+page for updates: <URL:http://sources.redhat.com/libffi/>.
 
 

branches/GNU/src/gcc/libffi/configure

@@ -634 +634 @@
 if test "${srcdir}" = "."; then
   if test "${with_target_subdir}" != "."; then
-    libffi_basedir="${srcdir}/${with_multisrctop}.."
+    libffi_basedir="${with_multisrctop}../"
   else
-    libffi_basedir="${srcdir}/${with_multisrctop}"
+    libffi_basedir="${with_multisrctop}"
   fi
 else
-  libffi_basedir="${srcdir}"
-fi
-
+  libffi_basedir=
+fi
 
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in ${libffi_basedir}.. $srcdir/${libffi_basedir}..; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
@@ -656 +655 @@
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+  { echo "configure: error: can not find install-sh or install.sh in ${libffi_basedir}.. $srcdir/${libffi_basedir}.." 1>&2; exit 1; }
 fi
 ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
 
 
@@ -1239 +1239 @@
 
 hpux10.20*|hpux11*)
-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  case $host_cpu in
+  hppa*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_file_magic_cmd=/usr/bin/file
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_cmd=/usr/bin/file
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  esac
   ;;
 
@@ -1331 +1340 @@
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1334: checking for object suffix" >&5
+echo "configure:1343: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1337 +1346 @@
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
@@ -1357 +1366 @@
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1360: checking for executable suffix" >&5
+echo "configure:1369: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1367 +1376 @@
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
@@ -1400 +1409 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:1403: checking for ${ac_tool_prefix}file" >&5
+echo "configure:1412: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1462 +1471 @@
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:1465: checking for file" >&5
+echo "configure:1474: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1533 +1542 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1536: checking for $ac_word" >&5
+echo "configure:1545: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1565 +1574 @@
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1568: checking for $ac_word" >&5
+echo "configure:1577: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1600 +1609 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1603: checking for $ac_word" >&5
+echo "configure:1612: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1632 +1641 @@
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1635: checking for $ac_word" >&5
+echo "configure:1644: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1699 +1708 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1702 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1711 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   if test "$lt_cv_prog_gnu_ld" = yes; then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -melf32bsmip"
+      ;;
+    *N32*)
+      LD="${LD-ld} -melf32bmipn32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -melf64bmip"
+      ;;
+    esac
+   else
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
@@ -1712 +1734 @@
       ;;
     esac
+   fi
+  fi
+  rm -rf conftest*
+  ;;
+
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
+    *ELF-32*)
+      HPUX_IA64_MODE="32"
+      ;;
+    *ELF-64*)
+      HPUX_IA64_MODE="64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { (eval echo configure:1761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_i386"
+          ;;
+        ppc64-*linux*|powerpc64-*linux*)
+          LD="${LD-ld} -m elf32ppclinux"
+          ;;
+        s390x-*linux*)
+          LD="${LD-ld} -m elf_s390"
+          ;;
+        sparc64-*linux*)
+          LD="${LD-ld} -m elf32_sparc"
+          ;;
+      esac
+      ;;
+    *64-bit*)
+      case $host in
+        x86_64-*linux*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        ppc*-*linux*|powerpc*-*linux*)
+          LD="${LD-ld} -m elf64ppc"
+          ;;
+        s390*-*linux*)
+          LD="${LD-ld} -m elf64_s390"
+          ;;
+        sparc*-*linux*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+      esac
+      ;;
+    esac
   fi
   rm -rf conftest*
@@ -1721 +1802 @@
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1724: checking whether the C compiler needs -belf" >&5
+echo "configure:1805: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1734 +1815 @@
 
      cat > conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 1818 "configure"
 #include "confdefs.h"
 
@@ -1741 +1822 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
@@ -1869 +1950 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1872: checking for a BSD compatible install" >&5
+echo "configure:1953: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
@@ -1922 +2003 @@
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1925: checking whether build environment is sane" >&5
+echo "configure:2006: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
@@ -1979 +2060 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1982: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2063: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -2018 +2099 @@
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:2021: checking for working aclocal" >&5
+echo "configure:2102: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -2031 +2112 @@
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:2034: checking for working autoconf" >&5
+echo "configure:2115: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -2044 +2125 @@
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:2047: checking for working automake" >&5
+echo "configure:2128: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -2057 +2138 @@
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:2060: checking for working autoheader" >&5
+echo "configure:2141: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -2070 +2151 @@
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:2073: checking for working makeinfo" >&5
+echo "configure:2154: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -2087 +2168 @@
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2090: checking for executable suffix" >&5
+echo "configure:2171: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2097 +2178 @@
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
@@ -2118 +2199 @@
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:2121: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:2202: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
@@ -2144 +2225 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2147: checking for $ac_word" >&5
+echo "configure:2228: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2174 +2255 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2177: checking for $ac_word" >&5
+echo "configure:2258: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2225 +2306 @@
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2228: checking for $ac_word" >&5
+echo "configure:2309: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2257 +2338 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2260: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2341: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -2268 +2349 @@
 cat > conftest.$ac_ext << EOF
 
-#line 2271 "configure"
+#line 2352 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -2299 +2380 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2302: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2383: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2307: checking whether we are using GNU C" >&5
+echo "configure:2388: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2313 +2394 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -2332 +2413 @@
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2335: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2416: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2373 +2454 @@
 mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS; TARGETDIR=mips;;
 i*86-*-linux*) TARGET=X86; TARGETDIR=x86;;
+i*86-*-sco3.2v5*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;
@@ -2382 +2464 @@
 sparc-sun-4*) TARGET=SPARC; TARGETDIR=sparc;;
 sparc*-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
-sparc-*-linux*) TARGET=SPARC; TARGETDIR=sparc;;
-sparc64-*-linux*) TARGET=SPARC; TARGETDIR=sparc;;
-alpha*-*-linux* | alpha*-*-osf* | alpha*-*-freebsd*) TARGET=ALPHA; TARGETDIR=alpha;;
+sparc-*-linux* | sparc-*-netbsdelf*) TARGET=SPARC; TARGETDIR=sparc;;
+sparc64-*-linux* | sparc64-*-netbsd*) TARGET=SPARC; TARGETDIR=sparc;;
+alpha*-*-linux* | alpha*-*-osf* | alpha*-*-freebsd* | alpha*-*-netbsd*) TARGET=ALPHA; TARGETDIR=alpha;;
 ia64*-*-*) TARGET=IA64; TARGETDIR=ia64;;
 m68k-*-linux*) TARGET=M68K; TARGETDIR=m68k;;
+mips64*-*);;
+mips*-*-linux*) TARGET=MIPS_LINUX; TARGETDIR=mips;;
 powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc;;
 powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;;
@@ -2393 +2477 @@
 rs6000-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;;
 arm*-*-linux-*) TARGET=ARM; TARGETDIR=arm;;
+s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+x86_64-*-linux*) TARGET=X86_64; TARGETDIR=x86;;
+sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
 esac
 
@@ -2419 +2507 @@
 
 
+if test x$TARGET = xMIPS_LINUX; then
+  MIPS_LINUX_TRUE=
+  MIPS_LINUX_FALSE='#'
+else
+  MIPS_LINUX_TRUE='#'
+  MIPS_LINUX_FALSE=
+fi
+
+
 if test x$TARGET = xSPARC; then
   SPARC_TRUE=
@@ -2508 +2605 @@
 fi
 
+
+if test x$TARGET = xS390; then
+  S390_TRUE=
+  S390_FALSE='#'
+else
+  S390_TRUE='#'
+  S390_FALSE=
+fi
+
+
+if test x$TARGET = xX86_64; then
+  X86_64_TRUE=
+  X86_64_FALSE='#'
+else
+  X86_64_TRUE='#'
+  X86_64_FALSE=
+fi
+
+
+if test x$TARGET = xSH; then
+  SH_TRUE=
+  SH_FALSE='#'
+else
+  SH_TRUE='#'
+  SH_FALSE=
+fi
+
+if test x$TARGET = xMIPS_LINUX; then
+  TARGET=MIPS
+fi
+
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2512: checking how to run the C preprocessor" >&5
+echo "configure:2640: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2524 +2652 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2527 "configure"
+#line 2655 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -2530 +2658 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2541 +2669 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2544 "configure"
+#line 2672 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -2547 +2675 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2558 +2686 @@
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2561 "configure"
+#line 2689 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -2564 +2692 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2589 +2717 @@
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2592: checking for ANSI C header files" >&5
+echo "configure:2720: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2597 "configure"
+#line 2725 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2602 +2730 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -2619 +2747 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2622 "configure"
+#line 2750 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -2637 +2765 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2640 "configure"
+#line 2768 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -2658 +2786 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2661 "configure"
+#line 2789 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -2669 +2797 @@
 
 EOF
-if { (eval echo configure:2672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -2695 +2823 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2698: checking for $ac_func" >&5
+echo "configure:2826: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2703 "configure"
+#line 2831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2723 +2851 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2750 +2878 @@
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2753: checking for working alloca.h" >&5
+echo "configure:2881: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2758 "configure"
+#line 2886 "configure"
 #include "confdefs.h"
 #include <alloca.h>
@@ -2762 +2890 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
@@ -2783 +2911 @@
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2786: checking for alloca" >&5
+echo "configure:2914: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2791 "configure"
+#line 2919 "configure"
 #include "confdefs.h"
 
@@ -2816 +2944 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
@@ -2848 +2976 @@
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2851: checking whether alloca needs Cray hooks" >&5
+echo "configure:2979: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2856 "configure"
+#line 2984 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
@@ -2878 +3006 @@
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2881: checking for $ac_func" >&5
+echo "configure:3009: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2886 "configure"
+#line 3014 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -2906 +3034 @@
 ; return 0; }
 EOF
-if { (eval echo configure:2909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -2933 +3061 @@
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2936: checking stack direction for C alloca" >&5
+echo "configure:3064: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2941 +3069 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 2944 "configure"
+#line 3072 "configure"
 #include "confdefs.h"
 find_stack_direction ()
@@ -2960 +3088 @@
 }
 EOF
-if { (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
@@ -2983 +3111 @@
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2986: checking size of short" >&5
+echo "configure:3114: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2989 +3117 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 2992 "configure"
+#line 3120 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -2999 +3127 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_short=$ac_size
@@ -3022 +3150 @@
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3025: checking size of int" >&5
+echo "configure:3153: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3028 +3156 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3031 "configure"
+#line 3159 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3038 +3166 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_int=$ac_size
@@ -3061 +3189 @@
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3064: checking size of long" >&5
+echo "configure:3192: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3067 +3195 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3070 "configure"
+#line 3198 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3077 +3205 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_long=$ac_size
@@ -3100 +3228 @@
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3103: checking size of long long" >&5
+echo "configure:3231: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3106 +3234 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3109 "configure"
+#line 3237 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3116 +3244 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_long_long=$ac_size
@@ -3139 +3267 @@
 
 echo $ac_n "checking size of float""... $ac_c" 1>&6
-echo "configure:3142: checking size of float" >&5
+echo "configure:3270: checking size of float" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3145 +3273 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3148 "configure"
+#line 3276 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3155 +3283 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_float=$ac_size
@@ -3178 +3306 @@
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:3181: checking size of double" >&5
+echo "configure:3309: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3184 +3312 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3187 "configure"
+#line 3315 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3194 +3322 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_double=$ac_size
@@ -3217 +3345 @@
 
 echo $ac_n "checking size of long double""... $ac_c" 1>&6
-echo "configure:3220: checking size of long double" >&5
+echo "configure:3348: checking size of long double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3223 +3351 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3226 "configure"
+#line 3354 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3233 +3361 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_long_double=$ac_size
@@ -3257 +3385 @@
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:3260: checking size of void *" >&5
+echo "configure:3388: checking size of void *" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3263 +3391 @@
   for ac_size in 4 8 1 2 16 12  ; do # List sizes in rough order of prevalence.
   cat > conftest.$ac_ext <<EOF
-#line 3266 "configure"
+#line 3394 "configure"
 #include "confdefs.h"
 #include "confdefs.h"
@@ -3273 +3401 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sizeof_void_p=$ac_size
@@ -3296 +3424 @@
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3299: checking whether byte ordering is bigendian" >&5
+echo "configure:3427: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3303 +3431 @@
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3306 "configure"
+#line 3434 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3314 +3442 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3321 "configure"
+#line 3449 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -3329 +3457 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
@@ -3349 +3477 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3480 "configure"
 #include "confdefs.h"
 main () {
@@ -3362 +3490 @@
 }
 EOF
-if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
@@ -3380 +3508 @@
 if test $ac_cv_c_bigendian = unknown; then
 echo $ac_n "checking to probe for byte ordering""... $ac_c" 1>&6
-echo "configure:3383: checking to probe for byte ordering" >&5
+echo "configure:3511: checking to probe for byte ordering" >&5
 
 cat >conftest.c <<EOF
@@ -3430 +3558 @@
 if test x$TARGET = xSPARC; then
     echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6
-echo "configure:3433: checking assembler and linker support unaligned pc related relocs" >&5
+echo "configure:3561: checking assembler and linker support unaligned pc related relocs" >&5
 if eval "test \"`echo '$''{'libffi_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3440 +3568 @@
         LDFLAGS="$LDFLAGS -shared"
         cat > conftest.$ac_ext <<EOF
-#line 3443 "configure"
+#line 3571 "configure"
 #include "confdefs.h"
 asm (".text; foo: nop; .data; .align 4; .byte 0; .uaword %r_disp32(foo); .text");
@@ -3447 +3575 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   libffi_cv_as_sparc_ua_pcrel=yes
@@ -3465 +3593 @@
         cat >> confdefs.h <<\EOF
 #define HAVE_AS_SPARC_UA_PCREL 1
+EOF
+
+    fi
+
+    echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
+echo "configure:3601: checking assembler .register pseudo-op support" >&5
+if eval "test \"`echo '$''{'libffi_cv_as_register_pseudo_op'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+       libffi_cv_as_register_pseudo_op=unknown
+       # Check if we have .register
+       cat > conftest.$ac_ext <<EOF
+#line 3609 "configure"
+#include "confdefs.h"
+asm (".register %g2, #scratch");
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  libffi_cv_as_register_pseudo_op=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  libffi_cv_as_register_pseudo_op=no
+fi
+rm -f conftest*
+    
+fi
+
+echo "$ac_t""$libffi_cv_as_register_pseudo_op" 1>&6
+    if test "x$libffi_cv_as_register_pseudo_op" = xyes; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_AS_REGISTER_PSEUDO_OP 1
 EOF
 
@@ -3710 +3875 @@
 s%@MIPS_SGI_TRUE@%$MIPS_SGI_TRUE%g
 s%@MIPS_SGI_FALSE@%$MIPS_SGI_FALSE%g
+s%@MIPS_LINUX_TRUE@%$MIPS_LINUX_TRUE%g
+s%@MIPS_LINUX_FALSE@%$MIPS_LINUX_FALSE%g
 s%@SPARC_TRUE@%$SPARC_TRUE%g
 s%@SPARC_FALSE@%$SPARC_FALSE%g
@@ -3730 +3897 @@
 s%@ARM_TRUE@%$ARM_TRUE%g
 s%@ARM_FALSE@%$ARM_FALSE%g
+s%@S390_TRUE@%$S390_TRUE%g
+s%@S390_FALSE@%$S390_FALSE%g
+s%@X86_64_TRUE@%$X86_64_TRUE%g
+s%@X86_64_FALSE@%$X86_64_FALSE%g
+s%@SH_TRUE@%$SH_TRUE%g
+s%@SH_FALSE@%$SH_FALSE%g
 s%@CPP@%$CPP%g
 s%@ALLOCA@%$ALLOCA%g
@@ -3955 +4128 @@
 CC="${CC}"
 DEFS="$DEFS"
+ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
 test ! -d include && mkdir include
 test ! -f include/fficonfig.h && cp fficonfig.h include/fficonfig.h
@@ -3970 +4144 @@
 if test -n "$CONFIG_FILES"; then
    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-   ac_file=Makefile . ${libffi_basedir}/../config-ml.in
+   ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
 fi
 

branches/GNU/src/gcc/libffi/configure.in

@@ -23 +23 @@
 if test "${srcdir}" = "."; then
   if test "${with_target_subdir}" != "."; then
-    libffi_basedir="${srcdir}/${with_multisrctop}.."
+    libffi_basedir="${with_multisrctop}../"
   else
-    libffi_basedir="${srcdir}/${with_multisrctop}"
+    libffi_basedir="${with_multisrctop}"
   fi
 else
-  libffi_basedir="${srcdir}"
+  libffi_basedir=
 fi
 AC_SUBST(libffi_basedir)
+AC_CONFIG_AUX_DIR(${libffi_basedir}..)
 
 AC_CANONICAL_HOST
@@ -48 +49 @@
 mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS; TARGETDIR=mips;;
 i*86-*-linux*) TARGET=X86; TARGETDIR=x86;;
+i*86-*-sco3.2v5*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
 i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;
@@ -57 +59 @@
 sparc-sun-4*) TARGET=SPARC; TARGETDIR=sparc;;
 sparc*-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
-sparc-*-linux*) TARGET=SPARC; TARGETDIR=sparc;;
-sparc64-*-linux*) TARGET=SPARC; TARGETDIR=sparc;;
-alpha*-*-linux* | alpha*-*-osf* | alpha*-*-freebsd*) TARGET=ALPHA; TARGETDIR=alpha;;
+sparc-*-linux* | sparc-*-netbsdelf*) TARGET=SPARC; TARGETDIR=sparc;;
+sparc64-*-linux* | sparc64-*-netbsd*) TARGET=SPARC; TARGETDIR=sparc;;
+alpha*-*-linux* | alpha*-*-osf* | alpha*-*-freebsd* | alpha*-*-netbsd*) TARGET=ALPHA; TARGETDIR=alpha;;
 ia64*-*-*) TARGET=IA64; TARGETDIR=ia64;;
 m68k-*-linux*) TARGET=M68K; TARGETDIR=m68k;;
+mips64*-*);;
+mips*-*-linux*) TARGET=MIPS_LINUX; TARGETDIR=mips;;
 powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc;;
 powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;;
@@ -68 +72 @@
 rs6000-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;;
 arm*-*-linux-*) TARGET=ARM; TARGETDIR=arm;;
+s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+x86_64-*-linux*) TARGET=X86_64; TARGETDIR=x86;;
+sh-*-linux* | sh[[34]]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
 esac
 
@@ -76 +84 @@
 AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
 AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
+AM_CONDITIONAL(MIPS_LINUX, test x$TARGET = xMIPS_LINUX)
 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
 AM_CONDITIONAL(X86, test x$TARGET = xX86)
@@ -86 +95 @@
 AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+AM_CONDITIONAL(S390, test x$TARGET = xS390)
+AM_CONDITIONAL(X86_64, test x$TARGET = xX86_64)
+AM_CONDITIONAL(SH, test x$TARGET = xSH)
+
+if test x$TARGET = xMIPS_LINUX; then
+  TARGET=MIPS
+fi
 
 AC_HEADER_STDC
@@ -119 +135 @@
                   [Define if your assembler and linker support unaligned PC relative relocs.])
     fi
+
+    AC_CACHE_CHECK([assembler .register pseudo-op support],
+       libffi_cv_as_register_pseudo_op, [
+       libffi_cv_as_register_pseudo_op=unknown
+       # Check if we have .register
+       AC_TRY_COMPILE([asm (".register %g2, #scratch");],,
+                       [libffi_cv_as_register_pseudo_op=yes],
+                       [libffi_cv_as_register_pseudo_op=no])
+    ])
+    if test "x$libffi_cv_as_register_pseudo_op" = xyes; then
+       AC_DEFINE(HAVE_AS_REGISTER_PSEUDO_OP, 1,
+               [Define if your assembler supports .register.])
+    fi
 fi
 
@@ -172 +201 @@
 if test -n "$CONFIG_FILES"; then
    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-   ac_file=Makefile . ${libffi_basedir}/../config-ml.in
+   ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
 fi
 ],
@@ -184 +213 @@
 CC="${CC}"
 DEFS="$DEFS"
+ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
 test ! -d include && mkdir include
 test ! -f include/fficonfig.h && cp fficonfig.h include/fficonfig.h

branches/GNU/src/gcc/libffi/fficonfig.h.in

@@ -26 +26 @@
 #undef STDC_HEADERS
 
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
 /* Define this if you want extra debugging */
 #undef FFI_DEBUG
@@ -43 +39 @@
 #undef FFI_NO_RAW_API
 
-/* The number of bytes in a double.  */
-#undef SIZEOF_DOUBLE
-
-/* The number of bytes in a float.  */
-#undef SIZEOF_FLOAT
-
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT
-
-/* The number of bytes in a long.  */
-#undef SIZEOF_LONG
-
-/* The number of bytes in a long double.  */
-#undef SIZEOF_LONG_DOUBLE
-
-/* The number of bytes in a long long.  */
-#undef SIZEOF_LONG_LONG
-
-/* The number of bytes in a short.  */
-#undef SIZEOF_SHORT
-
-/* The number of bytes in a void *.  */
-#undef SIZEOF_VOID_P
-
 /* Define if you have the memcpy function.  */
 #undef HAVE_MEMCPY
 
-/* Define if your assembler and linker support unaligned PC relative relocs.  */
+/* The number of bytes in type short */
+#undef SIZEOF_SHORT
+
+/* The number of bytes in type int */
+#undef SIZEOF_INT
+
+/* The number of bytes in type long */
+#undef SIZEOF_LONG
+
+/* The number of bytes in type long long */
+#undef SIZEOF_LONG_LONG
+
+/* The number of bytes in type float */
+#undef SIZEOF_FLOAT
+
+/* The number of bytes in type double */
+#undef SIZEOF_DOUBLE
+
+/* The number of bytes in type long double */
+#undef SIZEOF_LONG_DOUBLE
+
+/* The number of bytes in type void * */
+#undef SIZEOF_VOID_P
+
+/* whether byteorder is bigendian */
+#undef WORDS_BIGENDIAN
+
+/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
+#undef BYTEORDER
+
+/* Define if your assembler and linker support unaligned PC relative relocs. */
 #undef HAVE_AS_SPARC_UA_PCREL
+
+/* Define if your assembler supports .register. */
+#undef HAVE_AS_REGISTER_PSEUDO_OP
+

branches/GNU/src/gcc/libffi/include/Makefile.in

@@ -1 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -82 +82 @@
 VERSION = @VERSION@
 libffi_basedir = @libffi_basedir@
+toolexecdir = @toolexecdir@
+toolexeclibdir = @toolexeclibdir@
 
 AUTOMAKE_OPTIONS = foreign
@@ -90 +92 @@
 
 hack_DATA = fficonfig.h ffi.h ffi_mips.h
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/${libffi_basedir}../mkinstalldirs
 CONFIG_HEADER = ../fficonfig.h
 CONFIG_CLEAN_FILES =  ffi.h
@@ -100 +102 @@
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gnutar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect

branches/GNU/src/gcc/libffi/include/ffi.h.in

@@ -1 +1 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi @VERSION@ - Copyright (c) 1996-2002  Cygnus Solutions
+   libffi @VERSION@ - Copyright (c) 1996-2003  Cygnus Solutions
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -165 +165 @@
 #endif
 
+#ifdef S390
+#if defined (__s390x__)
+#define S390X
+#endif
+#endif
+
+#ifdef X86_64
+#if defined (__i386__)
+#undef X86_64
+#define X86
+#endif
+#endif
+
 #ifndef LIBFFI_ASM
 
@@ -190 +203 @@
 #endif
 
-  /* ---- Intel x86 ---------------- */
-#ifdef X86
-  FFI_SYSV,
-  FFI_DEFAULT_ABI = FFI_SYSV,
-#endif
-
   /* ---- Intel x86 Win32 ---------- */
 #ifdef X86_WIN32
   FFI_SYSV,
+  FFI_STDCALL,
+  /* TODO: Add fastcall support for the sake of completeness */
   FFI_DEFAULT_ABI = FFI_SYSV,
+#endif
+
+  /* ---- Intel x86 and AMD x86-64 - */
+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
+  FFI_SYSV,
+  FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
+#ifdef __i386__
+  FFI_DEFAULT_ABI = FFI_SYSV,
+#else
+  FFI_DEFAULT_ABI = FFI_UNIX64,
+#endif
 #endif
 
@@ -248 +268 @@
   /* ---- ARM  --------------------- */
 #ifdef ARM
+  FFI_SYSV,
+  FFI_DEFAULT_ABI = FFI_SYSV,
+#endif
+
+  /* ---- S390 --------------------- */
+#ifdef S390
+  FFI_SYSV,
+  FFI_DEFAULT_ABI = FFI_SYSV,
+#endif
+
+  /* ---- SuperH ------------------- */
+#ifdef SH
   FFI_SYSV,
   FFI_DEFAULT_ABI = FFI_SYSV,
@@ -265 +297 @@
 } ffi_type;
 
-/* These are defined in ffi.c */
+/* These are defined in types.c */
 extern ffi_type ffi_type_void;
 extern ffi_type ffi_type_uint8;
@@ -374 +406 @@
 /* ---- Definitions for closures ----------------------------------------- */
 
-#ifdef X86
-
-#define FFI_CLOSURES 1          /* x86 supports closures */
-#define FFI_TRAMPOLINE_SIZE 10
-#define FFI_NATIVE_RAW_API 1    /* and has native raw api support */
-
-#elif defined(X86_WIN32)
+#ifdef __i386__
 
 #define FFI_CLOSURES 1          /* x86 supports closures */
@@ -423 +449 @@
 #define FFI_CLOSURES 1
 #define FFI_TRAMPOLINE_SIZE 24 /* see struct below */ 
+#define FFI_NATIVE_RAW_API 0
+
+#elif defined(SPARC64)
+
+#define FFI_CLOSURES 1
+#define FFI_TRAMPOLINE_SIZE 24
+#define FFI_NATIVE_RAW_API 0
+
+#elif defined(SPARC)
+
+#define FFI_CLOSURES 1
+#define FFI_TRAMPOLINE_SIZE 16
+#define FFI_NATIVE_RAW_API 0
+
+#elif defined(S390)
+
+#define FFI_CLOSURES 1
+#ifdef S390X
+#define FFI_TRAMPOLINE_SIZE 32
+#else
+#define FFI_TRAMPOLINE_SIZE 16
+#endif
+#define FFI_NATIVE_RAW_API 0
+
+#elif defined(SH)
+
+#define FFI_CLOSURES 1
+#define FFI_TRAMPOLINE_SIZE 16
+#define FFI_NATIVE_RAW_API 0
+
+#elif defined(__x86_64__)
+
+#define FFI_CLOSURES 1
+#define FFI_TRAMPOLINE_SIZE 24
 #define FFI_NATIVE_RAW_API 0
 

branches/GNU/src/gcc/libffi/src/arm/ffi.c

@@ -37 +37 @@
 {
   register unsigned int i;
-  register int tmp;
-  register unsigned int avn;
   register void **p_argv;
   register char *argp;
   register ffi_type **p_arg;
 
-  tmp = 0;
   argp = stack;
 
@@ -51 +48 @@
   }
 
-  avn = ecif->cif->nargs;
   p_argv = ecif->avalue;
 
   for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
-       (i != 0) && (avn != 0);
+       (i != 0);
        i--, p_arg++)
     {
@@ -65 +61 @@
       }
 
-      if (avn != 0) 
-        {
-          avn--;
           z = (*p_arg)->size;
           if (z < sizeof(int))
@@ -108 +101 @@
           p_argv++;
           argp += z;
-        }
     }
   

branches/GNU/src/gcc/libffi/src/arm/sysv.S

@@ -29 +29 @@
 #include <machine/asm.h>
 #else
-/* XXX these lose for some platforms, I'm sure. */
+#ifdef __USER_LABEL_PREFIX__
+#define CONCAT1(a, b) CONCAT2(a, b)
+#define CONCAT2(a, b) a ## b
+
+/* Use the right prefix for global labels.  */
+#define CNAME(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
+#else
 #define CNAME(x) x
+#endif
 #define ENTRY(x) .globl CNAME(x); .type CNAME(x),%function; CNAME(x):
 #endif
@@ -97 +104 @@
 # return FLOAT
         cmp     a4, #FFI_TYPE_FLOAT
+#ifdef __SOFTFP__
+        streq   a1, [a3]
+#else
         stfeqs  f0, [a3]
+#endif
         beq     epilogue
 
 # return DOUBLE or LONGDOUBLE
         cmp     a4, #FFI_TYPE_DOUBLE
+#ifdef __SOFTFP__
+        stmeqia a3, {a1, a2}
+#else
         stfeqd  f0, [a3]
+#endif
 
 epilogue:

branches/GNU/src/gcc/libffi/src/ffitest.c

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   ffitest.c - Copyright (c) 1996, 1997, 1998  Cygnus Solutions
+   ffitest.c - Copyright (c) 1996, 1997, 1998, 2002, 2003  Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -49 +49 @@
   return (strlen(s));
 }
+
+#ifdef X86_WIN32
+static size_t __attribute__((stdcall)) my_stdcall_strlen(char *s)
+{
+  return (strlen(s));
+}
+#endif /* X86_WIN32 */
 
 static int promotion(signed char sc, signed short ss, 
@@ -113 +120 @@
 }
 
+#ifdef X86_WIN32
+static float __attribute__((stdcall)) stdcall_many(float f1,
+                                                   float f2,
+                                                   float f3,
+                                                   float f4,
+                                                   float f5,
+                                                   float f6,
+                                                   float f7,
+                                                   float f8,
+                                                   float f9,
+                                                   float f10,
+                                                   float f11,
+                                                   float f12,
+                                                   float f13)
+{
+  return ((f1/f2+f3/f4+f5/f6+f7/f8+f9/f10+f11/f12) * f13);
+}
+#endif /* X86_WIN32 */
+
 static double dblit(float f)
 {
@@ -153 +179 @@
   char c2;
 } test_structure_5;
+
+typedef struct
+{
+  float f;
+  double d;
+} test_structure_6;
+
+typedef struct
+{
+  float f1;
+  float f2;
+  double d;
+} test_structure_7;
+
+typedef struct
+{
+  float f1;
+  float f2;
+  float f3;
+  float f4;
+} test_structure_8;
+
+typedef struct
+{
+  float f;
+  int i;
+} test_structure_9;
 
 static test_structure_1 struct1(test_structure_1 ts)
@@ -195 +248 @@
 }
 
+static test_structure_6 struct6 (test_structure_6 ts)
+{
+  ts.f += 1;
+  ts.d += 1;
+
+  return ts;
+}
+
+static test_structure_7 struct7 (test_structure_7 ts)
+{
+  ts.f1 += 1;
+  ts.f2 += 1;
+  ts.d += 1;
+
+  return ts;
+}
+
+static test_structure_8 struct8 (test_structure_8 ts)
+{
+  ts.f1 += 1;
+  ts.f2 += 1;
+  ts.f3 += 1;
+  ts.f4 += 1;
+
+  return ts;
+}
+
+static test_structure_9 struct9 (test_structure_9 ts)
+{
+  ts.f += 1;
+  ts.i += 1;
+
+  return ts;
+}
+
 /* Take an int and a float argument, together with int userdata, and    */
 /* return the sum.                                                      */
-static void closure_test_fn(ffi_cif* cif,void* resp,void** args, void* userdata)
-{
-    *(int*)resp =
-         *(int *)args[0] + (int)(*(float *)args[1]) + (int)(long)userdata;
-}
-
-typedef int (*closure_test_type)(int, float);
+#if FFI_CLOSURES
+static void
+closure_test_fn(ffi_cif* cif,void* resp,void** args, void* userdata)
+{
+  *(ffi_arg*)resp =
+    (int)*(unsigned long long *)args[0] + (int)(*(int *)args[1]) +
+    (int)(*(unsigned long long *)args[2]) + (int)*(int *)args[3] +
+    (int)(*(signed short *)args[4]) +
+    (int)(*(unsigned long long *)args[5]) +
+    (int)*(int *)args[6] + (int)(*(int *)args[7]) +
+    (int)(*(double *)args[8]) + (int)*(int *)args[9] +
+    (int)(*(int *)args[10]) + (int)(*(float *)args[11]) +
+    (int)*(int *)args[12] + (int)(*(int *)args[13]) +
+    (int)(*(int *)args[14]) +  *(int *)args[15] + (int)(long)userdata;
+
+        printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
+               (int)*(unsigned long long *)args[0], (int)(*(int *)args[1]), 
+               (int)(*(unsigned long long *)args[2]),
+               (int)*(int *)args[3], (int)(*(signed short *)args[4]), 
+               (int)(*(unsigned long long *)args[5]),
+               (int)*(int *)args[6], (int)(*(int *)args[7]), 
+               (int)(*(double *)args[8]), (int)*(int *)args[9],
+               (int)(*(int *)args[10]), (int)(*(float *)args[11]),
+               (int)*(int *)args[12], (int)(*(int *)args[13]), 
+               (int)(*(int *)args[14]),*(int *)args[15],
+               (int)(long)userdata, *(int*)resp);
+}
+
+typedef int (*closure_test_type)(unsigned long long, int, unsigned long long, 
+                                 int, signed short, unsigned long long, int, 
+                                 int, double, int, int, float, int, int, 
+                                 int, int);
+
+static void closure_test_fn1(ffi_cif* cif,void* resp,void** args, 
+                             void* userdata)
+ {
+    *(ffi_arg*)resp =
+      (int)*(float *)args[0] +(int)(*(float *)args[1]) + 
+      (int)(*(float *)args[2]) + (int)*(float *)args[3] +
+      (int)(*(signed short *)args[4]) + (int)(*(float *)args[5]) +
+      (int)*(float *)args[6] + (int)(*(int *)args[7]) + 
+      (int)(*(double*)args[8]) + (int)*(int *)args[9] + 
+      (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + 
+      (int)*(int *)args[12] + (int)(*(int *)args[13]) + 
+      (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata;
+
+    printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
+           (int)*(float *)args[0], (int)(*(float *)args[1]), 
+           (int)(*(float *)args[2]), (int)*(float *)args[3], 
+           (int)(*(signed short *)args[4]), (int)(*(float *)args[5]),
+           (int)*(float *)args[6], (int)(*(int *)args[7]),
+           (int)(*(double *)args[8]), (int)*(int *)args[9],
+           (int)(*(int *)args[10]), (int)(*(float *)args[11]),
+           (int)*(int *)args[12], (int)(*(int *)args[13]),
+           (int)(*(int *)args[14]), *(int *)args[15],
+           (int)(long)userdata, *(int*)resp);
+}
+
+typedef int (*closure_test_type1)(float, float, float, float, signed short, 
+                                  float, float, int, double, int, int, float,
+                                  int, int, int, int);
+
+static void closure_test_fn2(ffi_cif* cif,void* resp,void** args, 
+                             void* userdata)
+ {
+    *(ffi_arg*)resp =
+      (int)*(double *)args[0] +(int)(*(double *)args[1]) + 
+      (int)(*(double *)args[2]) + (int)*(double *)args[3] +
+      (int)(*(signed short *)args[4]) + (int)(*(double *)args[5]) +
+      (int)*(double *)args[6] + (int)(*(int *)args[7]) + 
+      (int)(*(double *)args[8]) + (int)*(int *)args[9] +
+      (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + 
+      (int)*(int *)args[12] + (int)(*(float *)args[13]) +
+      (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata;
+
+    printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
+           (int)*(double *)args[0], (int)(*(double *)args[1]), 
+           (int)(*(double *)args[2]), (int)*(double *)args[3], 
+           (int)(*(signed short *)args[4]), (int)(*(double *)args[5]),
+           (int)*(double *)args[6], (int)(*(int *)args[7]), 
+           (int)(*(double*)args[8]), (int)*(int *)args[9], 
+           (int)(*(int *)args[10]), (int)(*(float *)args[11]),
+           (int)*(int *)args[12], (int)(*(float *)args[13]), 
+           (int)(*(int *)args[14]), *(int *)args[15], (int)(long)userdata, 
+           *(int*)resp);
+ }
+
+typedef int (*closure_test_type2)(double, double, double, double, signed short,
+                                  double, double, int, double, int, int, float,
+                                  int, float, int, int);
+
+static void closure_test_fn3(ffi_cif* cif,void* resp,void** args,
+                             void* userdata)
+ {
+    *(ffi_arg*)resp =
+      (int)*(float *)args[0] +(int)(*(float *)args[1]) + 
+      (int)(*(float *)args[2]) + (int)*(float *)args[3] +
+      (int)(*(float *)args[4]) + (int)(*(float *)args[5]) +
+      (int)*(float *)args[6] + (int)(*(float *)args[7]) + 
+      (int)(*(double *)args[8]) + (int)*(int *)args[9] +
+      (int)(*(float *)args[10]) + (int)(*(float *)args[11]) + 
+      (int)*(int *)args[12] + (int)(*(float *)args[13]) +
+      (int)(*(float *)args[14]) +  *(int *)args[15] + (int)(long)userdata;
+
+    printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n",
+           (int)*(float *)args[0], (int)(*(float *)args[1]), 
+           (int)(*(float *)args[2]), (int)*(float *)args[3], 
+           (int)(*(float *)args[4]), (int)(*(float *)args[5]),
+           (int)*(float *)args[6], (int)(*(float *)args[7]), 
+           (int)(*(double *)args[8]), (int)*(int *)args[9], 
+           (int)(*(float *)args[10]), (int)(*(float *)args[11]),
+           (int)*(int *)args[12], (int)(*(float *)args[13]), 
+           (int)(*(float *)args[14]), *(int *)args[15], (int)(long)userdata,
+           *(int*)resp);
+ }
+
+typedef int (*closure_test_type3)(float, float, float, float, float, float,
+                                  float, float, double, int, float, float, int,
+                                  float, float, int);
+#endif
 
 int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[])
@@ -226 +427 @@
   long long rlonglong;
 
+# if FFI_CLOSURES
+  /* The closure must not be an automatic variable on
+     platforms (Solaris) that forbid stack execution by default. */
+  static ffi_closure cl;
+#endif
+
+  ffi_type * cl_arg_types[17];
+
   ffi_type ts1_type;
   ffi_type ts2_type;
@@ -231 +440 @@
   ffi_type ts4_type;  
   ffi_type ts5_type;
+  ffi_type ts6_type;
+  ffi_type ts7_type;
+  ffi_type ts8_type;
+  ffi_type ts9_type;
   ffi_type *ts1_type_elements[4];
   ffi_type *ts2_type_elements[3];
@@ -236 +449 @@
   ffi_type *ts4_type_elements[4];
   ffi_type *ts5_type_elements[3];
+  ffi_type *ts6_type_elements[3];
+  ffi_type *ts7_type_elements[4];
+  ffi_type *ts8_type_elements[5];
+  ffi_type *ts9_type_elements[3];
 
   ts1_type.size = 0;
@@ -256 +473 @@
   ts5_type.alignment = 0;
   ts5_type.type = FFI_TYPE_STRUCT;
+
+  ts6_type.size = 0;
+  ts6_type.alignment = 0;
+  ts6_type.type = FFI_TYPE_STRUCT;
+
+  ts7_type.size = 0;
+  ts7_type.alignment = 0;
+  ts7_type.type = FFI_TYPE_STRUCT;
+
+  ts8_type.size = 0;
+  ts8_type.alignment = 0;
+  ts8_type.type = FFI_TYPE_STRUCT;
+
+  ts9_type.size = 0;
+  ts9_type.alignment = 0;
+  ts9_type.type = FFI_TYPE_STRUCT;
 
   /*@-immediatetrans@*/
@@ -263 +496 @@
   ts4_type.elements = ts4_type_elements;
   ts5_type.elements = ts5_type_elements;
+  ts6_type.elements = ts6_type_elements;
+  ts7_type.elements = ts7_type_elements;
+  ts8_type.elements = ts8_type_elements;
+  ts9_type.elements = ts9_type_elements;
   /*@=immediatetrans@*/
   
@@ -286 +523 @@
   ts5_type_elements[2] = NULL;
 
+  ts6_type_elements[0] = &ffi_type_float;
+  ts6_type_elements[1] = &ffi_type_double;
+  ts6_type_elements[2] = NULL;
+
+  ts7_type_elements[0] = &ffi_type_float;
+  ts7_type_elements[1] = &ffi_type_float;
+  ts7_type_elements[2] = &ffi_type_double;
+  ts7_type_elements[3] = NULL;
+
+  ts8_type_elements[0] = &ffi_type_float;
+  ts8_type_elements[1] = &ffi_type_float;
+  ts8_type_elements[2] = &ffi_type_float;
+  ts8_type_elements[3] = &ffi_type_float;
+  ts8_type_elements[4] = NULL;
+
+  ts9_type_elements[0] = &ffi_type_float;
+  ts9_type_elements[1] = &ffi_type_sint;
+  ts9_type_elements[2] = NULL;
+
   ul = 0;
 
@@ -327 +583 @@
         ul++;
         ffi_call(&cif, FFI_FN(return_sc), &rint, values);
-        CHECK(rint == (int) sc);
+        CHECK(rint == (ffi_arg) sc);
       }
 
@@ -414 +670 @@
     ffi_call(&cif, FFI_FN(floating), &rint, values);
 
-    printf ("%d vs %d\n", rint, floating (si1, f, d, ld, si2));
+    printf ("%d vs %d\n", (int)rint, floating (si1, f, d, ld, si2));
 
     CHECK(rint == floating(si1, f, d, ld, si2));
@@ -484 +740 @@
 
     /*@-usedef@*/
-    ff =  many(fa[0], fa[1],
+    ff = many (fa[0], fa[1],
                fa[2], fa[3],
                fa[4], fa[5],
@@ -533 +789 @@
               ul++;
               ffi_call(&cif, FFI_FN(promotion), &rint, values);
-              CHECK(rint == (int) sc + (int) ss + (int) uc + (int) us);
+              CHECK((int)rint == (signed char) sc + (signed short) ss +
+                    (unsigned char) uc + (unsigned short) us);
             }
     printf("%lu promotion tests run\n", ul);
@@ -580 +837 @@
     
     /* Initialize the cif */
-    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, 
-                       &ts2_type, args) == FFI_OK);
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts2_type, args) == FFI_OK);
 
     ts2_arg.d1 = 5.55;
@@ -648 +904 @@
     
     /* Initialize the cif */
-    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, 
-                       &ts4_type, args) == FFI_OK);
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts4_type, args) == FFI_OK);
 
     ts4_arg.ui1 = 2;
@@ -679 +934 @@
     
     /* Initialize the cif */
-    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, 
-                       &ts5_type, args) == FFI_OK);
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ts5_type, args) == FFI_OK);
 
     ts5_arg1.c1 = 2;
@@ -698 +952 @@
   }
 
+  /* struct tests */
+  {
+    test_structure_6 ts6_arg;
+
+    /* This is a hack to get a properly aligned result buffer */
+    test_structure_6 *ts6_result = 
+      (test_structure_6 *) malloc (sizeof(test_structure_6));
+
+    args[0] = &ts6_type;
+    values[0] = &ts6_arg;
+
+    /* Initialize the cif */
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts6_type, args) == FFI_OK);
+
+    ts6_arg.f = 5.55f;
+    ts6_arg.d = 6.66;
+
+    printf ("%g\n", ts6_arg.f);
+    printf ("%g\n", ts6_arg.d);
+
+    ffi_call(&cif, FFI_FN(struct6), ts6_result, values);
+
+    printf ("%g\n", ts6_result->f);
+    printf ("%g\n", ts6_result->d);
+
+    CHECK(ts6_result->f == 5.55f + 1);
+    CHECK(ts6_result->d == 6.66 + 1);
+
+    printf("structure test 6 ok!\n");
+
+    free (ts6_result);
+  }
+
+  /* struct tests */
+  {
+    test_structure_7 ts7_arg;
+
+    /* This is a hack to get a properly aligned result buffer */
+    test_structure_7 *ts7_result = 
+      (test_structure_7 *) malloc (sizeof(test_structure_7));
+
+    args[0] = &ts7_type;
+    values[0] = &ts7_arg;
+
+    /* Initialize the cif */
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts7_type, args) == FFI_OK);
+
+    ts7_arg.f1 = 5.55f;
+    ts7_arg.f2 = 55.5f;
+    ts7_arg.d = 6.66;
+
+    printf ("%g\n", ts7_arg.f1);
+    printf ("%g\n", ts7_arg.f2);
+    printf ("%g\n", ts7_arg.d);
+
+    ffi_call(&cif, FFI_FN(struct7), ts7_result, values);
+
+    printf ("%g\n", ts7_result->f1);
+    printf ("%g\n", ts7_result->f2);
+    printf ("%g\n", ts7_result->d);
+
+    CHECK(ts7_result->f1 == 5.55f + 1);
+    CHECK(ts7_result->f2 == 55.5f + 1);
+    CHECK(ts7_result->d == 6.66 + 1);
+
+    printf("structure test 7 ok!\n");
+
+    free (ts7_result);
+  }
+
+  /* struct tests */
+  {
+    test_structure_8 ts8_arg;
+
+    /* This is a hack to get a properly aligned result buffer */
+    test_structure_8 *ts8_result = 
+      (test_structure_8 *) malloc (sizeof(test_structure_8));
+
+    args[0] = &ts8_type;
+    values[0] = &ts8_arg;
+
+    /* Initialize the cif */
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts8_type, args) == FFI_OK);
+
+    ts8_arg.f1 = 5.55f;
+    ts8_arg.f2 = 55.5f;
+    ts8_arg.f3 = -5.55f;
+    ts8_arg.f4 = -55.5f;
+
+    printf ("%g\n", ts8_arg.f1);
+    printf ("%g\n", ts8_arg.f2);
+    printf ("%g\n", ts8_arg.f3);
+    printf ("%g\n", ts8_arg.f4);
+
+    ffi_call(&cif, FFI_FN(struct8), ts8_result, values);
+
+    printf ("%g\n", ts8_result->f1);
+    printf ("%g\n", ts8_result->f2);
+    printf ("%g\n", ts8_result->f3);
+    printf ("%g\n", ts8_result->f4);
+
+    CHECK(ts8_result->f1 == 5.55f + 1);
+    CHECK(ts8_result->f2 == 55.5f + 1);
+    CHECK(ts8_result->f3 == -5.55f + 1);
+    CHECK(ts8_result->f4 == -55.5f + 1);
+
+    printf("structure test 8 ok!\n");
+
+    free (ts8_result);
+  }
+
+  /* struct tests */
+  {
+    test_structure_9 ts9_arg;
+
+    /* This is a hack to get a properly aligned result buffer */
+    test_structure_9 *ts9_result = 
+      (test_structure_9 *) malloc (sizeof(test_structure_9));
+
+    args[0] = &ts9_type;
+    values[0] = &ts9_arg;
+
+    /* Initialize the cif */
+    CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1, &ts9_type, args) == FFI_OK);
+
+    ts9_arg.f = 5.55f;
+    ts9_arg.i = 5;
+
+    printf ("%g\n", ts9_arg.f);
+    printf ("%d\n", ts9_arg.i);
+
+    ffi_call(&cif, FFI_FN(struct9), ts9_result, values);
+
+    printf ("%g\n", ts9_result->f);
+    printf ("%d\n", ts9_result->i);
+
+    CHECK(ts9_result->f == 5.55f + 1);
+    CHECK(ts9_result->i == 5 + 1);
+
+    printf("structure test 9 ok!\n");
+
+    free (ts9_result);
+  }
+
 #else
   printf("Structure passing doesn't work on Win32.\n");
 #endif /* X86_WIN32 */
 
+#ifdef X86_WIN32
+  /* stdcall strlen tests */
+  {
+    args[0] = &ffi_type_pointer;
+    values[0] = (void*) &s;
+
+    /* Initialize the cif */
+    CHECK(ffi_prep_cif(&cif, FFI_STDCALL, 1,
+                       &ffi_type_sint, args) == FFI_OK);
+
+    s = "a";
+    ffi_call(&cif, FFI_FN(my_stdcall_strlen), &rint, values);
+    CHECK(rint == 1);
+
+    s = "1234567";
+    ffi_call(&cif, FFI_FN(my_stdcall_strlen), &rint, values);
+    CHECK(rint == 7);
+
+    s = "1234567890123456789012345";
+    ffi_call(&cif, FFI_FN(my_stdcall_strlen), &rint, values);
+    CHECK(rint == 25);
+
+    printf("stdcall strlen tests passed\n");
+  }
+
+  /* stdcall many arg tests */
+  {
+    float ff;
+    float fa[13];
+
+    for (ul = 0; ul < 13; ul++)
+      {
+        args[ul] = &ffi_type_float;
+        values[ul] = &fa[ul];
+        fa[ul] = (float) ul;
+      }
+
+    /* Initialize the cif */
+    CHECK(ffi_prep_cif(&cif, FFI_STDCALL, 13,
+                       &ffi_type_float, args) == FFI_OK);
+
+    /*@-usedef@*/
+    ff =  stdcall_many(fa[0], fa[1],
+               fa[2], fa[3],
+               fa[4], fa[5],
+               fa[6], fa[7],
+               fa[8], fa[9],
+               fa[10],fa[11],fa[12]);
+    /*@=usedef@*/
+
+    ffi_call(&cif, FFI_FN(stdcall_many), &f, values);
+
+    /*@-realcompare@*/
+    if (f - ff < FLT_EPSILON)
+    /*@=realcompare@*/
+        printf("stdcall many arg tests ok!\n");
+    else
+        CHECK(0);
+  }
+#endif /* X86_WIN32 */
+
 # if FFI_CLOSURES
   /* A simple closure test */
     {
-      ffi_closure cl;
-      ffi_type * cl_arg_types[3];
-
-      cl_arg_types[0] = &ffi_type_sint;
+      (void) puts("\nEnter FFI_CLOSURES\n");
+
+      cl_arg_types[0] = &ffi_type_uint64;
+      cl_arg_types[1] = &ffi_type_uint;
+      cl_arg_types[2] = &ffi_type_uint64;
+      cl_arg_types[3] = &ffi_type_uint;
+      cl_arg_types[4] = &ffi_type_sshort;
+      cl_arg_types[5] = &ffi_type_uint64;
+      cl_arg_types[6] = &ffi_type_uint;
+      cl_arg_types[7] = &ffi_type_uint;
+      cl_arg_types[8] = &ffi_type_double;
+      cl_arg_types[9] = &ffi_type_uint;
+      cl_arg_types[10] = &ffi_type_uint;
+      cl_arg_types[11] = &ffi_type_float;
+      cl_arg_types[12] = &ffi_type_uint;
+      cl_arg_types[13] = &ffi_type_uint;
+      cl_arg_types[14] = &ffi_type_uint;
+      cl_arg_types[15] = &ffi_type_uint;
+      cl_arg_types[16] = NULL;   
+
+      /* Initialize the cif */
+      CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
+                         &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+      CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn,
+                             (void *) 3 /* userdata */) == FFI_OK);
+      
+      CHECK((*((closure_test_type)(&cl)))
+            (1LL, 2, 3LL, 4, 127, 429LL, 7, 8, 9.5, 10, 11, 12, 13, 
+             19, 21, 1) == 680);
+    }
+
+    {
+
+      cl_arg_types[0] = &ffi_type_float;
       cl_arg_types[1] = &ffi_type_float;
-      cl_arg_types[2] = NULL;
+      cl_arg_types[2] = &ffi_type_float;
+      cl_arg_types[3] = &ffi_type_float;
+      cl_arg_types[4] = &ffi_type_sshort;
+      cl_arg_types[5] = &ffi_type_float;
+      cl_arg_types[6] = &ffi_type_float;
+      cl_arg_types[7] = &ffi_type_uint;
+      cl_arg_types[8] = &ffi_type_double;
+      cl_arg_types[9] = &ffi_type_uint;
+      cl_arg_types[10] = &ffi_type_uint;
+      cl_arg_types[11] = &ffi_type_float;
+      cl_arg_types[12] = &ffi_type_uint;
+      cl_arg_types[13] = &ffi_type_uint;
+      cl_arg_types[14] = &ffi_type_uint;
+      cl_arg_types[15] = &ffi_type_uint;
+      cl_arg_types[16] = NULL;
       
       /* Initialize the cif */
-      CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, 
-                         &ffi_type_sint, cl_arg_types) == FFI_OK);
-
-      CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn,
-                             (void *) 3 /* userdata */)
-            == FFI_OK);
-      CHECK((*((closure_test_type)(&cl)))(1, 2.0) == 6);
+      CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
+                         &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+      CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn1,
+                             (void *) 3 /* userdata */)  == FFI_OK);
+      
+      CHECK((*((closure_test_type1)(&cl)))
+            (1.1, 2.2, 3.3, 4.4, 127, 5.5, 6.6, 8, 9, 10, 11, 12.0, 13,
+             19, 21, 1) == 255);
     }
+
+    {
+
+      cl_arg_types[0] = &ffi_type_double;
+      cl_arg_types[1] = &ffi_type_double;
+      cl_arg_types[2] = &ffi_type_double;
+      cl_arg_types[3] = &ffi_type_double;
+      cl_arg_types[4] = &ffi_type_sshort;
+      cl_arg_types[5] = &ffi_type_double;
+      cl_arg_types[6] = &ffi_type_double;
+      cl_arg_types[7] = &ffi_type_uint;
+      cl_arg_types[8] = &ffi_type_double;
+      cl_arg_types[9] = &ffi_type_uint;
+      cl_arg_types[10] = &ffi_type_uint;
+      cl_arg_types[11] = &ffi_type_float;
+      cl_arg_types[12] = &ffi_type_uint;
+      cl_arg_types[13] = &ffi_type_float;
+      cl_arg_types[14] = &ffi_type_uint;
+      cl_arg_types[15] = &ffi_type_uint;
+      cl_arg_types[16] = NULL;
+      
+      /* Initialize the cif */
+      CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
+                         &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+      CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn2,
+                             (void *) 3 /* userdata */) == FFI_OK);
+
+      CHECK((*((closure_test_type2)(&cl)))
+            (1, 2, 3, 4, 127, 5, 6, 8, 9, 10, 11, 12.0, 13,
+             19.0, 21, 1) == 255);
+
+    }
+
+    {
+
+      cl_arg_types[0] = &ffi_type_float;
+      cl_arg_types[1] = &ffi_type_float;
+      cl_arg_types[2] = &ffi_type_float;
+      cl_arg_types[3] = &ffi_type_float;
+      cl_arg_types[4] = &ffi_type_float;
+      cl_arg_types[5] = &ffi_type_float;
+      cl_arg_types[6] = &ffi_type_float;
+      cl_arg_types[7] = &ffi_type_float;
+      cl_arg_types[8] = &ffi_type_double;
+      cl_arg_types[9] = &ffi_type_uint;
+      cl_arg_types[10] = &ffi_type_float;
+      cl_arg_types[11] = &ffi_type_float;
+      cl_arg_types[12] = &ffi_type_uint;
+      cl_arg_types[13] = &ffi_type_float;
+      cl_arg_types[14] = &ffi_type_float;
+      cl_arg_types[15] = &ffi_type_uint;
+      cl_arg_types[16] = NULL;
+      
+      /* Initialize the cif */
+      CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16,
+                         &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+      CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn3,
+                             (void *) 3 /* userdata */)  == FFI_OK);
+      
+      CHECK((*((closure_test_type3)(&cl)))
+            (1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9, 10, 11.11, 12.0, 13,
+             19.19, 21.21, 1) == 135);
+    }
+
+    (void) puts("\nFinished FFI_CLOSURES\n");
+
 # endif
 

branches/GNU/src/gcc/libffi/src/java_raw_api.c

@@ -82 +82 @@
         case FFI_TYPE_UINT8:
         case FFI_TYPE_SINT8:
-          *args = (void*) ((char*)(raw++) + SIZEOF_ARG - 1);
+          *args = (void*) ((char*)(raw++) + 3);
           break;
           
         case FFI_TYPE_UINT16:
         case FFI_TYPE_SINT16:
-          *args = (void*) ((char*)(raw++) + SIZEOF_ARG - 2);
-          break;
-
-#if SIZEOF_ARG >= 4       
-        case FFI_TYPE_UINT32:
-        case FFI_TYPE_SINT32:
-          *args = (void*) ((char*)(raw++) + SIZEOF_ARG - 4);
-          break;
-#endif
-        
+          *args = (void*) ((char*)(raw++) + 2);
+          break;
+
 #if SIZEOF_ARG == 8       
         case FFI_TYPE_UINT64:
@@ -158 +151 @@
         {
         case FFI_TYPE_UINT8:
+#if WORDS_BIGENDIAN
+          *(UINT32*)(raw++) = *(UINT8*) (*args);
+#else
           (raw++)->uint = *(UINT8*) (*args);
+#endif
           break;
 
         case FFI_TYPE_SINT8:
+#if WORDS_BIGENDIAN
+          *(SINT32*)(raw++) = *(SINT8*) (*args);
+#else
           (raw++)->sint = *(SINT8*) (*args);
+#endif
           break;
 
         case FFI_TYPE_UINT16:
+#if WORDS_BIGENDIAN
+          *(UINT32*)(raw++) = *(UINT16*) (*args);
+#else
           (raw++)->uint = *(UINT16*) (*args);
+#endif
           break;
 
         case FFI_TYPE_SINT16:
+#if WORDS_BIGENDIAN
+          *(SINT32*)(raw++) = *(SINT16*) (*args);
+#else
           (raw++)->sint = *(SINT16*) (*args);
-          break;
-
-#if SIZEOF_ARG >= 4
+#endif
+          break;
+
         case FFI_TYPE_UINT32:
+#if WORDS_BIGENDIAN
+          *(UINT32*)(raw++) = *(UINT32*) (*args);
+#else
           (raw++)->uint = *(UINT32*) (*args);
+#endif
           break;
 
         case FFI_TYPE_SINT32:
+#if WORDS_BIGENDIAN
+          *(SINT32*)(raw++) = *(SINT32*) (*args);
+#else
           (raw++)->sint = *(SINT32*) (*args);
-          break;
-#endif
-        case FFI_TYPE_FLOAT:
+#endif
+          break;
+
+        case FFI_TYPE_FLOAT:
           (raw++)->flt = *(FLOAT32*) (*args);
           break;
@@ -212 +228 @@
 #if !FFI_NATIVE_RAW_API
 
+static void
+ffi_java_rvalue_to_raw (ffi_cif *cif, void *rvalue)
+{
+#if WORDS_BIGENDIAN && SIZEOF_ARG == 8
+  switch (cif->rtype->type)
+    {
+    case FFI_TYPE_UINT8:
+    case FFI_TYPE_UINT16:
+    case FFI_TYPE_UINT32:
+      *(UINT64 *)rvalue <<= 32;
+      break;
+
+    case FFI_TYPE_SINT8:
+    case FFI_TYPE_SINT16:
+    case FFI_TYPE_SINT32:
+    case FFI_TYPE_INT:
+      *(SINT64 *)rvalue <<= 32;
+      break;
+
+    default:
+      break;
+    }
+#endif
+}
+
+static void
+ffi_java_raw_to_rvalue (ffi_cif *cif, void *rvalue)
+{
+#if WORDS_BIGENDIAN && SIZEOF_ARG == 8
+  switch (cif->rtype->type)
+    {
+    case FFI_TYPE_UINT8:
+    case FFI_TYPE_UINT16:
+    case FFI_TYPE_UINT32:
+      *(UINT64 *)rvalue >>= 32;
+      break;
+
+    case FFI_TYPE_SINT8:
+    case FFI_TYPE_SINT16:
+    case FFI_TYPE_SINT32:
+    case FFI_TYPE_INT:
+      *(SINT64 *)rvalue >>= 32;
+      break;
+
+    default:
+      break;
+    }
+#endif
+}
 
 /* This is a generic definition of ffi_raw_call, to be used if the
@@ -228 +293 @@
   ffi_java_raw_to_ptrarray (cif, raw, avalue);
   ffi_call (cif, fn, rvalue, avalue);
+  ffi_java_rvalue_to_raw (cif, rvalue);
 }
 
@@ -241 +307 @@
   ffi_java_ptrarray_to_raw (cif, avalue, raw);
   (*cl->fun) (cif, rvalue, raw, cl->user_data);
+  ffi_java_raw_to_rvalue (cif, rvalue);
 }
 

branches/GNU/src/gcc/libffi/src/m68k/ffi.c

@@ -17 +17 @@
 {
   unsigned int i;
-  int tmp;
-  unsigned int avn;
   void **p_argv;
   char *argp;
@@ -24 +22 @@
   void *struct_value_ptr;
 
-  tmp = 0;
   argp = stack;
 
@@ -33 +30 @@
     struct_value_ptr = NULL;
 
-  avn = ecif->cif->nargs;
   p_argv = ecif->avalue;
 
   for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
-       i != 0 && avn != 0;
+       i != 0;
        i--, p_arg++)
     {
@@ -46 +42 @@
         argp = (char *) ALIGN (argp, (*p_arg)->alignment);
 
-      if (avn != 0) 
-        {
-          avn--;
           z = (*p_arg)->size;
           if (z < sizeof (int))
@@ -83 +76 @@
           p_argv++;
           argp += z;
-        }
     }
 

branches/GNU/src/gcc/libffi/src/mips/ffi.c

@@ -24 +24 @@
    ----------------------------------------------------------------------- */
 
+#include <sgidefs.h>
 #include <ffi.h>
 #include <ffi_common.h>
@@ -51 +52 @@
 {
   register int i;
-  register int avn;
   register void **p_argv;
   register char *argp;
@@ -81 +81 @@
     }
 
-  avn = ecif->cif->nargs;
   p_argv = ecif->avalue;
 
-  for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
-       i && avn;
-       i--, p_arg++)
+  for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; i; i--, p_arg++)
     {
       size_t z;
@@ -102 +99 @@
 #endif      
 
-      if (avn) 
-        {
-          avn--;
           z = (*p_arg)->size;
           if (z < sizeof(SLOT_TYPE_UNSIGNED))
@@ -180 +174 @@
           argp += z;
           FIX_ARGP;
-        }
     }
   

branches/GNU/src/gcc/libffi/src/powerpc/aix_closure.S

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   aix_closures.S - Copyright (c) 2002 Free Software Foundation, Inc.
-   based on darwin_closures.S 
+   aix_closure.S - Copyright (c) 2002 2003 Free Software Foundation, Inc.
+   based on darwin_closure.S 
   
    PowerPC Assembly glue.
@@ -107 +107 @@
         /* 32 Bytes (params) */
         /* 104 Bytes (13*8 from FPR) */ 
-        /* 4 Bytes (result)
-        /* 164 Bytes */
-        
-        stwu r1,-164(r1)        /* skip over caller save area */
+        /* 8 Bytes (result)
+        /* 168 Bytes */
+        
+        stwu r1,-176(r1)        /* skip over caller save area
+                                keep stack aligned to 16  */
 
 /* we want to build up an area for the parameters passed */
 /* in registers (both floating point and integer) */
         
-        /* we store gpr 3 to gpr 10 (aligned to 4) */
-        /* in the parents outgoing area            */
-        stw   r3, 188(r1)
-        stw   r4, 192(r1)
-        stw   r5, 196(r1) 
-        stw   r6, 200(r1)
-        stw   r7, 204(r1)
-        stw   r8, 208(r1) 
-        stw   r9, 212(r1)
-        stw   r10, 216(r1)
+        /* we store gpr 3 to gpr 10 (aligned to 4)
+        in the parents outgoing area  */
+        stw   r3, 200(r1)
+        stw   r4, 204(r1)
+        stw   r5, 208(r1) 
+        stw   r6, 212(r1)
+        stw   r7, 216(r1)
+        stw   r8, 220(r1) 
+        stw   r9, 224(r1)
+        stw   r10, 228(r1)
 
         /* next save fpr 1 to fpr 13 (aligned to 8) */
@@ -149 +150 @@
         
         /* now load up the pointer to the saved gpr registers */
-        addi r5,r1,188
+        addi r5,r1,200
 
         /* now load up the pointer to the saved fpr registers */
@@ -156 +157 @@
         /* now load up the pointer to the outgoing parameter  */
         /* stack in the previous frame */
-        addi r7,r1,220
+        addi r7,r1,232
         
         /* make the call */
@@ -244 +245 @@
 L..44:
         
-        addi r1,r1,164          /* restore stack pointer */
+        addi r1,r1,176          /* restore stack pointer */
         lwz r0,8(r1)            /* get return address */
         mtlr r0                 /* reset link register */

branches/GNU/src/gcc/libffi/src/powerpc/darwin.S

@@ -3 +3 @@
    
    PowerPC Assembly glue.
-
-   $Id: darwin.S,v 1.2 2002/01/18 16:22:34 dje Exp $
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -40 +38 @@
         .align 2
 _ffi_call_DARWIN:
-        mr      r12,r8 // We only need r12 until the call, so it doesn't have to be saved...
+LFB0:   
+        mr      r12,r8          /* We only need r12 until the call,
+                                so it doesn't have to be saved...  */
+LFB1:   
         /* Save the old stack pointer as AP.  */
         mr      r8,r1
-
+LCFI0:  
         /* Allocate the stack space we need.  */
         stwux   r1,r1,r4        
@@ -50 +51 @@
         mflr    r9
 
-        stw     r28,-16(r8)
+        stw     r28,-16(r8)     
         stw     r29,-12(r8)
         stw     r30, -8(r8)
         stw     r31, -4(r8)
-        
-        stw     r9,  8(r8)
+
+        stw     r9,  8(r8)      
         stw     r2, 20(r1)
+LCFI1:  
 
         /* Save arguments over call...  */
-        mr      r31,r5  /* flags, */
-        mr      r30,r6  /* rvalue, */
-        mr      r29,r7  /* function address, */
-        mr      r28,r8  /* our AP. */
-                
+        mr      r31,r5  /* flags,  */
+        mr      r30,r6  /* rvalue,  */
+        mr      r29,r7  /* function address,  */
+        mr      r28,r8  /* our AP.  */
+LCFI2:          
         /* Call ffi_prep_args.  */
         mr      r4,r1
@@ -146 +148 @@
         stfs    f1,0(r30)
         b       L(done_return_value)
-//END(_ffi_call_DARWIN)
+LFE1:   
+/* END(_ffi_call_DARWIN)  */
 
 /* Provide a null definition of _ffi_call_AIX.  */
@@ -156 +159 @@
 _ffi_call_AIX:
         blr
-//END(_ffi_call_AIX)
-
+/* END(_ffi_call_AIX)  */
+
+.data
+.section __TEXT,__eh_frame
+Lframe1:
+        .set    L$set$0,LECIE1-LSCIE1
+        .long   L$set$0 ; Length of Common Information Entry
+LSCIE1:
+        .long   0x0     ; CIE Identifier Tag
+        .byte   0x1     ; CIE Version
+        .ascii  "zR\0"  ; CIE Augmentation
+        .byte   0x1     ; uleb128 0x1; CIE Code Alignment Factor
+        .byte   0x7c    ; sleb128 -4; CIE Data Alignment Factor
+        .byte   0x41    ; CIE RA Column
+        .byte   0x1     ; uleb128 0x1; Augmentation size
+        .byte   0x10    ; FDE Encoding (pcrel)
+        .byte   0xc     ; DW_CFA_def_cfa
+        .byte   0x1     ; uleb128 0x1
+        .byte   0x0     ; uleb128 0x0
+        .align  2
+LECIE1:
+LSFDE1:
+        .set    L$set$1,LEFDE1-LASFDE1
+        .long   L$set$1 ; FDE Length
+LASFDE1:
+        .set    L$set$2,LASFDE1-Lframe1
+        .long   L$set$2 ; FDE CIE offset
+        .long   LFB0-.  ; FDE initial location
+        .set    L$set$3,LFE1-LFB0
+        .long   L$set$3 ; FDE address range
+        .byte   0x0     ; uleb128 0x0; Augmentation size
+        .byte   0x4     ; DW_CFA_advance_loc4
+        .set    L$set$4,LCFI0-LFB1
+        .long   L$set$4
+        .byte   0xd     ; DW_CFA_def_cfa_register
+        .byte   0x08    ; uleb128 0x08 
+        .byte   0x4     ; DW_CFA_advance_loc4
+        .set    L$set$5,LCFI1-LCFI0
+        .long   L$set$5
+        .byte   0x11    ; DW_CFA_offset_extended_sf
+        .byte   0x41    ; uleb128 0x41
+        .byte   0x7e    ; sleb128 -2
+        .byte   0x9f    ; DW_CFA_offset, column 0x1f 
+        .byte   0x1     ; uleb128 0x1 
+        .byte   0x9e    ; DW_CFA_offset, column 0x1e
+        .byte   0x2     ; uleb128 0x2
+        .byte   0x9d    ; DW_CFA_offset, column 0x1d 
+        .byte   0x3     ; uleb128 0x3 
+        .byte   0x9c    ; DW_CFA_offset, column 0x1c 
+        .byte   0x4     ; uleb128 0x4
+        .byte   0x4     ; DW_CFA_advance_loc4 
+        .set    L$set$6,LCFI2-LCFI1
+        .long   L$set$6
+        .byte   0xd     ; DW_CFA_def_cfa_register 
+        .byte   0x1c    ; uleb128 0x1c 
+        .align 2
+LEFDE1:
+        

branches/GNU/src/gcc/libffi/src/powerpc/darwin_closure.S

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   darwin_closures.S - Copyright (c) 2002 Free Software Foundation, Inc.
-   based on ppc_closures.S
+   darwin_closure.S - Copyright (c) 2002 2003 Free Software Foundation, 
+   Inc. based on ppc_closure.S
  
    PowerPC Assembly glue.
@@ -38 +38 @@
         .align 2
 _ffi_closure_ASM:
-        
-        mflr r0                 /* extract return address */
-        stw r0, 8(r1)           /* save the return address */
-        
-        /* 24 Bytes (Linkage Area) */
-        /* 32 Bytes (outgoing parameter area, always reserved) */
-        /* 104 Bytes (13*8 from FPR) */ 
-        /* 4 Bytes (result)
-        /* 164 Bytes */
-        
-        stwu r1,-164(r1)        /* skip over caller save area */
-        
-/* we want to build up an area for the parameters passed */
-/* in registers (both floating point and integer) */
-        
-        /* we store gpr 3 to gpr 10 (aligned to 4) */
-        /* in the parents outgoing area            */
-        stw   r3, 188(r1)
-        stw   r4, 192(r1)
-        stw   r5, 196(r1) 
-        stw   r6, 200(r1)
-        stw   r7, 204(r1)
-        stw   r8, 208(r1) 
-        stw   r9, 212(r1)
-        stw   r10, 216(r1)
+LFB1:           
+        mflr r0                 /* extract return address  */
+        stw r0, 8(r1)           /* save the return address  */
+LCFI0:  
+        /* 24 Bytes (Linkage Area)
+           32 Bytes (outgoing parameter area, always reserved)
+           104 Bytes (13*8 from FPR)    
+           8 Bytes (result)
+           168 Bytes  */
+        
+        stwu r1,-176(r1)        /* skip over caller save area
+                                keep stack aligned to 16  */
+LCFI1:          
+        /* we want to build up an area for the parameters passed
+        in registers (both floating point and integer)  */
+        
+        /* we store gpr 3 to gpr 10 (aligned to 4)
+        in the parents outgoing area  */
+        stw   r3, 200(r1)
+        stw   r4, 204(r1)
+        stw   r5, 208(r1) 
+        stw   r6, 212(r1)
+        stw   r7, 216(r1)
+        stw   r8, 220(r1) 
+        stw   r9, 224(r1)
+        stw   r10, 228(r1)
 
         /* we save fpr 1 to fpr 13 (aligned to 8) */
@@ -86 +87 @@
         addi r4,r1,160
         
-        /* now load up the pointer to the saved gpr registers */
-        addi r5,r1,188
+        /* now load up the pointer to the saved gpr registers  */
+        addi r5,r1,200
 
         /* now load up the pointer to the saved fpr registers */
         addi r6,r1,56
 
-        /* now load up the pointer to the outgoing parameter  */
-        /* stack in the previous frame */
-        addi r7,r1,220
+        /* now load up the pointer to the outgoing parameter
+        stack in the previous frame  */
+        addi r7,r1,232
         
         /* make the call */
@@ -112 +113 @@
         add r3,r3,r4            /* add contents of table to table address */
         mtctr r3
-        bctr                    /* jump to it */
+        bctr                    /* jump to it  */
+LFE1:
+        .align  2
 
 .L60:
@@ -181 +184 @@
 .L44:
         
-        addi r1,r1,164          /* restore stack pointer */
-        lwz r0,8(r1)            /* get return address */
-        mtlr r0                 /* reset link register */
+        addi r1,r1,176          /* restore stack pointer  */
+        lwz r0,8(r1)            /* get return address  */
+        mtlr r0                 /* reset link register  */
         blr
         
-/* END(ffi_closure_ASM) */
-
+/* END(ffi_closure_ASM)  */
+
+.data
+.section __TEXT,__eh_frame
+Lframe1:
+        .set    L$set$0,LECIE1-LSCIE1
+        .long   L$set$0 ; Length of Common Information Entry
+LSCIE1:
+        .long   0x0     ; CIE Identifier Tag
+        .byte   0x1     ; CIE Version
+        .ascii  "zR\0"  ; CIE Augmentation
+        .byte   0x1     ; uleb128 0x1; CIE Code Alignment Factor
+        .byte   0x7c    ; sleb128 -4; CIE Data Alignment Factor
+        .byte   0x41    ; CIE RA Column
+        .byte   0x1     ; uleb128 0x1; Augmentation size
+        .byte   0x10    ; FDE Encoding (pcrel)
+        .byte   0xc     ; DW_CFA_def_cfa
+        .byte   0x1     ; uleb128 0x1
+        .byte   0x0     ; uleb128 0x0
+        .align  2
+LECIE1:
+LSFDE1:
+        .set    L$set$1,LEFDE1-LASFDE1
+        .long   L$set$1 ; FDE Length
+
+LASFDE1:
+        .set    L$set$2,LASFDE1-Lframe1
+        .long   L$set$2 ; FDE CIE offset
+        .long   LFB1-.  ; FDE initial location
+        .set    L$set$3,LFE1-LFB1
+        .long   L$set$3 ; FDE address range
+        .byte   0x0     ; uleb128 0x0; Augmentation size
+        .byte   0x4     ; DW_CFA_advance_loc4
+        .set    L$set$3,LCFI1-LCFI0
+        .long   L$set$3
+        .byte   0xe     ; DW_CFA_def_cfa_offset
+        .byte   176,1   ; uleb128 176
+        .byte   0x4     ; DW_CFA_advance_loc4
+        .set    L$set$4,LCFI0-LFB1
+        .long   L$set$4
+        .byte   0x11    ; DW_CFA_offset_extended_sf
+        .byte   0x41    ; uleb128 0x41
+        .byte   0x7e    ; sleb128 -2
+        .align  2
+LEFDE1:
+

branches/GNU/src/gcc/libffi/src/powerpc/ffi.c

@@ -138 +138 @@
         {
         case FFI_TYPE_FLOAT:
+          double_tmp = *(float *)*p_argv;
+          if (fparg_count >= NUM_FPR_ARG_REGISTERS)
+            {
+              *(float *)next_arg = (float)double_tmp;
+              next_arg += 1;
+            }
+          else
+            *fpr_base++ = double_tmp;
+          fparg_count++;
+          FFI_ASSERT(flags & FLAG_FP_ARGUMENTS);
+          break;
+
         case FFI_TYPE_DOUBLE:
-          if ((*ptr)->type == FFI_TYPE_FLOAT)
-            double_tmp = *(float *)*p_argv;
-          else
-            double_tmp = *(double *)*p_argv;
+          double_tmp = *(double *)*p_argv;
 
           if (fparg_count >= NUM_FPR_ARG_REGISTERS)
@@ -321 +330 @@
         {
         case FFI_TYPE_FLOAT:
+          fparg_count++;
+          /* floating singles are not 8-aligned on stack */
+          break;
+
         case FFI_TYPE_DOUBLE:
           fparg_count++;
@@ -613 +626 @@
             /* unfortunately float values are stored as doubles
              * in the ffi_closure_SYSV code (since we don't check
-             * the type in that routine).  This is also true
-             * of floats passed on the outgoing parameter stack.
-             * Also, on the outgoing stack all values are aligned
-             * to 8
-             *
-             * Don't you just love the simplicity of this ABI!
+             * the type in that routine).
              */
 
@@ -624 +632 @@
 
           if (nf < 8) {
-             temp = *(double*)pfr;
+             temp = *(double*)pfr;
              *(float*)pfr = (float)temp;
-             avalue[i] = pfr;
+             avalue[i] = pfr;
              nf++;
              pfr+=2;
@@ -635 +643 @@
              * naughty thing to do but...
              */
-             if (((long)pst) & 4) pst++;
-             temp = *(double*)pst;
-             *(float*)pst = (float)temp;
              avalue[i] = pst;
              nf++;
-             pst+=2;
+             pst+=1;
           }
           break;

branches/GNU/src/gcc/libffi/src/powerpc/ffi_darwin.c

@@ -6 +6 @@
    Darwin ABI support (c) 2001 John Hornkvist
    AIX ABI support (c) 2002 Free Software Foundation, Inc.
-
-   $Id: ffi_darwin.c,v 1.3.2.1 2002/03/12 22:35:56 tromey Exp $
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -413 +411 @@
                   | saved TOC pointer 4                   | 
                   +---------------------------------------+ 24
-                  | always reserved 8*4=32  (revious GPRs)| 
+                  | always reserved 8*4=32 (previous GPRs)| 
                   | according to the linkage convention   |
-                  | from AIX                              |
+                  | from AIX                              |
                   +---------------------------------------+ 56
-                  | our FPR area 13*8=104                 |
-                  | f1                                    |
-                  | .                                     |
-                  | f13                                   | 
+                  | our FPR area 13*8=104                 |
+                  | f1                                    |
+                  | .                                     |
+                  | f13                                   | 
                   +---------------------------------------+ 160
-                  | result area 4                         | 
-SP current -->    +---------------------------------------+ 164 <- parent frame
+                  | result area 8                         |
+                  +---------------------------------------+ 168
+                  | alignement to the next multiple of 16 |
+SP current -->    +---------------------------------------+ 176 <- parent frame
                   | back chain to caller 4                | 
-                  +---------------------------------------+ 168
+                  +---------------------------------------+ 180
                   | saved CR 4                            | 
-                  +---------------------------------------+ 172
+                  +---------------------------------------+ 184
                   | saved LR 4                            | 
-                  +---------------------------------------+ 176
+                  +---------------------------------------+ 188
                   | reserved for compilers 4              | 
-                  +---------------------------------------+ 180
+                  +---------------------------------------+ 192
                   | reserved for binders 4                | 
-                  +---------------------------------------+ 184
+                  +---------------------------------------+ 196
                   | saved TOC pointer 4                   | 
-                  +---------------------------------------+ 188
+                  +---------------------------------------+ 200
                   | always reserved 8*4=32  we store our  |
-                  | GPRs here                             |
-                  | r3                                    |
-                  | .                                     |
-                  | r10                                   |
-                  +---------------------------------------+ 220
-                  | PST area, overflow part               | 
+                  | GPRs here                             |
+                  | r3                                    |
+                  | .                                     |
+                  | r10                                   |
+                  +---------------------------------------+ 232
+                  | PST area, overflow part               | 
                   +---------------------------------------+ xxx
-                  | ????                                  | 
+                  | ????                                  | 
                   +---------------------------------------+ xxx
 
@@ -456 +456 @@
   unsigned int *tramp;
   struct ffi_aix_trampoline_struct *tramp_aix;
+  aix_fd *fd;
  
   switch (cif->abi)
@@ -487 +488 @@
 
       tramp_aix = (struct ffi_aix_trampoline_struct *) (closure->tramp);
-      aix_fd *fd = (aix_fd *)(void *)ffi_closure_ASM;
+      fd = (aix_fd *)(void *)ffi_closure_ASM;
 
       FFI_ASSERT (cif->abi == FFI_AIX);

branches/GNU/src/gcc/libffi/src/prep_cif.c

@@ -104 +104 @@
   FFI_ASSERT(ffi_type_test(cif->rtype));
 
-#ifndef M68K
+  /* x86-64 and s390 stack space allocation is handled in prep_machdep.  */
+#if !defined M68K && !defined __x86_64__ && !defined S390
   /* Make space for the return structure pointer */
   if (cif->rtype->type == FFI_TYPE_STRUCT
@@ -123 +124 @@
         return FFI_BAD_TYPEDEF;
 
+#if !defined __x86_64__ && !defined S390
 #ifdef SPARC
       if (((*ptr)->type == FFI_TYPE_STRUCT
@@ -138 +140 @@
           bytes += STACK_ARG_SIZE((*ptr)->size);
         }
+#endif
     }
 

branches/GNU/src/gcc/libffi/src/sparc/ffi.c

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   ffi.c - Copyright (c) 1996 Cygnus Solutions
+   ffi.c - Copyright (c) 1996, 2003 Cygnus Solutions
    
    Sparc Foreign Function Interface 
@@ -29 +29 @@
 #include <stdlib.h>
 
+#ifdef SPARC64
+extern void ffi_closure_v9(void);
+#else
+extern void ffi_closure_v8(void);
+#endif
+
 /* ffi_prep_args is called by the assembly routine once stack space
    has been allocated for the function's arguments */
@@ -35 +41 @@
 {
   int i;
-  int tmp;
-  int avn;
   void **p_argv;
   char *argp;
   ffi_type **p_arg;
-
-  tmp = 0;
 
   /* Skip 16 words for the window save area */
@@ -67 +69 @@
 #endif
 
-  avn = ecif->cif->nargs;
   p_argv = ecif->avalue;
 
-  for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
-       i && avn;
-       i--, p_arg++)
+  for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; i; i--, p_arg++)
     {
       size_t z;
 
-      if (avn) 
-        {
-          avn--;
           if ((*p_arg)->type == FFI_TYPE_STRUCT
 #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
@@ -123 +119 @@
           p_argv++;
           argp += z;
-        }
     }
   
@@ -421 +416 @@
 
 }
+
+ffi_status
+ffi_prep_closure (ffi_closure* closure,
+                  ffi_cif* cif,
+                  void (*fun)(ffi_cif*, void*, void**, void*),
+                  void *user_data)
+{
+  unsigned int *tramp = (unsigned int *) &closure->tramp[0];
+  unsigned long fn;
+  unsigned long ctx = (unsigned long) closure;
+
+#ifdef SPARC64
+  /* Trampoline address is equal to the closure address.  We take advantage
+     of that to reduce the trampoline size by 8 bytes. */
+  FFI_ASSERT (cif->abi == FFI_V9);
+  fn = (unsigned long) ffi_closure_v9;
+  tramp[0] = 0x83414000;        /* rd   %pc, %g1        */
+  tramp[1] = 0xca586010;        /* ldx  [%g1+16], %g5   */
+  tramp[2] = 0x81c14000;        /* jmp  %g5             */
+  tramp[3] = 0x01000000;        /* nop                  */
+  *((unsigned long *) &tramp[4]) = fn;
+#else
+  FFI_ASSERT (cif->abi == FFI_V8);
+  fn = (unsigned long) ffi_closure_v8;
+  tramp[0] = 0x03000000 | fn >> 10;     /* sethi %hi(fn), %g1   */
+  tramp[1] = 0x05000000 | ctx >> 10;    /* sethi %hi(ctx), %g2  */
+  tramp[2] = 0x81c06000 | (fn & 0x3ff); /* jmp   %g1+%lo(fn)    */
+  tramp[3] = 0x8410a000 | (ctx & 0x3ff);/* or    %g2, %lo(ctx)  */
+#endif
+
+  closure->cif = cif;
+  closure->fun = fun;
+  closure->user_data = user_data;
+
+  /* Flush the Icache.  FIXME: alignment isn't certain, assume 8 bytes */
+#ifdef SPARC64
+  asm volatile ("flush  %0" : : "r" (closure) : "memory");
+  asm volatile ("flush  %0" : : "r" (((char *) closure) + 8) : "memory");
+#else
+  asm volatile ("iflush %0" : : "r" (closure) : "memory");
+  asm volatile ("iflush %0" : : "r" (((char *) closure) + 8) : "memory");
+#endif
+
+  return FFI_OK;
+}
+
+int
+ffi_closure_sparc_inner(ffi_closure *closure,
+  void *rvalue, unsigned long *gpr, double *fpr)
+{
+  ffi_cif *cif;
+  void **avalue;
+  ffi_type **arg_types;
+  int i, avn, argn;
+
+  cif = closure->cif;
+  avalue = alloca(cif->nargs * sizeof(void *));
+
+  argn = 0;
+
+  /* Copy the caller's structure return address to that the closure
+     returns the data directly to the caller.  */
+  if (cif->flags == FFI_TYPE_STRUCT)
+    {
+      rvalue = (void *) gpr[0];
+      argn = 1;
+    }
+
+  i = 0;
+  avn = cif->nargs;
+  arg_types = cif->arg_types;
+  
+  /* Grab the addresses of the arguments from the stack frame.  */
+  while (i < avn)
+    {
+      /* Assume big-endian.  FIXME */
+      argn += ALIGN(arg_types[i]->size, SIZEOF_ARG) / SIZEOF_ARG;
+
+#ifdef SPARC64
+      if (i < 6 && (arg_types[i]->type == FFI_TYPE_FLOAT
+                 || arg_types[i]->type == FFI_TYPE_DOUBLE
+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
+                 || arg_types[i]->type == FFI_TYPE_LONGDOUBLE
+#endif
+                ))
+        avalue[i] = ((char *) &fpr[argn]) - arg_types[i]->size;
+      else
+#endif
+        avalue[i] = ((char *) &gpr[argn]) - arg_types[i]->size;
+      i++;
+    }
+
+  /* Invoke the closure.  */
+  (closure->fun) (cif, rvalue, avalue, closure->user_data);
+
+  /* Tell ffi_closure_sparc how to perform return type promotions.  */
+  return cif->rtype->type;
+}

branches/GNU/src/gcc/libffi/src/sparc/v8.S

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   v8.S - Copyright (c) 1996, 1997 Cygnus Solutions
+   v8.S - Copyright (c) 1996, 1997, 2003 Cygnus Solutions
    
    Sparc Foreign Function Interface 
@@ -94 +94 @@
 .ffi_call_V8_end:
         .size   ffi_call_V8,.ffi_call_V8_end-ffi_call_V8
+
+
+#define STACKFRAME      104     /* 16*4 register window +
+                                   1*4 struct return +  
+                                   6*4 args backing store +
+                                   3*4 locals */
+
+/* ffi_closure_v8(...)
+
+   Receives the closure argument in %g2.   */
+
+        .text
+        .align 8
+        .globl ffi_closure_v8
+
+ffi_closure_v8:
+#ifdef HAVE_AS_REGISTER_PSEUDO_OP
+                .register       %g2, #scratch
+#endif
+.LLFB2:
+        save    %sp, -STACKFRAME, %sp
+.LLCFI1:
+
+        ! Store all of the potential argument registers in va_list format.
+        st      %i0, [%fp+68+0]
+        st      %i1, [%fp+68+4]
+        st      %i2, [%fp+68+8]
+        st      %i3, [%fp+68+12]
+        st      %i4, [%fp+68+16]
+        st      %i5, [%fp+68+20]
+
+        ! Call ffi_closure_sparc_inner to do the bulk of the work.
+        mov     %g2, %o0
+        add     %fp, -8, %o1
+        add     %fp,  68, %o2
+        call    ffi_closure_sparc_inner
+         mov    0, %o3
+
+        ! Load up the return value in the proper type.
+        cmp     %o0, FFI_TYPE_VOID
+        be      done1
+
+        cmp     %o0, FFI_TYPE_FLOAT
+        be,a    done1
+         ld     [%fp-8], %f0
+
+        cmp     %o0, FFI_TYPE_DOUBLE
+        be,a    done1
+         ldd    [%fp-8], %f0
+
+        cmp     %o0, FFI_TYPE_SINT64
+        be,a    integer
+         ld     [%fp-4], %i1
+
+        cmp     %o0, FFI_TYPE_UINT64
+        be,a    integer
+         ld     [%fp-4], %i1
+
+integer:
+        ld      [%fp-8], %i0
+
+done1:
+        ret
+         restore
+.LLFE2:
+
+.ffi_closure_v8_end:
+        .size   ffi_closure_v8,.ffi_closure_v8_end-ffi_closure_v8
 
 #ifdef SPARC64
@@ -149 +217 @@
         .align  WS
 .LLEFDE1:
+.LLSFDE2:
+        .uaword .LLEFDE2-.LLASFDE2      ! FDE Length
+.LLASFDE2:
+        .uaword .LLASFDE2-.LLframe1     ! FDE CIE offset
+#ifdef HAVE_AS_SPARC_UA_PCREL
+        .uaword %r_disp32(.LLFB2)
+        .uaword .LLFE2-.LLFB2   ! FDE address range
+#else
+        .align  WS
+        .nword  .LLFB2
+        .uanword .LLFE2-.LLFB2  ! FDE address range
+#endif
+        .byte   0x0     ! uleb128 0x0; Augmentation size
+        .byte   0x4     ! DW_CFA_advance_loc4
+        .uaword .LLCFI1-.LLFB2
+        .byte   0xd     ! DW_CFA_def_cfa_register
+        .byte   0x1e    ! uleb128 0x1e
+        .byte   0x2d    ! DW_CFA_GNU_window_save
+        .byte   0x9     ! DW_CFA_register
+        .byte   0xf     ! uleb128 0xf
+        .byte   0x1f    ! uleb128 0x1f
+        .align  WS
+.LLEFDE2:

branches/GNU/src/gcc/libffi/src/sparc/v9.S

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   v9.S - Copyright (c) 2000 Cygnus Solutions
+   v9.S - Copyright (c) 2000, 2003 Cygnus Solutions
    
    Sparc 64bit Foreign Function Interface 
@@ -100 +100 @@
         be,pn   %icc, dostruct
 
-         cmp    %i3, FFI_TYPE_LONGDOUBLE
+        cmp     %i3, FFI_TYPE_LONGDOUBLE
         bne,pt  %icc, done
          nop
@@ -125 +125 @@
 .ffi_call_V9_end:
         .size   ffi_call_V9,.ffi_call_V9_end-ffi_call_V9
+
+
+#define STACKFRAME       240    /* 16*8 register window +
+                                   6*8 args backing store +
+                                   8*8 locals */
+#define FP              %fp+STACK_BIAS
+
+/* ffi_closure_v9(...)
+
+   Receives the closure argument in %g1.   */
+
+        .text
+        .align 8
+        .globl ffi_closure_v9
+
+ffi_closure_v9:
+.LLFB2:
+        save    %sp, -STACKFRAME, %sp
+.LLCFI1:
+
+        ! Store all of the potential argument registers in va_list format.
+        stx     %i0, [FP+128+0]
+        stx     %i1, [FP+128+8]
+        stx     %i2, [FP+128+16]
+        stx     %i3, [FP+128+24]
+        stx     %i4, [FP+128+32]
+        stx     %i5, [FP+128+40]
+
+        ! Store possible floating point argument registers too.
+        std     %f0, [FP-48]
+        std     %f2, [FP-40]
+        std     %f4, [FP-32]
+        std     %f6, [FP-24]
+        std     %f8, [FP-16]
+        std     %f10, [FP-8]
+
+        ! Call ffi_closure_sparc_inner to do the bulk of the work.
+        mov     %g1, %o0
+        add     %fp, STACK_BIAS-64, %o1
+        add     %fp, STACK_BIAS+128, %o2
+        call    ffi_closure_sparc_inner
+         add    %fp, STACK_BIAS-48, %o3
+
+        ! Load up the return value in the proper type.
+        cmp     %o0, FFI_TYPE_VOID
+        be,pn   %icc, done1
+
+        cmp     %o0, FFI_TYPE_FLOAT
+        be,a,pn %icc, done1
+         ld     [FP-64], %f0
+
+        cmp     %o0, FFI_TYPE_DOUBLE
+        be,a,pn %icc, done1
+         ldd    [FP-64], %f0
+
+        cmp     %o0, FFI_TYPE_LONGDOUBLE
+        be,a,pn %icc, longdouble1
+         ldd    [FP-64], %f0
+
+        cmp     %o0, FFI_TYPE_STRUCT
+        be,pn   %icc, struct1
+
+        ! FFI_TYPE_UINT64 | FFI_TYPE_SINT64 | FFI_TYPE_POINTER
+        ldx     [FP-64], %i0
+
+done1:
+        ret
+         restore
+
+struct1:
+        ldx [FP-56], %i2
+        ret
+         restore
+
+longdouble1:
+        ldd     [FP-56], %f2
+        ret
+         restore
+.LLFE2:
+
+.ffi_closure_v9_end:
+        .size   ffi_closure_v9,.ffi_closure_v9_end-ffi_closure_v9
 
         .section        ".eh_frame",#alloc,#write
@@ -170 +252 @@
         .align 8
 .LLEFDE1:
-
-#endif
+.LLSFDE2:
+        .uaword .LLEFDE2-.LLASFDE2      ! FDE Length
+.LLASFDE2:
+        .uaword .LLASFDE2-.LLframe1     ! FDE CIE offset
+#ifdef HAVE_AS_SPARC_UA_PCREL
+        .uaword %r_disp32(.LLFB2)
+        .uaword .LLFE2-.LLFB2           ! FDE address range
+#else
+        .align 8
+        .xword  .LLFB2
+        .uaxword        .LLFE2-.LLFB2   ! FDE address range
+#endif
+        .byte   0x0     ! uleb128 0x0; Augmentation size
+        .byte   0x4     ! DW_CFA_advance_loc4
+        .uaword .LLCFI1-.LLFB2
+        .byte   0xd     ! DW_CFA_def_cfa_register
+        .byte   0x1e    ! uleb128 0x1e
+        .byte   0x2d    ! DW_CFA_GNU_window_save
+        .byte   0x9     ! DW_CFA_register
+        .byte   0xf     ! uleb128 0xf
+        .byte   0x1f    ! uleb128 0x1f
+        .align 8
+.LLEFDE2:
+#endif

branches/GNU/src/gcc/libffi/src/types.c

@@ -43 +43 @@
 FFI_INTEGRAL_TYPEDEF(float, 4, 4, FFI_TYPE_FLOAT);
 
-#if defined ALPHA || defined SPARC64
+#if defined ALPHA || defined SPARC64 || defined X86_64 || defined S390X \
+    || defined IA64
 
 FFI_INTEGRAL_TYPEDEF(pointer, 8, 8, FFI_TYPE_POINTER);
@@ -53 +54 @@
 #endif
 
-#ifdef X86
+#if defined X86 || defined X86_WIN32 || defined ARM || defined M68K
 
 FFI_INTEGRAL_TYPEDEF(uint64, 8, 4, FFI_TYPE_UINT64);
 FFI_INTEGRAL_TYPEDEF(sint64, 8, 4, FFI_TYPE_SINT64);
 
-#elif defined X86_WIN32
-
-FFI_INTEGRAL_TYPEDEF(uint64, 8, 4, FFI_TYPE_UINT64);
-FFI_INTEGRAL_TYPEDEF(sint64, 8, 4, FFI_TYPE_SINT64);
-
-#elif defined ARM
-
-FFI_INTEGRAL_TYPEDEF(uint64, 8, 4, FFI_TYPE_UINT64);
-FFI_INTEGRAL_TYPEDEF(sint64, 8, 4, FFI_TYPE_SINT64);
-
-#elif defined M68K
+#elif defined SH
 
 FFI_INTEGRAL_TYPEDEF(uint64, 8, 4, FFI_TYPE_UINT64);
@@ -81 +72 @@
 
 
-#ifdef X86
-
-FFI_INTEGRAL_TYPEDEF(double, 8, 4, FFI_TYPE_DOUBLE);
-FFI_INTEGRAL_TYPEDEF(longdouble, 12, 4, FFI_TYPE_LONGDOUBLE);
-
-#elif defined X86_WIN32
+#if defined X86 || defined X86_WIN32 || defined M68K
 
 FFI_INTEGRAL_TYPEDEF(double, 8, 4, FFI_TYPE_DOUBLE);
@@ -96 +82 @@
 FFI_INTEGRAL_TYPEDEF(longdouble, 8, 4, FFI_TYPE_LONGDOUBLE);
 
-#elif defined M68K
+#elif defined SH
 
 FFI_INTEGRAL_TYPEDEF(double, 8, 4, FFI_TYPE_DOUBLE);
-FFI_INTEGRAL_TYPEDEF(longdouble, 12, 4, FFI_TYPE_LONGDOUBLE);
+FFI_INTEGRAL_TYPEDEF(longdouble, 8, 4, FFI_TYPE_LONGDOUBLE);
 
 #elif defined SPARC
 
 FFI_INTEGRAL_TYPEDEF(double, 8, 8, FFI_TYPE_DOUBLE);
+#ifdef SPARC64
+FFI_INTEGRAL_TYPEDEF(longdouble, 16, 16, FFI_TYPE_LONGDOUBLE);
+#else
+FFI_INTEGRAL_TYPEDEF(longdouble, 16, 8, FFI_TYPE_LONGDOUBLE);
+#endif
 
-#ifdef SPARC64
+#elif defined X86_64
 
+FFI_INTEGRAL_TYPEDEF(double, 8, 8, FFI_TYPE_DOUBLE);
 FFI_INTEGRAL_TYPEDEF(longdouble, 16, 16, FFI_TYPE_LONGDOUBLE);
-
-#else
-
-FFI_INTEGRAL_TYPEDEF(longdouble, 16, 8, FFI_TYPE_LONGDOUBLE);
-
-#endif
 
 #else

branches/GNU/src/gcc/libffi/src/x86/ffi.c

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   ffi.c - Copyright (c) 1996, 1998, 1999  Cygnus Solutions
+   ffi.c - Copyright (c) 1996, 1998, 1999, 2001  Red Hat, Inc.
+           Copyright (c) 2002  Ranjit Mathew
+           Copyright (c) 2002  Bo Thorsen
+           Copyright (c) 2002  Roger Sayle
    
    x86 Foreign Function Interface 
@@ -24 +27 @@
    ----------------------------------------------------------------------- */
 
+#ifndef __x86_64__
+
 #include <ffi.h>
 #include <ffi_common.h>
@@ -37 +42 @@
 {
   register unsigned int i;
-  register int tmp;
   register void **p_argv;
   register char *argp;
   register ffi_type **p_arg;
 
-  tmp = 0;
   argp = stack;
 
@@ -149 +152 @@
 /*@=exportheader@*/
 
+#ifdef X86_WIN32
+/*@-declundef@*/
+/*@-exportheader@*/
+extern void ffi_call_STDCALL(void (*)(char *, extended_cif *),
+                          /*@out@*/ extended_cif *,
+                          unsigned, unsigned,
+                          /*@out@*/ unsigned *,
+                          void (*fn)());
+/*@=declundef@*/
+/*@=exportheader@*/
+#endif /* X86_WIN32 */
+
 void ffi_call(/*@dependent@*/ ffi_cif *cif, 
               void (*fn)(), 
@@ -181 +196 @@
       /*@=usedef@*/
       break;
+#ifdef X86_WIN32
+    case FFI_STDCALL:
+      /*@-usedef@*/
+      ffi_call_STDCALL(ffi_prep_args, &ecif, cif->bytes,
+                    cif->flags, ecif.rvalue, fn);
+      /*@=usedef@*/
+      break;
+#endif /* X86_WIN32 */
     default:
       FFI_ASSERT(0);
@@ -192 +215 @@
 static void ffi_prep_incoming_args_SYSV (char *stack, void **ret,
                                          void** args, ffi_cif* cif);
-static void ffi_closure_SYSV ();
-static void ffi_closure_raw_SYSV ();
-
-/* This function is jumped to by the trampoline, on entry, %ecx (a
- * caller-save register) holds the address of the closure.  
- * Clearly, this requires __GNUC__, so perhaps we should translate this
- * into an assembly file if this is to be distributed with ffi.
- */
+static void ffi_closure_SYSV (ffi_closure *)
+     __attribute__ ((regparm(1)));
+static void ffi_closure_raw_SYSV (ffi_raw_closure *)
+     __attribute__ ((regparm(1)));
+
+/* This function is jumped to by the trampoline */
 
 static void
-ffi_closure_SYSV ()
+ffi_closure_SYSV (closure)
+     ffi_closure *closure;
 {
   // this is our return value storage
@@ -208 +230 @@
 
   // our various things...
-  void          *args;
   ffi_cif       *cif;
   void         **arg_area;
-  ffi_closure   *closure;
   unsigned short rtype;
   void          *resp = (void*)&res;
-
-  /* grab the trampoline context pointer */
-  asm ("movl %%ecx,%0" : "=r" (closure));
-  
+  void *args = __builtin_dwarf_cfa ();
+
   cif         = closure->cif;
   arg_area    = (void**) alloca (cif->nargs * sizeof (void*));  
-  asm ("leal 8(%%ebp),%0" : "=q" (args));  
 
   /* this call will initialize ARG_AREA, such that each
@@ -267 +284 @@
 {
   register unsigned int i;
-  register int tmp;
   register void **p_argv;
   register char *argp;
   register ffi_type **p_arg;
 
-  tmp = 0;
   argp = stack;
 
@@ -282 +297 @@
   p_argv = avalue;
 
-  for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++)
+  for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++)
     {
       size_t z;
 
       /* Align if necessary */
-      if (((*p_arg)->alignment - 1) & (unsigned) argp)
+      if (((*p_arg)->alignment - 1) & (unsigned) argp) {
         argp = (char *) ALIGN(argp, (*p_arg)->alignment);
+      }
 
       z = (*p_arg)->size;
@@ -299 +315 @@
       argp += z;
     }
-
+  
   return;
 }
@@ -309 +325 @@
    unsigned int  __fun = (unsigned int)(FUN); \
    unsigned int  __ctx = (unsigned int)(CTX); \
-   unsigned int  __dis = __fun - ((unsigned int) __tramp + 10); \
-   *(unsigned char*) &__tramp[0] = 0xb9; \
-   *(unsigned int*)  &__tramp[1] = __ctx; \
-   *(unsigned char*) &__tramp[5] = 0xe9; \
-   *(unsigned int*)  &__tramp[6] = __dis; \
+   unsigned int  __dis = __fun - ((unsigned int) __tramp + FFI_TRAMPOLINE_SIZE); \
+   *(unsigned char*) &__tramp[0] = 0xb8; \
+   *(unsigned int*)  &__tramp[1] = __ctx; /* movl __ctx, %eax */ \
+   *(unsigned char *)  &__tramp[5] = 0xe9; \
+   *(unsigned int*)  &__tramp[6] = __dis; /* jmp __fun  */ \
  })
 
@@ -343 +359 @@
 
 static void
-ffi_closure_raw_SYSV ()
+ffi_closure_raw_SYSV (closure)
+     ffi_raw_closure *closure;
 {
   // this is our return value storage
@@ -349 +366 @@
 
   // our various things...
-  void            *args;
   ffi_raw         *raw_args;
   ffi_cif         *cif;
-  ffi_raw_closure *closure;
   unsigned short   rtype;
   void            *resp = (void*)&res;
 
-  /* grab the trampoline context pointer */
-  asm ("movl %%ecx,%0" : "=r" (closure));
-
-  /* take the argument pointer */
-  asm ("leal 8(%%ebp),%0" : "=q" (args));  
-
   /* get the cif */
   cif = closure->cif;
 
   /* the SYSV/X86 abi matches the RAW API exactly, well.. almost */
-  raw_args = (ffi_raw*) args;
+  raw_args = (ffi_raw*) __builtin_dwarf_cfa ();
 
   (closure->fun) (cif, resp, raw_args, closure->user_data);
@@ -450 +459 @@
               void (*fn)());
 
+#ifdef X86_WIN32
+extern void
+ffi_call_STDCALL(void (*)(char *, extended_cif *),
+              /*@out@*/ extended_cif *,
+              unsigned, unsigned,
+              /*@out@*/ unsigned *,
+              void (*fn)());
+#endif /* X86_WIN32 */
+
 void
 ffi_raw_call(/*@dependent@*/ ffi_cif *cif, 
@@ -484 +502 @@
       /*@=usedef@*/
       break;
+#ifdef X86_WIN32
+    case FFI_STDCALL:
+      /*@-usedef@*/
+      ffi_call_STDCALL(ffi_prep_args_raw, &ecif, cif->bytes,
+                    cif->flags, ecif.rvalue, fn);
+      /*@=usedef@*/
+      break;
+#endif /* X86_WIN32 */
     default:
       FFI_ASSERT(0);
@@ -491 +517 @@
 
 #endif
+
+#endif /* __x86_64__  */

branches/GNU/src/gcc/libffi/src/x86/sysv.S

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   sysv.S - Copyright (c) 1996, 1998, 2001  Cygnus Solutions
+   sysv.S - Copyright (c) 1996, 1998, 2001, 2002  Cygnus Solutions
    
    X86 Foreign Function Interface 
@@ -23 +23 @@
    OTHER DEALINGS IN THE SOFTWARE.
    ----------------------------------------------------------------------- */
+
+#ifndef __x86_64__
 
 #define LIBFFI_ASM      
@@ -164 +166 @@
 .LEFDE1:
         .set    .LLFDE1,.LEFDE1-.LSFDE1
+
+#endif /* ifndef __x86_64__ */

branches/GNU/src/gcc/libffi/src/x86/win32.S

@@ -1 +1 @@
 /* -----------------------------------------------------------------------
-   win32.S - Copyright (c) 1996, 1998, 2001  Cygnus Solutions
+   win32.S - Copyright (c) 1996, 1998, 2001, 2002  Red Hat, Inc.
+             Copyright (c) 2001  John Beniton
+             Copyright (c) 2002  Ranjit Mathew
+                        
  
    X86 Foreign Function Interface
@@ -53 +56 @@
         addl  $8,%esp
  
-        call  *28(%ebp)
+        # FIXME: Align the stack to a 128-bit boundary to avoid
+        # potential performance hits.
+
+        call  *28(%ebp)
  
         # Remove the space we pushed for the args
@@ -124 +130 @@
  
 .ffi_call_SYSV_end:
+
+        # This assumes we are using gas.
+        .balign 16
+.globl _ffi_call_STDCALL
+
+_ffi_call_STDCALL:
+        pushl %ebp
+        movl  %esp,%ebp
+
+        # Make room for all of the new args.
+        movl  16(%ebp),%ecx 
+        subl  %ecx,%esp
+
+        movl  %esp,%eax
+
+        # Place all of the ffi_prep_args in position
+        pushl 12(%ebp)
+        pushl %eax
+        call  *8(%ebp)
+
+        # Return stack to previous state and call the function
+        addl  $8,%esp
+
+        # FIXME: Align the stack to a 128-bit boundary to avoid
+        # potential performance hits.
+
+        call  *28(%ebp)
+
+        # stdcall functions pop arguments off the stack themselves
+
+        # Load %ecx with the return type code
+        movl  20(%ebp),%ecx
+
+        # If the return value pointer is NULL, assume no return value.
+        cmpl  $0,24(%ebp)
+        jne   sc_retint
+
+        # Even if there is no space for the return value, we are
+        # obliged to handle floating-point values.
+        cmpl  $FFI_TYPE_FLOAT,%ecx
+        jne   sc_noretval
+        fstp  %st(0)
+
+        jmp   sc_epilogue
+
+sc_retint:
+        cmpl  $FFI_TYPE_INT,%ecx
+        jne   sc_retfloat
+        # Load %ecx with the pointer to storage for the return value
+        movl  24(%ebp),%ecx
+        movl  %eax,0(%ecx)
+        jmp   sc_epilogue
+
+sc_retfloat:
+        cmpl  $FFI_TYPE_FLOAT,%ecx
+        jne   sc_retdouble
+         # Load %ecx with the pointer to storage for the return value
+        movl  24(%ebp),%ecx
+        fstps (%ecx)
+        jmp   sc_epilogue
+
+sc_retdouble:
+        cmpl  $FFI_TYPE_DOUBLE,%ecx
+        jne   sc_retlongdouble
+        # Load %ecx with the pointer to storage for the return value
+        movl  24(%ebp),%ecx
+        fstpl (%ecx)
+        jmp   sc_epilogue
+
+sc_retlongdouble:
+        cmpl  $FFI_TYPE_LONGDOUBLE,%ecx
+        jne   sc_retint64
+        # Load %ecx with the pointer to storage for the return value
+        movl  24(%ebp),%ecx
+        fstpt (%ecx)
+        jmp   sc_epilogue
+
+sc_retint64:
+        cmpl  $FFI_TYPE_SINT64,%ecx
+        jne   sc_retstruct
+        # Load %ecx with the pointer to storage for the return value
+        movl  24(%ebp),%ecx
+        movl  %eax,0(%ecx)
+        movl  %edx,4(%ecx)
+
+sc_retstruct:
+        # Nothing to do!
+
+sc_noretval:
+sc_epilogue:
+        movl %ebp,%esp
+        popl %ebp
+        ret
+
+.ffi_call_STDCALL_end:

@@ -26 +26 @@
 configure.vr
 configure.vrs
+dir.info
 Makefile
-dir.info
 lost+found
 update.out