Bug#329893: gcc-3.4: M32R libffi update for 3.4.4

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#329893: gcc-3.4: M32R libffi update for 3.4.4
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Sat, 24 Sep 2005 18:18:40 +0900
Message-id: <[🔎] E1EJ6B6-0003YG-7Z@zanshin.gniibe.org>
Reply-to: NIIBE Yutaka <gniibe@fsij.org>, 329893@bugs.debian.org

Package: gcc-3.4
Version: 3.4.4-8
Severity: wishlist
Tags: patch

We need a update for M32R's libffi patch, because the one which is
included in Debian gcc-3.4 source package is old.  I got update
from M32R's libffi author, Kazuhiro Inaoka.

Could you please apply following patch?  It looks big, but only
inherent change is the change of FFI_CLOSURES, others are caused
by source change between 3.4.1 and 3.4.4.

  * debian/patches/m32r-libffi.dpatch: Updated to 3.4.4.

 -- NIIBE Yutaka <gniibe@fsij.org>  Sat, 24 Sep 2005 17:53:46 +0900

--- gcc-3.4-3.4.4/debian/patches/m32r-libffi.dpatch
+++ gcc-3.4-3.4.4/debian/patches/m32r-libffi.dpatch
@@ -63,351 +63,58 @@
  
 --- gcc-3.4.1/libffi/Makefile.in.orig	2004-11-12 16:52:34.000000000 +0900
 +++ gcc-3.4.1/libffi/Makefile.in	2004-11-12 16:57:15.000000000 +0900
-@@ -95,26 +95,7 @@ AUTOMAKE_OPTIONS = cygnus
- 
- SUBDIRS = include testsuite
- 
--EXTRA_DIST = LICENSE ChangeLog.v1 \
--	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
--	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
--	src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
--	src/mips/ffitarget.h \
--	src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
--	src/pa/ffi.c src/pa/linux.S src/pa/ffitarget.h \
--	src/powerpc/ffi.c src/powerpc/sysv.S \
--	src/powerpc/linux64.S src/powerpc/linux64_closure.S \
--	src/powerpc/ppc_closure.S src/powerpc/asm.h \
--	src/powerpc/aix.S src/powerpc/darwin.S \
--	src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
--	src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h \
--	src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h \
--	src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h \
--	src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \
--	src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \
--	src/sparc/ffi.c \
--	src/x86/ffi.c src/x86/sysv.S src/x86/win32.S \
--	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h
-+EXTRA_DIST = LICENSE ChangeLog.v1 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h 	src/mips/ffi.c src/mips/n32.S src/mips/o32.S 	src/mips/ffitarget.h 	src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h 	src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h 	src/pa/ffi.c src/pa/linux.S src/pa/ffitarget.h 	src/powerpc/ffi.c src/powerpc/sysv.S 	src/powerpc/linux64.S src/powerpc/linux64_closure.S 	src/powerpc/ppc_closure.S src/powerpc/asm.h 	src/powerpc/aix.S src/powerpc/darwin.S 	src/powerpc/aix_closure.S src/powerpc/darwin_closure.S 	src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h 	src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h 	src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h 	src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h 	src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h 	src/sparc/ffi.c 	src/x86/ffi.c src/x86/sysv.S src/x86/win32.S 	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h
- 
- 
- VPATH = @srcdir@:@srcdir@/src:@srcdir@/src/@TARGETDIR@
-@@ -122,41 +103,7 @@ VPATH = @srcdir@:@srcdir@/src:@srcdir@/s
- # Work around what appears to be a GNU make bug handling MAKEFLAGS
- # values defined in terms of make variables, as is the case for CC and
- # friends when we are called from the top level Makefile.
--AM_MAKEFLAGS = \
--	"AR_FLAGS=$(AR_FLAGS)" \
--	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
--	"CFLAGS=$(CFLAGS)" \
--	"CXXFLAGS=$(CXXFLAGS)" \
--	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
--	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
--	"INSTALL=$(INSTALL)" \
--	"INSTALL_DATA=$(INSTALL_DATA)" \
--	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
--	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
--	"JC1FLAGS=$(JC1FLAGS)" \
--	"LDFLAGS=$(LDFLAGS)" \
--	"LIBCFLAGS=$(LIBCFLAGS)" \
--	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
--	"MAKE=$(MAKE)" \
--	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
--	"PICFLAG=$(PICFLAG)" \
--	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
--	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
--	"SHELL=$(SHELL)" \
--	"exec_prefix=$(exec_prefix)" \
--	"infodir=$(infodir)" \
--	"libdir=$(libdir)" \
--	"prefix=$(prefix)" \
--	"AR=$(AR)" \
--	"AS=$(AS)" \
--	"CC=$(CC)" \
--	"CXX=$(CXX)" \
--	"LD=$(LD)" \
--	"LIBCFLAGS=$(LIBCFLAGS)" \
--	"NM=$(NM)" \
--	"PICFLAG=$(PICFLAG)" \
--	"RANLIB=$(RANLIB)" \
--	"DESTDIR=$(DESTDIR)"
-+AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CFLAGS=$(CFLAGS)" 	"CXXFLAGS=$(CXXFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"INSTALL=$(INSTALL)" 	"INSTALL_DATA=$(INSTALL_DATA)" 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" 	"JC1FLAGS=$(JC1FLAGS)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"SHELL=$(SHELL)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"prefix=$(prefix)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC)" 	"CXX=$(CXX)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"NM=$(NM)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"DESTDIR=$(DESTDIR)"
- 
- 
- MAKEOVERRIDES = 
-@@ -189,44 +136,46 @@ TARGET_SRC_S390 = src/s390/sysv.S src/s3
+@@ -98,6 +98,7 @@
+ EXTRA_DIST = LICENSE ChangeLog.v1 \
+ 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
+ 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
++	src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
+ 	src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
+ 	src/mips/ffitarget.h \
+ 	src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
+@@ -187,6 +188,7 @@
  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
  TARGET_SRC_SH64 = src/sh64/sysv.S src/sh64/ffi.c
 +TARGET_SRC_M32R = src/m32r/sysv.S src/m32r/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
-+libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c 		src/raw_api.c src/java_raw_api.c
- 
--@MIPS_IRIX_TRUE@libffi_la_SOURCES = @MIPS_IRIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_IRIX)
--@MIPS_LINUX_TRUE@libffi_la_SOURCES = @MIPS_LINUX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
--@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)
--@SPARC_TRUE@libffi_la_SOURCES = @SPARC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
--@ALPHA_TRUE@libffi_la_SOURCES = @ALPHA_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
--@IA64_TRUE@libffi_la_SOURCES = @IA64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
--@M68K_TRUE@libffi_la_SOURCES = @M68K_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
--@PA_TRUE@libffi_la_SOURCES = @PA_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_PA)
--@POWERPC_TRUE@libffi_la_SOURCES = @POWERPC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
--@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)
--@SH64_TRUE@libffi_la_SOURCES = @SH64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH64)
--@MIPS_IRIX_TRUE@libffi_convenience_la_SOURCES = @MIPS_IRIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_IRIX)
--@MIPS_LINUX_TRUE@libffi_convenience_la_SOURCES = @MIPS_LINUX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
--@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)
--@SPARC_TRUE@libffi_convenience_la_SOURCES = @SPARC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
--@ALPHA_TRUE@libffi_convenience_la_SOURCES = @ALPHA_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
--@IA64_TRUE@libffi_convenience_la_SOURCES = @IA64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
--@M68K_TRUE@libffi_convenience_la_SOURCES = @M68K_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
--@PA_TRUE@libffi_convenience_la_SOURCES = @PA_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_PA)
--@POWERPC_TRUE@libffi_convenience_la_SOURCES = @POWERPC_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
--@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@libffi_convenience_la_SOURCES = @SH_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
--@SH64_TRUE@libffi_convenience_la_SOURCES = @SH64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH64)
-+@MIPS_IRIX_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_IRIX)
-+@MIPS_LINUX_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
-+@X86_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
-+@X86_WIN32_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
-+@SPARC_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
-+@ALPHA_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
-+@IA64_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
-+@M68K_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
-+@POWERPC_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
-+@POWERPC_AIX_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
-+@POWERPC_DARWIN_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
-+@ARM_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
-+@S390_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
-+@X86_64_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
-+@SH_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
-+@SH64_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH64)
-+@PA_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_PA)
-+@M32R_TRUE@libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M32R)
-+@MIPS_IRIX_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_IRIX)
-+@MIPS_LINUX_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
-+@X86_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
-+@X86_WIN32_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_WIN32)
-+@SPARC_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SPARC)
-+@ALPHA_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
-+@IA64_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
-+@M68K_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
-+@POWERPC_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC)
-+@POWERPC_AIX_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_AIX)
-+@POWERPC_DARWIN_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_POWERPC_DARWIN)
-+@ARM_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ARM)
-+@S390_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_S390)
-+@X86_64_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
-+@SH_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
-+@SH64_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_SH64)
-+@PA_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_PA)
-+@M32R_TRUE@libffi_convenience_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M32R)
+ libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \
+ 		src/raw_api.c src/java_raw_api.c
+@@ -207,6 +209,7 @@
+ @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)
+ @SH64_TRUE@libffi_la_SOURCES = @SH64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH64)
++@M32R_TRUE@libffi_la_SOURCES = @M32R_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_M32R)
+ @MIPS_IRIX_TRUE@libffi_convenience_la_SOURCES = @MIPS_IRIX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_IRIX)
+ @MIPS_LINUX_TRUE@libffi_convenience_la_SOURCES = @MIPS_LINUX_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_LINUX)
+ @X86_TRUE@libffi_convenience_la_SOURCES = @X86_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86)
+@@ -223,6 +226,7 @@
+ @X86_64_TRUE@libffi_convenience_la_SOURCES = @X86_64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64)
+ @SH_TRUE@libffi_convenience_la_SOURCES = @SH_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH)
+ @SH64_TRUE@libffi_convenience_la_SOURCES = @SH64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH64)
++@M32R_TRUE@libffi_convenience_la_SOURCES = @M32R_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_M32R)
  
  AM_CFLAGS = -Wall -g -fexceptions
  
-@@ -246,122 +195,43 @@ LDFLAGS = @LDFLAGS@
+@@ -242,6 +246,9 @@
  LIBS = @LIBS@
  libffi_convenience_la_LDFLAGS = 
  libffi_convenience_la_LIBADD = 
--@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
--@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
--@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
--@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
--@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
--@PA_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
--@PA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
--@PA_TRUE@src/pa/ffi.lo src/pa/linux.lo
--@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_closure.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 \
--@POWERPC_TRUE@src/powerpc/linux64.lo src/powerpc/linux64_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
--@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 src/sh/sysv.lo \
--@SH_TRUE@src/sh/ffi.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
--@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 \
--@SPARC_TRUE@src/sparc/v9.lo
--@SH64_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
--@SH64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
--@SH64_TRUE@src/sh64/sysv.lo src/sh64/ffi.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
--@MIPS_IRIX_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo \
--@MIPS_IRIX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \
--@MIPS_IRIX_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \
--@MIPS_IRIX_TRUE@src/mips/n32.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
--@IA64_TRUE@libffi_convenience_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
-+@SH_TRUE@libffi_convenience_la_OBJECTS = 
-+@IA64_TRUE@libffi_convenience_la_OBJECTS = 
-+@X86_TRUE@libffi_convenience_la_OBJECTS = 
-+@POWERPC_TRUE@libffi_convenience_la_OBJECTS = 
-+@MIPS_IRIX_TRUE@libffi_convenience_la_OBJECTS = 
-+@MIPS_LINUX_TRUE@libffi_convenience_la_OBJECTS = 
-+@SPARC_TRUE@libffi_convenience_la_OBJECTS = 
-+@POWERPC_AIX_TRUE@libffi_convenience_la_OBJECTS = 
-+@ARM_TRUE@libffi_convenience_la_OBJECTS = 
-+@ALPHA_TRUE@libffi_convenience_la_OBJECTS = 
-+@M32R_TRUE@libffi_convenience_la_OBJECTS = 
-+@S390_TRUE@libffi_convenience_la_OBJECTS = 
-+@PA_TRUE@libffi_convenience_la_OBJECTS = 
-+@M68K_TRUE@libffi_convenience_la_OBJECTS = 
-+@SH64_TRUE@libffi_convenience_la_OBJECTS = 
-+@X86_WIN32_TRUE@libffi_convenience_la_OBJECTS = 
-+@X86_64_TRUE@libffi_convenience_la_OBJECTS = 
-+@POWERPC_DARWIN_TRUE@libffi_convenience_la_OBJECTS = 
++@M32R_TRUE@libffi_convenience_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
++@M32R_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
++@M32R_TRUE@src/m32r/ffi.lo src/m32r/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 \
+@@ -299,6 +306,9 @@
+ @IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
+ @IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo
  libffi_la_LIBADD = 
--@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
--@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
--@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
--@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
--@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
--@PA_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo src/types.lo \
--@PA_TRUE@src/raw_api.lo src/java_raw_api.lo src/pa/linux.lo \
--@PA_TRUE@src/pa/ffi.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_closure.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 src/powerpc/linux64.lo \
--@POWERPC_TRUE@src/powerpc/linux64_closure.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
--@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
--@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
--@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
--@SH64_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
--@SH64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
--@SH64_TRUE@src/sh64/sysv.lo src/sh64/ffi.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
--@MIPS_IRIX_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
--@MIPS_IRIX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
--@MIPS_IRIX_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.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
--@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
-+@SH_TRUE@libffi_la_OBJECTS = 
-+@IA64_TRUE@libffi_la_OBJECTS = 
-+@X86_TRUE@libffi_la_OBJECTS = 
-+@POWERPC_TRUE@libffi_la_OBJECTS = 
-+@MIPS_IRIX_TRUE@libffi_la_OBJECTS = 
-+@MIPS_LINUX_TRUE@libffi_la_OBJECTS = 
-+@SPARC_TRUE@libffi_la_OBJECTS = 
-+@POWERPC_AIX_TRUE@libffi_la_OBJECTS = 
-+@ARM_TRUE@libffi_la_OBJECTS = 
-+@ALPHA_TRUE@libffi_la_OBJECTS = 
-+@M32R_TRUE@libffi_la_OBJECTS = 
-+@S390_TRUE@libffi_la_OBJECTS = 
-+@PA_TRUE@libffi_la_OBJECTS = 
-+@M68K_TRUE@libffi_la_OBJECTS = 
-+@SH64_TRUE@libffi_la_OBJECTS = 
-+@X86_WIN32_TRUE@libffi_la_OBJECTS = 
-+@X86_64_TRUE@libffi_la_OBJECTS = 
-+@POWERPC_DARWIN_TRUE@libffi_la_OBJECTS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -526,7 +396,7 @@ maintainer-clean-recursive:
- 	dot_seen=no; \
- 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  rev="$$subdir $$rev"; \
--	  test "$$subdir" = "." && dot_seen=yes; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
- 	done; \
- 	test "$$dot_seen" = "no" && rev=". $$rev"; \
- 	target=`echo $@ | sed s/-recursive//`; \
-@@ -568,7 +438,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)fficonfig.h.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags fficonfig.h.in $$unique $(LISP) -o $$here/TAGS)
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags fficonfig.h.in $$unique $(LISP))
- 
- mostlyclean-tags:
- 
-@@ -618,9 +488,10 @@ distdir: $(DISTFILES)
- 	mkdir $(distdir)
- 	-chmod 777 $(distdir)
- 	$(mkinstalldirs) $(distdir)/src/alpha $(distdir)/src/arm \
--	   $(distdir)/src/m68k $(distdir)/src/mips $(distdir)/src/pa \
--	   $(distdir)/src/powerpc $(distdir)/src/s390 $(distdir)/src/sh \
--	   $(distdir)/src/sh64 $(distdir)/src/sparc $(distdir)/src/x86
-+	   $(distdir)/src/m32r $(distdir)/src/m68k $(distdir)/src/mips \
-+	   $(distdir)/src/pa $(distdir)/src/powerpc $(distdir)/src/s390 \
-+	   $(distdir)/src/sh $(distdir)/src/sh64 $(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 \
++@M32R_TRUE@libffi_la_OBJECTS =  src/debug.lo src/prep_cif.lo \
++@M32R_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \
++@M32R_TRUE@src/m32r/ffi.lo src/m32r/sysv.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 \
 --- gcc-3.4.1/libffi/configure.in.orig	2004-11-02 22:25:28.000000000 +0900
 +++ gcc-3.4.1/libffi/configure.in	2004-11-12 12:14:04.000000000 +0900
 @@ -88,6 +88,7 @@ x86_64-*-linux*) TARGET=X86_64; TARGETDI
@@ -720,7 +427,7 @@
 +} ffi_abi;
 +#endif
 +
-+#define FFI_CLOSURES 1
++#define FFI_CLOSURES 0
 +#define FFI_TRAMPOLINE_SIZE 24
 +#define FFI_NATIVE_RAW_API 0
 +

Reply to:

Prev by Date: Bug#329820: Acknowledgement (gcc-3.4: DEB_VERSION when binary-only NMU)
Next by Date: Bug#207444: Thanks for being a good friend!
Previous by thread: Bug#329840: gcc-4.0: ICE on sparc: error building zinc-compiler
Next by thread: Bug#207444: Thanks for being a good friend!
Index(es):
- Date
- Thread