diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 83a1c2b5d9e..88dc9581e0a 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,12 @@ +2005-03-21 Zack Weinberg + + * configure.ac: Do not invoke TL_AC_GCC_VERSION. + Do not set tool_include_dir. + * aclocal.m4, configure, Makefile.in, testsuite/Makefile.in: + Regenerate. + * include/Makefile.am: Set gcc_version and toollibffidir. + * include/Makefile.in: Regenerate. + 2005-02-22 Andrew Haley * src/powerpc/ffi.c (ffi_prep_cif_machdep): Bump alignment to @@ -35,7 +44,7 @@ * src/types.c (FFI_TYPE_POINTER): Define with sizeof. (FFI_TYPE_LONGDOUBLE): Fix for ia64. - * src/ia64/ffitarget.h (struct ffi_ia64_trampoline_struct): Move + * src/ia64/ffitarget.h (struct ffi_ia64_trampoline_struct): Move into ffi_prep_closure. * src/ia64/ia64_flags.h, src/ia64/ffi.c, src/ia64/unix.S: Rewrite from scratch. @@ -312,7 +321,7 @@ integer (O32 ABI only). (ffi_prep_closure): new function. (ffi_closure_mips_inner_O32): new function. - * src/mips/ffitarget.h: Define `FFI_CLOSURES' and + * src/mips/ffitarget.h: Define `FFI_CLOSURES' and `FFI_TRAMPOLINE_SIZE' appropriately if the ABI is o32. * src/mips/o32.S (ffi_call_O32): add labels for .eh_frame. Return 64 bit integers correctly. @@ -392,7 +401,7 @@ * src/powerpc/darwin.S: Go through a non-lazy pointer for initial FDE location. * src/powerpc/darwin_closure.S: Likewise. - + 2004-04-24 Andreas Tobler * testsuite/libffi.call/cls_multi_schar.c (main): Fix initialization @@ -1202,7 +1211,7 @@ 2003-03-03 Andreas Tobler - * src/powerpc/darwin_closure.S: Recode to fit dynamic libraries. + * src/powerpc/darwin_closure.S: Recode to fit dynamic libraries. 2003-02-06 Andreas Tobler @@ -1221,12 +1230,12 @@ 2003-01-31 Christian Cornelssen , Andreas Schwab - * configure.in: Adjust command to source config-ml.in to account + * 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. + * configure: Regenerate. 2003-01-29 Franz Sirl @@ -1275,12 +1284,12 @@ 2003-01-13 Andreas Tobler * libffi/src/ffitest.c - add closure testcases + add closure testcases 2003-01-13 Kevin B. Hendricks * libffi/src/powerpc/ffi.c - fix alignment bug for float (4 byte aligned iso 8 byte) + fix alignment bug for float (4 byte aligned iso 8 byte) 2003-01-09 Geoffrey Keating diff --git a/libffi/Makefile.in b/libffi/Makefile.in index 4b56c087cf4..bd2dc02c2c8 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -68,7 +68,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ - $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -299,9 +298,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -327,7 +323,6 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = foreign subdir-objects diff --git a/libffi/aclocal.m4 b/libffi/aclocal.m4 index 1a497eeaa56..035760a83d8 100644 --- a/libffi/aclocal.m4 +++ b/libffi/aclocal.m4 @@ -1200,6 +1200,5 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../config/accross.m4]) -m4_include([../config/gcc-version.m4]) m4_include([../libtool.m4]) m4_include([acinclude.m4]) diff --git a/libffi/configure b/libffi/configure index d77e94b49ab..628d002b355 100755 --- a/libffi/configure +++ b/libffi/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CCAS CCASFLAGS LN_S RANLIB ac_ct_RANLIB LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CPP CPPFLAGS EGREP TESTSUBDIR_TRUE TESTSUBDIR_FALSE AM_RUNTESTFLAGS MIPS_IRIX_TRUE MIPS_IRIX_FALSE MIPS_LINUX_TRUE MIPS_LINUX_FALSE SPARC_TRUE SPARC_FALSE X86_TRUE X86_FALSE X86_WIN32_TRUE X86_WIN32_FALSE ALPHA_TRUE ALPHA_FALSE IA64_TRUE IA64_FALSE M32R_TRUE M32R_FALSE M68K_TRUE M68K_FALSE POWERPC_TRUE POWERPC_FALSE POWERPC_AIX_TRUE POWERPC_AIX_FALSE POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE ARM_TRUE ARM_FALSE FRV_TRUE FRV_FALSE S390_TRUE S390_FALSE X86_64_TRUE X86_64_FALSE SH_TRUE SH_FALSE SH64_TRUE SH64_FALSE PA_TRUE PA_FALSE ALLOCA HAVE_LONG_DOUBLE TARGET TARGETDIR toolexecdir toolexeclibdir gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CCAS CCASFLAGS LN_S RANLIB ac_ct_RANLIB LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CPP CPPFLAGS EGREP TESTSUBDIR_TRUE TESTSUBDIR_FALSE AM_RUNTESTFLAGS MIPS_IRIX_TRUE MIPS_IRIX_FALSE MIPS_LINUX_TRUE MIPS_LINUX_FALSE SPARC_TRUE SPARC_FALSE X86_TRUE X86_FALSE X86_WIN32_TRUE X86_WIN32_FALSE ALPHA_TRUE ALPHA_FALSE IA64_TRUE IA64_FALSE M32R_TRUE M32R_FALSE M68K_TRUE M68K_FALSE POWERPC_TRUE POWERPC_FALSE POWERPC_AIX_TRUE POWERPC_AIX_FALSE POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE ARM_TRUE ARM_FALSE FRV_TRUE FRV_FALSE S390_TRUE S390_FALSE X86_64_TRUE X86_64_FALSE SH_TRUE SH_FALSE SH64_TRUE SH64_FALSE PA_TRUE PA_FALSE ALLOCA HAVE_LONG_DOUBLE TARGET TARGETDIR toolexecdir toolexeclibdir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -6795,27 +6795,6 @@ esac - -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$srcdir/../gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` - - - - - -#Figure out where generated headers like ffitarget.h get installed. -tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include - - if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else @@ -7748,10 +7727,6 @@ s,@TARGET@,$TARGET,;t t s,@TARGETDIR@,$TARGETDIR,;t t s,@toolexecdir@,$toolexecdir,;t t s,@toolexeclibdir@,$toolexeclibdir,;t t -s,@gcc_version_trigger@,$gcc_version_trigger,;t t -s,@gcc_version_full@,$gcc_version_full,;t t -s,@gcc_version@,$gcc_version,;t t -s,@tool_include_dir@,$tool_include_dir,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/libffi/configure.ac b/libffi/configure.ac index 99fff1ef379..ba35e7664e1 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -226,12 +226,6 @@ esac AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) -TL_AC_GCC_VERSION([$srcdir/..]) - -#Figure out where generated headers like ffitarget.h get installed. -tool_include_dir='$(libdir)/gcc/$(target_alias)/'${gcc_version}/include -AC_SUBST(tool_include_dir) - if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am index 048824d3938..0c160aadf5a 100644 --- a/libffi/include/Makefile.am +++ b/libffi/include/Makefile.am @@ -9,5 +9,8 @@ hackdir=$(includedir) hack_DATA= ffi.h -toollibffidir = @tool_include_dir@/libffi +# Where generated headers like ffitarget.h get installed. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi + toollibffi_HEADERS = ffitarget.h diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in index a34f98e5f90..58122680250 100644 --- a/libffi/include/Makefile.in +++ b/libffi/include/Makefile.in @@ -43,7 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/ffi.h.in $(toollibffi_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ - $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -179,9 +178,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -207,7 +203,6 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = foreign @@ -215,7 +210,10 @@ DISTCLEANFILES = ffitarget.h EXTRA_DIST = ffi.h.in ffi_common.h hackdir = $(includedir) hack_DATA = ffi.h -toollibffidir = @tool_include_dir@/libffi + +# Where generated headers like ffitarget.h get installed. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi toollibffi_HEADERS = ffitarget.h all: all-am diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in index 86011871b0a..7d51981ae9e 100644 --- a/libffi/testsuite/Makefile.in +++ b/libffi/testsuite/Makefile.in @@ -40,7 +40,6 @@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ - $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -165,9 +164,6 @@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -193,7 +189,6 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = foreign dejagnu