diff -ruN --exclude=CVS gcc-3.2.2.orig/libffi/Makefile.am gcc/libffi/Makefile.am

--- gcc-3.2.2.orig/libffi/Makefile.am	Tue Jan 28 10:43:56 2003

+++ gcc/libffi/Makefile.am	Tue Jan 28 10:48:33 2003

@@ -8,14 +8,17 @@

 		src/mips/n32.s src/mips/o32.S src/mips/o32.s \

 		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 \

 		src/powerpc/ffi.c src/powerpc/sysv.S \

 		src/powerpc/ppc_closure.S src/powerpc/asm.h \

 		src/powerpc/ffi_darwin.c \

 		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/powerpc/darwin_closure.S src/powerpc/aix_closure.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@

@@ -83,6 +86,7 @@

 ffitest_LDFLAGS = -shared-libgcc

 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

 TARGET_SRC_X86_WIN32 = src/x86/ffi.c src/x86/win32.S

@@ -91,9 +95,12 @@

 TARGET_SRC_IA64 = src/ia64/ffi.c src/ia64/unix.S

 TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S

 TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S

-TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closures.S

+TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S

 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@)

 ## Work around automake deficiency

@@ -103,6 +110,10 @@

 libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)

 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)

 libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_SGI)

@@ -147,6 +158,18 @@

 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

 AM_CFLAGS = -fexceptions

diff -ruN --exclude=CVS gcc-3.2.2.orig/libffi/Makefile.in gcc/libffi/Makefile.in

--- gcc-3.2.2.orig/libffi/Makefile.in	Wed Jan 29 07:59:05 2003

+++ gcc/libffi/Makefile.in	Wed Jan 29 07:58:58 2003

@@ -91,14 +91,17 @@

 		src/mips/n32.s src/mips/o32.S src/mips/o32.s \

 		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 \

 		src/powerpc/ffi.c src/powerpc/sysv.S \

 		src/powerpc/ppc_closure.S src/powerpc/asm.h \

 		src/powerpc/ffi_darwin.c \

 		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/powerpc/darwin_closure.S src/powerpc/aix_closure.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@

@@ -162,6 +165,7 @@

 ffitest_LDFLAGS = -shared-libgcc

 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

 TARGET_SRC_X86_WIN32 = src/x86/ffi.c src/x86/win32.S

@@ -170,14 +174,18 @@

 TARGET_SRC_IA64 = src/ia64/ffi.c src/ia64/unix.S

 TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S

 TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S

-TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closures.S

+TARGET_SRC_POWERPC_AIX = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S

 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 \

 		src/raw_api.c src/java_raw_api.c

 @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)

 @X86_WIN32_TRUE@libffi_la_SOURCES = @X86_WIN32_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)

@@ -189,7 +197,11 @@

 @POWERPC_AIX_TRUE@libffi_la_SOURCES = @POWERPC_AIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)

 @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)

 @X86_WIN32_TRUE@libffi_convenience_la_SOURCES = @X86_WIN32_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)

@@ -201,6 +213,9 @@

 @POWERPC_AIX_TRUE@libffi_convenience_la_SOURCES = @POWERPC_AIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)

 @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

@@ -208,7 +223,7 @@

 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 = 

 LTLIBRARIES =  $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)

@@ -220,10 +235,6 @@

 LIBS = @LIBS@

 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 \

 @ALPHA_TRUE@src/java_raw_api.lo src/alpha/ffi.lo src/alpha/osf.lo

@@ -234,12 +245,29 @@

 @MIPS_GCC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \

 @MIPS_GCC_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \

 @MIPS_GCC_TRUE@src/mips/n32.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

+@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

+@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 \

 @SPARC_TRUE@src/java_raw_api.lo src/sparc/ffi.lo src/sparc/v8.lo \

@@ -247,62 +275,75 @@

 @POWERPC_AIX_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \

 @POWERPC_AIX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \

 @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

+@POWERPC_AIX_TRUE@src/powerpc/aix.lo src/powerpc/aix_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

 @POWERPC_DARWIN_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \

 @POWERPC_DARWIN_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \

 @POWERPC_DARWIN_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \

 @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

+@SH_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \

+@SH_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \

+@SH_TRUE@src/sh/sysv.lo src/sh/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 \

 @SPARC_TRUE@src/sparc/ffi.lo src/sparc/v8.lo src/sparc/v9.lo

 @POWERPC_AIX_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \

 @POWERPC_AIX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \

 @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

+@POWERPC_AIX_TRUE@src/powerpc/aix_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

 @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)

@@ -578,8 +616,8 @@

 	-chmod 777 $(distdir)

 	$(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; \

 	  if test -d $$d/$$file; then \

diff -ruN --exclude=CVS gcc-3.2.2.orig/libffi/acinclude.m4 gcc/libffi/acinclude.m4

--- gcc-3.2.2.orig/libffi/acinclude.m4	Sun Sep 10 16:43:14 2000

+++ gcc/libffi/acinclude.m4	Tue Dec 17 03:22:47 2002

@@ -4,5 +4,8 @@

 dnl to add a definition of LIBTOOL to Makefile.in.

 ifelse(yes,no,[

 AC_DEFUN([AC_PROG_LIBTOOL],)

+AC_DEFUN([AM_PROG_LIBTOOL],)

 AC_SUBST(LIBTOOL)

 ])

+

+sinclude(../config/accross.m4)

diff -ruN --exclude=CVS gcc-3.2.2.orig/libffi/aclocal.m4 gcc/libffi/aclocal.m4

--- gcc-3.2.2.orig/libffi/aclocal.m4	Fri Feb  1 07:25:31 2002

+++ gcc/libffi/aclocal.m4	Tue Dec 17 03:22:47 2002

@@ -1,6 +1,6 @@

-dnl aclocal.m4 generated automatically by aclocal 1.4

+dnl aclocal.m4 generated automatically by aclocal 1.4-p5

-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.

+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.

 dnl This file is free software; the Free Software Foundation

 dnl gives unlimited permission to copy and/or distribute it,

 dnl with or without modifications, as long as this notice is preserved.

@@ -16,108 +16,15 @@

 dnl to add a definition of LIBTOOL to Makefile.in.

 ifelse(yes,no,[

 AC_DEFUN([AC_PROG_LIBTOOL],)

+AC_DEFUN([AM_PROG_LIBTOOL],)

 AC_SUBST(LIBTOOL)

 ])

-AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

-[changequote(<<, >>)dnl

-dnl The name to #define.

-define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl

-dnl The cache variable name.

-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl

-changequote([, ])dnl

-AC_MSG_CHECKING(size of $1)

-AC_CACHE_VAL(AC_CV_NAME,

-[for ac_size in 4 8 1 2 16 12 $2 ; do # List sizes in rough order of prevalence.

-  AC_TRY_COMPILE([#include "confdefs.h"

-#include <sys/types.h>

-$2

-], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)

-  if test x$AC_CV_NAME != x ; then break; fi

-done

-])

-if test x$AC_CV_NAME = x ; then

-  AC_MSG_ERROR([cannot determine a size for $1])

-fi

-AC_MSG_RESULT($AC_CV_NAME)

-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])

-undefine([AC_TYPE_NAME])dnl

-undefine([AC_CV_NAME])dnl

-])

-

-AC_DEFUN([AC_C_BIGENDIAN_CROSS],

-[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,

-[ac_cv_c_bigendian=unknown

-# See if sys/param.h defines the BYTE_ORDER macro.

-AC_TRY_COMPILE([#include <sys/types.h>

-#include <sys/param.h>], [

-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN

- bogus endian macros

-#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.

-AC_TRY_COMPILE([#include <sys/types.h>

-#include <sys/param.h>], [

-#if BYTE_ORDER != BIG_ENDIAN

- not big endian

-#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])

-if test $ac_cv_c_bigendian = unknown; then

-AC_TRY_RUN([main () {

-  /* Are we little or big endian?  From Harbison&Steele.  */

-  union

-  {

-    long l;

-    char c[sizeof (long)];

-  } u;

-  u.l = 1;

-  exit (u.c[sizeof (long) - 1] == 1);

-}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes,

-[ echo $ac_n "cross-compiling... " 2>&AC_FD_MSG ])

-fi])

-if test $ac_cv_c_bigendian = unknown; then

-AC_MSG_CHECKING(to probe for byte ordering)

-[

-cat >conftest.c <<EOF

-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };

-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };

-void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; }

-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };

-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };

-void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }

-int main() { _ascii (); _ebcdic (); return 0; }

-EOF

-] if test -f conftest.c ; then

-     if ${CC-cc} ${CFLAGS} conftest.c -o conftest.o && test -f conftest.o ; then

-        if test `grep -l BIGenDianSyS conftest.o` ; then

-           echo $ac_n ' big endian probe OK, ' 1>&AC_FD_MSG

-           ac_cv_c_bigendian=yes

-        fi

-        if test `grep -l LiTTleEnDian conftest.o` ; then

-           echo $ac_n ' little endian probe OK, ' 1>&AC_FD_MSG

-           if test $ac_cv_c_bigendian = yes ; then

-            ac_cv_c_bigendian=unknown;

-           else

-            ac_cv_c_bigendian=no

-           fi

-        fi

-        echo $ac_n 'guessing bigendian ...  ' >&AC_FD_MSG

-     fi

-  fi

-AC_MSG_RESULT($ac_cv_c_bigendian)

-fi

-if test $ac_cv_c_bigendian = yes; then

-  AC_DEFINE(WORDS_BIGENDIAN, 1, [whether byteorder is bigendian])

-  BYTEORDER=4321

-else

-  BYTEORDER=1234

-fi

-AC_DEFINE_UNQUOTED(BYTEORDER, $BYTEORDER, [1234 = LIL_ENDIAN, 4321 = BIGENDIAN])

-if test $ac_cv_c_bigendian = unknown; then

-  AC_MSG_ERROR(unknown endianess - sorry, please pre-set ac_cv_c_bigendian)

-fi

-])

+sinclude(../config/accross.m4)

 # Like AC_CONFIG_HEADER, but automatically create stamp file.

-AC_DEFUN(AM_CONFIG_HEADER,

+AC_DEFUN([AM_CONFIG_HEADER],

 [AC_PREREQ([2.12])

 AC_CONFIG_HEADER([$1])

 dnl When config.status generates a header, we must update the stamp-h file.

@@ -147,7 +54,7 @@

 dnl Usage:

 dnl AM_INIT_AUTOMAKE(package,version, [no-define])

-AC_DEFUN(AM_INIT_AUTOMAKE,

+AC_DEFUN([AM_INIT_AUTOMAKE],

 [AC_REQUIRE([AC_PROG_INSTALL])

 PACKAGE=[$1]

 AC_SUBST(PACKAGE)

@@ -175,7 +82,7 @@

 # Check to make sure that the build environment is sane.

 #

-AC_DEFUN(AM_SANITY_CHECK,

+AC_DEFUN([AM_SANITY_CHECK],

 [AC_MSG_CHECKING([whether build environment is sane])

 # Just in case

 sleep 1

@@ -216,7 +123,7 @@

 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)

 dnl The program must properly implement --version.

-AC_DEFUN(AM_MISSING_PROG,

+AC_DEFUN([AM_MISSING_PROG],

 [AC_MSG_CHECKING(for working $2)

 # Run test in a subshell; some versions of sh will print an error if

 # an executable is not found, even if stderr is redirected.

@@ -235,7 +142,7 @@

 # serial 1

-AC_DEFUN(AM_MAINTAINER_MODE,

+AC_DEFUN([AM_MAINTAINER_MODE],

 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

   dnl maintainer-mode is disabled by default

   AC_ARG_ENABLE(maintainer-mode,

@@ -252,7 +159,7 @@

 # Define a conditional.

-AC_DEFUN(AM_CONDITIONAL,

+AC_DEFUN([AM_CONDITIONAL],

 [AC_SUBST($1_TRUE)

 AC_SUBST($1_FALSE)

 if $2; then

diff -ruN --exclude=CVS gcc-3.2.2.orig/libffi/configure gcc/libffi/configure

--- gcc-3.2.2.orig/libffi/configure	Wed Jan 29 07:59:05 2003

+++ gcc/libffi/configure	Sat Feb  1 20:16:19 2003

@@ -633,17 +633,16 @@

 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_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

     ac_install_sh="$ac_aux_dir/install-sh -c"

@@ -655,13 +654,14 @@

   fi

 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.

+

 # Make sure we can run config.sub.

 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :

 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }

@@ -1238,9 +1238,18 @@

   ;;

 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

   ;;

 irix5* | irix6*)

@@ -1267,7 +1276,7 @@

 # This must be Linux ELF.

 linux-gnu*)

   case $host_cpu in

-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )

+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* )

     lt_cv_deplibs_check_method=pass_all ;;

   *)

     # glibc up to 2.1.1 does not perform some relocations on ARM

@@ -1330,13 +1339,13 @@

 deplibs_check_method=$lt_cv_deplibs_check_method

 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

 else

   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

     *.c) ;;

@@ -1356,7 +1365,7 @@

 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

 else

@@ -1366,7 +1375,7 @@

   rm -f conftest*

   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

       *.c | *.o | *.obj) ;;

@@ -1399,7 +1408,7 @@

 file_magic*)

   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

 else

@@ -1461,7 +1470,7 @@

 if test -z "$lt_cv_path_MAGIC_CMD"; then

   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

 else

@@ -1532,7 +1541,7 @@

 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

 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

 else

@@ -1564,7 +1573,7 @@

   # Extract the first word of "ranlib", so it can be a program name with args.

 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

 else

@@ -1599,7 +1608,7 @@

 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

 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

 else

@@ -1631,7 +1640,7 @@

   # Extract the first word of "strip", so it can be a program name with args.

 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

 else

@@ -1698,8 +1707,8 @@

 case $host in

 *-*-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

     case `/usr/bin/file conftest.$ac_objext` in

     *32-bit*)

       LD="${LD-ld} -32"

@@ -1715,12 +1724,70 @@

   rm -rf conftest*

   ;;

+ia64-*-hpux*)

+  # Find out which ABI we are using.

+  echo 'int i;' > conftest.$ac_ext

+  if { (eval echo configure:1731: \"$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:1747: \"$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*)

+          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*

+  ;;

+

 *-*-sco3.2v5*)

   # On SCO OpenServer 5, we need -belf to get full-featured binaries.

   SAVE_CFLAGS="$CFLAGS"

   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:1791: 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

 else

@@ -1733,14 +1800,14 @@

 cross_compiling=$ac_cv_prog_cc_cross

      cat > conftest.$ac_ext <<EOF

-#line 1737 "configure"

+#line 1804 "configure"

 #include "confdefs.h"

 int main() {

 ; 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:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*

   lt_cv_cc_needs_belf=yes

 else

@@ -1868,7 +1935,7 @@

 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

 # ./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:1939: checking for a BSD compatible install" >&5

 if test -z "$INSTALL"; then

 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

@@ -1921,7 +1988,7 @@

 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

 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:1992: checking whether build environment is sane" >&5

 # Just in case

 sleep 1

 echo timestamp > conftestfile

@@ -1978,7 +2045,7 @@

 test "$program_transform_name" = "" && program_transform_name="s,x,x,"

 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:2049: 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

   echo $ac_n "(cached) $ac_c" 1>&6

@@ -2017,7 +2084,7 @@

 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:2088: 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.

 # Redirect stdin to placate older versions of autoconf.  Sigh.

@@ -2030,7 +2097,7 @@

 fi

 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6

-echo "configure:2034: checking for working autoconf" >&5

+echo "configure:2101: 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.

 # Redirect stdin to placate older versions of autoconf.  Sigh.

@@ -2043,7 +2110,7 @@

 fi

 echo $ac_n "checking for working automake""... $ac_c" 1>&6

-echo "configure:2047: checking for working automake" >&5

+echo "configure:2114: 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.

 # Redirect stdin to placate older versions of autoconf.  Sigh.

@@ -2056,7 +2123,7 @@

 fi

 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6

-echo "configure:2060: checking for working autoheader" >&5

+echo "configure:2127: 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.

 # Redirect stdin to placate older versions of autoconf.  Sigh.

@@ -2069,7 +2136,7 @@

 fi

 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6

-echo "configure:2073: checking for working makeinfo" >&5

+echo "configure:2140: 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.

 # Redirect stdin to placate older versions of autoconf.  Sigh.

@@ -2086,7 +2153,7 @@

 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6

-echo "configure:2090: checking for executable suffix" >&5

+echo "configure:2157: checking for executable suffix" >&5

 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -2096,7 +2163,7 @@

   rm -f conftest*

   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:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then

     for file in conftest.*; do

       case $file in

       *.c | *.o | *.obj) ;;

@@ -2117,7 +2184,7 @@

 ac_exeext=$EXEEXT

 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:2188: 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

   enableval="$enable_maintainer_mode"

@@ -2143,7 +2210,7 @@

 # Extract the first word of "gcc", so it can be a program name with args.

 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:2214: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -2173,7 +2240,7 @@

   # Extract the first word of "cc", so it can be a program name with args.

 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:2244: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -2224,7 +2291,7 @@

       # Extract the first word of "cl", so it can be a program name with args.

 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:2295: checking for $ac_word" >&5

 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then

   echo $ac_n "(cached) $ac_c" 1>&6

 else

@@ -2256,7 +2323,7 @@

 fi

 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:2327: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c

 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

@@ -2267,12 +2334,12 @@

 cat > conftest.$ac_ext << EOF

-#line 2271 "configure"

+#line 2338 "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:2343: \"$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.

   if (./conftest; exit) 2>/dev/null; then

@@ -2298,12 +2365,12 @@

   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }

 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:2369: 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:2374: 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

 else

@@ -2312,7 +2379,7 @@

   yes;

 #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:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then

   ac_cv_prog_gcc=yes

 else

   ac_cv_prog_gcc=no

@@ -2331,7 +2398,7 @@

 ac_save_CFLAGS="$CFLAGS"

 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:2402: 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

 else

@@ -2381,17 +2448,23 @@

 i*86-*-mingw*) TARGET=X86_WIN32; TARGETDIR=x86;;

 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;;

 powerpc-*-darwin*) TARGET=POWERPC_DARWIN; TARGETDIR=powerpc;;

 powerpc-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;;

 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

 if test $TARGETDIR = unknown; then

@@ -2418,6 +2491,15 @@

 fi

+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=

   SPARC_FALSE='#'

@@ -2507,8 +2589,39 @@

   ARM_FALSE=

 fi

+

+if test x$TARGET = xS390; then