diff options
47 files changed, 5260 insertions, 3742 deletions
diff --git a/.pc/stand-alone/m4/asmcfi.m4 b/.pc/stand-alone/m4/asmcfi.m4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.pc/stand-alone/m4/asmcfi.m4 @@ -1,14 +1,14 @@ -2011-09-06 Anthony Green <green@moxielogic.com> +2011-11-12 Anthony Green <green@moxielogic.com> * Makefile.am (AM_CCASFLAGS): Add -g option to build assembly files with debug info. * Makefile.in: Rebuilt. -2011-08-24 Jasper Lievisse Adriaanse <jasper@openbsd.org> +2011-11-12 Jasper Lievisse Adriaanse <jasper@openbsd.org> * README: Update list of supported OpenBSD systems. -2011-08-32 Anthony Green <green@moxielogic.com> +2011-11-12 Anthony Green <green@moxielogic.com> * libtool-version: Update. * Makefile.am (nodist_libffi_la_SOURCES): Add src/debug.c if @@ -18,10 +18,22 @@ * Makefile.in: Rebuilt. * README: Update for 3.0.11. -2011-08-22 Jasper Lievisse Adriaanse <jasper@openbsd.org> +2011-11-10 Richard Henderson <rth@redhat.com> - * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support. - * configure: Rebuilt. + * configure.ac (GCC_AS_CFI_PSEUDO_OP): Use it instead of inline check. + * configure, aclocal.m4: Rebuild. + +2011-09-04 Iain Sandoe <iains@gcc.gnu.org> + + PR libffi/49594 + * src/powerpc/darwin_closure.S (stubs): Make the stub binding + helper reference track the architecture pointer size. + +2011-08-25 Andrew Haley <aph@redhat.com> + + * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Remove hard-coded assembly + instructions. + * src/arm/sysv.S (ffi_arm_trampoline): Put them here instead. 2011-07-11 Andrew Haley <aph@redhat.com> @@ -797,6 +809,11 @@ * man/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. +2011-08-22 Jasper Lievisse Adriaanse <jasper@openbsd.org> + + * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support. + * configure: Rebuilt. + 2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. diff --git a/Makefile.am b/Makefile.am index 84c1d53..2c2444e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,34 +4,36 @@ AUTOMAKE_OPTIONS = foreign subdir-objects SUBDIRS = include testsuite man -EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ - src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ - src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S \ - src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \ - src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \ - src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \ - src/ia64/ia64_flags.h src/ia64/unix.S 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/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/darwin64.S src/x86/ffi.c src/x86/sysv.S \ - src/x86/win32.S src/x86/win64.S src/x86/darwin.S \ - src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S \ - src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c \ - src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/frv/eabi.S \ - src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ - src/moxie/eabi.S libtool-version ChangeLog.libffi \ - m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ - m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh msvcc.sh +EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ + 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/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ + src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ + src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ + src/ia64/unix.S 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/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/darwin64.S \ + src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ + src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \ + src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \ + src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \ + src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ + src/moxie/ffi.c src/moxie/eabi.S libtool-version \ + ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ + m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 build-ios.sh \ + m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ + msvcc.sh + info_TEXINFOS = doc/libffi.texi @@ -158,6 +160,9 @@ endif if FRV nodist_libffi_la_SOURCES += src/frv/eabi.S src/frv/ffi.c endif +if MOXIE +nodist_libffi_la_SOURCES += src/moxie/eabi.S src/moxie/ffi.c +endif if S390 nodist_libffi_la_SOURCES += src/s390/sysv.S src/s390/ffi.c endif diff --git a/Makefile.in b/Makefile.in index ed1cf2e..4dc1103 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,15 +57,16 @@ target_triplet = @target@ @AVR32_TRUE@am__append_19 = src/avr32/sysv.S src/avr32/ffi.c @LIBFFI_CRIS_TRUE@am__append_20 = src/cris/sysv.S src/cris/ffi.c @FRV_TRUE@am__append_21 = src/frv/eabi.S src/frv/ffi.c -@S390_TRUE@am__append_22 = src/s390/sysv.S src/s390/ffi.c -@X86_64_TRUE@am__append_23 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -@SH_TRUE@am__append_24 = src/sh/sysv.S src/sh/ffi.c -@SH64_TRUE@am__append_25 = src/sh64/sysv.S src/sh64/ffi.c -@PA_LINUX_TRUE@am__append_26 = src/pa/linux.S src/pa/ffi.c -@PA_HPUX_TRUE@am__append_27 = src/pa/hpux32.S src/pa/ffi.c +@MOXIE_TRUE@am__append_22 = src/moxie/eabi.S src/moxie/ffi.c +@S390_TRUE@am__append_23 = src/s390/sysv.S src/s390/ffi.c +@X86_64_TRUE@am__append_24 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S +@SH_TRUE@am__append_25 = src/sh/sysv.S src/sh/ffi.c +@SH64_TRUE@am__append_26 = src/sh64/sysv.S src/sh64/ffi.c +@PA_LINUX_TRUE@am__append_27 = src/pa/linux.S src/pa/ffi.c +@PA_HPUX_TRUE@am__append_28 = src/pa/hpux32.S src/pa/ffi.c # Build debug. Define FFI_DEBUG on the commandline so that, when building with # MSVC, it can link against the debug CRT. -@FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG +@FFI_DEBUG_TRUE@am__append_29 = -DFFI_DEBUG subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ @@ -74,7 +75,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ compile config.guess config.sub depcomp install-sh ltmain.sh \ mdate-sh missing texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_cc_maxopt.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ $(top_srcdir)/m4/ax_check_compiler_flags.m4 \ $(top_srcdir)/m4/ax_compiler_vendor.m4 \ @@ -155,13 +157,14 @@ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \ @AVR32_TRUE@am__objects_19 = src/avr32/sysv.lo src/avr32/ffi.lo @LIBFFI_CRIS_TRUE@am__objects_20 = src/cris/sysv.lo src/cris/ffi.lo @FRV_TRUE@am__objects_21 = src/frv/eabi.lo src/frv/ffi.lo -@S390_TRUE@am__objects_22 = src/s390/sysv.lo src/s390/ffi.lo -@X86_64_TRUE@am__objects_23 = src/x86/ffi64.lo src/x86/unix64.lo \ +@MOXIE_TRUE@am__objects_22 = src/moxie/eabi.lo src/moxie/ffi.lo +@S390_TRUE@am__objects_23 = src/s390/sysv.lo src/s390/ffi.lo +@X86_64_TRUE@am__objects_24 = src/x86/ffi64.lo src/x86/unix64.lo \ @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo -@SH_TRUE@am__objects_24 = src/sh/sysv.lo src/sh/ffi.lo -@SH64_TRUE@am__objects_25 = src/sh64/sysv.lo src/sh64/ffi.lo -@PA_LINUX_TRUE@am__objects_26 = src/pa/linux.lo src/pa/ffi.lo -@PA_HPUX_TRUE@am__objects_27 = src/pa/hpux32.lo src/pa/ffi.lo +@SH_TRUE@am__objects_25 = src/sh/sysv.lo src/sh/ffi.lo +@SH64_TRUE@am__objects_26 = src/sh64/sysv.lo src/sh64/ffi.lo +@PA_LINUX_TRUE@am__objects_27 = src/pa/linux.lo src/pa/ffi.lo +@PA_HPUX_TRUE@am__objects_28 = src/pa/hpux32.lo src/pa/ffi.lo nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ @@ -171,17 +174,17 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) \ $(am__objects_21) $(am__objects_22) $(am__objects_23) \ $(am__objects_24) $(am__objects_25) $(am__objects_26) \ - $(am__objects_27) + $(am__objects_27) $(am__objects_28) libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ $(nodist_libffi_la_OBJECTS) libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ libffi_convenience_la_LIBADD = -am__objects_28 = src/prep_cif.lo src/types.lo src/raw_api.lo \ +am__objects_29 = src/prep_cif.lo src/types.lo src/raw_api.lo \ src/java_raw_api.lo src/closures.lo -am_libffi_convenience_la_OBJECTS = $(am__objects_28) -am__objects_29 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ +am_libffi_convenience_la_OBJECTS = $(am__objects_29) +am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ $(am__objects_7) $(am__objects_8) $(am__objects_9) \ $(am__objects_10) $(am__objects_11) $(am__objects_12) \ @@ -189,8 +192,9 @@ am__objects_29 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_16) $(am__objects_17) $(am__objects_18) \ $(am__objects_19) $(am__objects_20) $(am__objects_21) \ $(am__objects_22) $(am__objects_23) $(am__objects_24) \ - $(am__objects_25) $(am__objects_26) $(am__objects_27) -nodist_libffi_convenience_la_OBJECTS = $(am__objects_29) + $(am__objects_25) $(am__objects_26) $(am__objects_27) \ + $(am__objects_28) +nodist_libffi_convenience_la_OBJECTS = $(am__objects_30) libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ $(nodist_libffi_convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ @@ -414,34 +418,35 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign subdir-objects SUBDIRS = include testsuite man -EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ - src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ - src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S \ - src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \ - src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \ - src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \ - src/ia64/ia64_flags.h src/ia64/unix.S 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/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/darwin64.S src/x86/ffi.c src/x86/sysv.S \ - src/x86/win32.S src/x86/win64.S src/x86/darwin.S \ - src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S \ - src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c \ - src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/frv/eabi.S \ - src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ - src/moxie/eabi.S libtool-version ChangeLog.libffi \ - m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ - m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh msvcc.sh +EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ + 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/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ + src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ + src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ + src/ia64/unix.S 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/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/darwin64.S \ + src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ + src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \ + src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \ + src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \ + src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ + src/moxie/ffi.c src/moxie/eabi.S libtool-version \ + ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ + m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 build-ios.sh \ + m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ + msvcc.sh info_TEXINFOS = doc/libffi.texi @@ -501,10 +506,10 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \ $(am__append_18) $(am__append_19) $(am__append_20) \ $(am__append_21) $(am__append_22) $(am__append_23) \ $(am__append_24) $(am__append_25) $(am__append_26) \ - $(am__append_27) + $(am__append_27) $(am__append_28) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) -AM_CFLAGS = -g $(am__append_28) +AM_CFLAGS = -g $(am__append_29) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) -g @@ -772,6 +777,16 @@ src/frv/eabi.lo: src/frv/$(am__dirstamp) \ src/frv/$(DEPDIR)/$(am__dirstamp) src/frv/ffi.lo: src/frv/$(am__dirstamp) \ src/frv/$(DEPDIR)/$(am__dirstamp) +src/moxie/$(am__dirstamp): + @$(MKDIR_P) src/moxie + @: > src/moxie/$(am__dirstamp) +src/moxie/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/moxie/$(DEPDIR) + @: > src/moxie/$(DEPDIR)/$(am__dirstamp) +src/moxie/eabi.lo: src/moxie/$(am__dirstamp) \ + src/moxie/$(DEPDIR)/$(am__dirstamp) +src/moxie/ffi.lo: src/moxie/$(am__dirstamp) \ + src/moxie/$(DEPDIR)/$(am__dirstamp) src/s390/$(am__dirstamp): @$(MKDIR_P) src/s390 @: > src/s390/$(am__dirstamp) @@ -867,6 +882,10 @@ mostlyclean-compile: -rm -f src/mips/n32.lo -rm -f src/mips/o32.$(OBJEXT) -rm -f src/mips/o32.lo + -rm -f src/moxie/eabi.$(OBJEXT) + -rm -f src/moxie/eabi.lo + -rm -f src/moxie/ffi.$(OBJEXT) + -rm -f src/moxie/ffi.lo -rm -f src/pa/ffi.$(OBJEXT) -rm -f src/pa/ffi.lo -rm -f src/pa/hpux32.$(OBJEXT) @@ -965,6 +984,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/n32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/o32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/eabi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/hpux32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/linux.Plo@am__quote@ @@ -1060,6 +1081,7 @@ clean-libtool: -rm -rf src/m32r/.libs src/m32r/_libs -rm -rf src/m68k/.libs src/m68k/_libs -rm -rf src/mips/.libs src/mips/_libs + -rm -rf src/moxie/.libs src/moxie/_libs -rm -rf src/pa/.libs src/pa/_libs -rm -rf src/powerpc/.libs src/powerpc/_libs -rm -rf src/s390/.libs src/s390/_libs @@ -1619,6 +1641,8 @@ distclean-generic: -rm -f src/m68k/$(am__dirstamp) -rm -f src/mips/$(DEPDIR)/$(am__dirstamp) -rm -f src/mips/$(am__dirstamp) + -rm -f src/moxie/$(DEPDIR)/$(am__dirstamp) + -rm -f src/moxie/$(am__dirstamp) -rm -f src/pa/$(DEPDIR)/$(am__dirstamp) -rm -f src/pa/$(am__dirstamp) -rm -f src/powerpc/$(DEPDIR)/$(am__dirstamp) @@ -1644,7 +1668,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) + -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -1764,7 +1788,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) + -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-vti @@ -52,33 +52,27 @@ tested: | Architecture | Operating System | |--------------+------------------| | Alpha | Linux | -| Alpha | OpenBSD | | Alpha | Tru64 | | ARM | Linux | | ARM | iOS | | AVR32 | Linux | | HPPA | HPUX | -| HPPA | OpenBSD | | IA-64 | Linux | | M68K | RTEMS | | MIPS | IRIX | | MIPS | Linux | | MIPS | RTEMS | | MIPS64 | Linux | -| MIPS64 | OpenBSD | | PowerPC | Linux | | PowerPC | Mac OSX | | PowerPC | FreeBSD | -| PowerPC | OpenBSD | | PowerPC64 | Linux | | S390 | Linux | | S390X | Linux | | SPARC | Linux | -| SPARC | OpenBSD | | SPARC | Solaris | | SPARC64 | Linux | | SPARC64 | FreeBSD | -| SPARC64 | OpenBSD | | X86 | FreeBSD | | X86 | Interix | | X86 | kFreeBSD | @@ -1857,6 +1857,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/asmcfi.m4]) m4_include([m4/ax_cc_maxopt.m4]) m4_include([m4/ax_cflags_warn_all.m4]) m4_include([m4/ax_check_compiler_flags.m4]) @@ -13121,6 +13121,10 @@ case "$host" in TARGET=MIPS; TARGETDIR=mips ;; + moxie-*-*) + TARGET=MOXIE; TARGETDIR=moxie + ;; + powerpc*-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc ;; @@ -14027,11 +14031,11 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .cfi pseudo-op support" >&5 $as_echo_n "checking assembler .cfi pseudo-op support... " >&6; } -if ${libffi_cv_as_cfi_pseudo_op+:} false; then : +if ${gcc_cv_as_cfi_pseudo_op+:} false; then : $as_echo_n "(cached) " >&6 else - libffi_cv_as_cfi_pseudo_op=unknown + gcc_cv_as_cfi_pseudo_op=unknown cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ asm (".cfi_startproc\n\t.cfi_endproc"); @@ -14044,20 +14048,21 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - libffi_cv_as_cfi_pseudo_op=yes + gcc_cv_as_cfi_pseudo_op=yes else - libffi_cv_as_cfi_pseudo_op=no + gcc_cv_as_cfi_pseudo_op=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libffi_cv_as_cfi_pseudo_op" >&5 -$as_echo "$libffi_cv_as_cfi_pseudo_op" >&6; } -if test "x$libffi_cv_as_cfi_pseudo_op" = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_cfi_pseudo_op" >&5 +$as_echo "$gcc_cv_as_cfi_pseudo_op" >&6; } + if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then $as_echo "#define HAVE_AS_CFI_PSEUDO_OP 1" >>confdefs.h -fi + fi + if test x$TARGET = xSPARC; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5 diff --git a/configure.ac b/configure.ac index 2ca9a3e..a8adbc2 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,10 @@ case "$host" in TARGET=MIPS; TARGETDIR=mips ;; + moxie-*-*) + TARGET=MOXIE; TARGETDIR=moxie + ;; + powerpc*-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc ;; @@ -245,17 +249,7 @@ AC_SUBST(HAVE_LONG_DOUBLE) AC_C_BIGENDIAN -AC_CACHE_CHECK([assembler .cfi pseudo-op support], - libffi_cv_as_cfi_pseudo_op, [ - libffi_cv_as_cfi_pseudo_op=unknown - AC_TRY_COMPILE([asm (".cfi_startproc\n\t.cfi_endproc");],, - [libffi_cv_as_cfi_pseudo_op=yes], - [libffi_cv_as_cfi_pseudo_op=no]) -]) -if test "x$libffi_cv_as_cfi_pseudo_op" = xyes; then - AC_DEFINE(HAVE_AS_CFI_PSEUDO_OP, 1, - [Define if your assembler supports .cfi_* directives.]) -fi +GCC_AS_CFI_PSEUDO_OP if test x$TARGET = xSPARC; then AC_CACHE_CHECK([assembler and linker support unaligned pc related relocs], diff --git a/doc/libffi.info b/doc/libffi.info index 449320c..c0fb005 100644 --- a/doc/libffi.info +++ b/doc/libffi.info @@ -1,5 +1,5 @@ -This is ../libffi/doc/libffi.info, produced by makeinfo version 4.13 -from ../libffi/doc/libffi.texi. +This is /home/green/libffi/doc/libffi.info, produced by makeinfo +version 4.13 from /home/green/libffi/doc/libffi.texi. This manual is for Libffi, a portable foreign-function interface library. @@ -575,19 +575,19 @@ Index Tag Table: -Node: Top706 -Node: Introduction1448 -Node: Using libffi3084 -Node: The Basics3570 -Node: Simple Example6356 -Node: Types7383 -Node: Primitive Types7666 -Node: Structures9486 -Node: Type Example10346 -Node: Multiple ABIs11569 -Node: The Closure API11940 -Node: Closure Example14884 -Node: Missing Features16443 -Node: Index16936 +Node: Top724 +Node: Introduction1466 +Node: Using libffi3102 +Node: The Basics3588 +Node: Simple Example6374 +Node: Types7401 +Node: Primitive Types7684 +Node: Structures9504 +Node: Type Example10364 +Node: Multiple ABIs11587 +Node: The Closure API11958 +Node: Closure Example14902 +Node: Missing Features16461 +Node: Index16954 End Tag Table diff --git a/doc/stamp-vti b/doc/stamp-vti index 9990071..81d0b79 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 23 August 2011 -@set UPDATED-MONTH August 2011 -@set EDITION 3.0.11-rc1 -@set VERSION 3.0.11-rc1 +@set UPDATED 14 February 2008 +@set UPDATED-MONTH February 2008 +@set EDITION 3.0.8 +@set VERSION 3.0.8 diff --git a/doc/version.texi b/doc/version.texi index 9990071..81d0b79 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 23 August 2011 -@set UPDATED-MONTH August 2011 -@set EDITION 3.0.11-rc1 -@set VERSION 3.0.11-rc1 +@set UPDATED 14 February 2008 +@set UPDATED-MONTH February 2008 +@set EDITION 3.0.8 +@set VERSION 3.0.8 diff --git a/fficonfig.h.in b/fficonfig.h.in index 6c92c56..5d3f3d6 100644 --- a/fficonfig.h.in +++ b/fficonfig.h.in @@ -39,9 +39,6 @@ /* Define if your assembler supports .ascii. */ #undef HAVE_AS_ASCII_PSEUDO_OP -/* Define if your assembler supports .cfi_* directives. */ -#undef HAVE_AS_CFI_PSEUDO_OP - /* Define if your assembler supports .register. */ #undef HAVE_AS_REGISTER_PSEUDO_OP diff --git a/include/Makefile.in b/include/Makefile.in index f3d3ef2..adda034 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -39,7 +39,8 @@ subdir = include DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/ffi.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_cc_maxopt.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ $(top_srcdir)/m4/ax_check_compiler_flags.m4 \ $(top_srcdir)/m4/ax_compiler_vendor.m4 \ diff --git a/m4/asmcfi.m4 b/m4/asmcfi.m4 new file mode 100644 index 0000000..dbf73a0 --- /dev/null +++ b/m4/asmcfi.m4 @@ -0,0 +1,13 @@ +AC_DEFUN([GCC_AS_CFI_PSEUDO_OP], +[AC_CACHE_CHECK([assembler .cfi pseudo-op support], + gcc_cv_as_cfi_pseudo_op, [ + gcc_cv_as_cfi_pseudo_op=unknown + AC_TRY_COMPILE([asm (".cfi_startproc\n\t.cfi_endproc");],, + [gcc_cv_as_cfi_pseudo_op=yes], + [gcc_cv_as_cfi_pseudo_op=no]) + ]) + if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then + AC_DEFINE(HAVE_AS_CFI_PSEUDO_OP, 1, + [Define if your assembler supports .cfi_* directives.]) + fi +]) diff --git a/man/Makefile.in b/man/Makefile.in index 2cb5ea8..b0b65fc 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -37,7 +37,8 @@ target_triplet = @target@ subdir = man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_cc_maxopt.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ $(top_srcdir)/m4/ax_check_compiler_flags.m4 \ $(top_srcdir)/m4/ax_compiler_vendor.m4 \ diff --git a/patches/aix-ibm-xlc b/patches/aix-ibm-xlc index f0744e0..fba9613 100644 --- a/patches/aix-ibm-xlc +++ b/patches/aix-ibm-xlc @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,19 @@ +@@ -50,6 +50,19 @@ * configure: Regenerate. @@ -22,7 +22,7 @@ Index: libffi/ChangeLog 2011-02-09 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libffi/46661 -@@ -43,7 +56,7 @@ +@@ -60,7 +73,7 @@ 2011-02-08 Rafael Avila de Espindola <respindola@mozilla.com> * configure.ac: Fix x86 test for pc related relocs. @@ -178,7 +178,7 @@ Index: libffi/configure =================================================================== --- libffi.orig/configure +++ libffi/configure -@@ -13313,67 +13313,69 @@ $as_echo "#define HAVE_AS_X86_64_UNWIND_ +@@ -13285,67 +13285,69 @@ $as_echo "#define HAVE_AS_X86_64_UNWIND_ fi fi @@ -277,7 +277,7 @@ Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac +++ libffi/configure.ac -@@ -351,44 +351,46 @@ if test x$TARGET = xX86_64; then +@@ -345,44 +345,46 @@ if test x$TARGET = xX86_64; then fi fi diff --git a/patches/bad-abi-fix b/patches/bad-abi-fix index dc89ec5..f190183 100644 --- a/patches/bad-abi-fix +++ b/patches/bad-abi-fix @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,23 @@ +@@ -50,6 +50,23 @@ * configure: Regenerate. diff --git a/patches/darwin-EH-fix b/patches/darwin-EH-fix index d5eef38..7fee260 100644 --- a/patches/darwin-EH-fix +++ b/patches/darwin-EH-fix @@ -28,7 +28,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -29,6 +29,11 @@ +@@ -46,6 +46,11 @@ Use them to handle ELF vs. ECOFF differences. [__osf__] (_GLOBAL__F_ffi_call_osf): Define. diff --git a/patches/debug-build b/patches/debug-build index 3c76b0a..3b7eaf6 100644 --- a/patches/debug-build +++ b/patches/debug-build @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -165,6 +165,13 @@ +@@ -182,6 +182,13 @@ * testsuite/libffi.call/cls_longdouble.c: Likewise. * testsuite/libffi.call/huge_struct.c: Likewise. @@ -20,7 +20,7 @@ Index: libffi/Makefile.am =================================================================== --- libffi.orig/Makefile.am +++ libffi/Makefile.am -@@ -177,6 +177,14 @@ libffi_convenience_la_SOURCES = $(libffi +@@ -180,6 +180,14 @@ libffi_convenience_la_SOURCES = $(libffi nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions @@ -54,7 +54,7 @@ Index: libffi/configure.ac m4_undefine([_AC_ARG_VAR_PRECIOUS]) m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -@@ -406,6 +410,7 @@ AC_ARG_ENABLE(debug, +@@ -400,6 +404,7 @@ AC_ARG_ENABLE(debug, if test "$enable_debug" = "yes"; then AC_DEFINE(FFI_DEBUG, 1, [Define this if you want extra debugging.]) fi) @@ -66,24 +66,24 @@ Index: libffi/Makefile.in =================================================================== --- libffi.orig/Makefile.in +++ libffi/Makefile.in -@@ -61,6 +61,11 @@ target_triplet = @target@ - @SH64_TRUE@am__append_23 = src/sh64/sysv.S src/sh64/ffi.c - @PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c - @PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c +@@ -62,6 +62,11 @@ target_triplet = @target@ + @SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c + @PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c + @PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c +# Build debug. Define FFI_DEBUG on the commandline so that, when building with +# MSVC, it can link against the debug CRT. -+@FFI_DEBUG_TRUE@am__append_26 = -DFFI_DEBUG ++@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG +# Build opt. -+@FFI_DEBUG_FALSE@am__append_27 = -O2 ++@FFI_DEBUG_FALSE@am__append_28 = -O2 subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ @@ -486,7 +491,7 @@ nodist_libffi_la_SOURCES = $(am__append_ - $(am__append_24) $(am__append_25) + $(am__append_24) $(am__append_25) $(am__append_26) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) -AM_CFLAGS = -Wall -g -fexceptions -+AM_CFLAGS = -Wall -g -fexceptions $(am__append_26) $(am__append_27) ++AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) @@ -121,7 +121,7 @@ Index: libffi/configure -@@ -13330,6 +13336,14 @@ $as_echo "#define FFI_DEBUG 1" >>confdef +@@ -13302,6 +13308,14 @@ $as_echo "#define FFI_DEBUG 1" >>confdef fi fi @@ -136,7 +136,7 @@ Index: libffi/configure # Check whether --enable-structs was given. if test "${enable_structs+set}" = set; then : -@@ -13644,6 +13658,10 @@ if test -z "${PA64_HPUX_TRUE}" && test - +@@ -13616,6 +13630,10 @@ if test -z "${PA64_HPUX_TRUE}" && test - Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi diff --git a/patches/ffi_last_abi b/patches/ffi_last_abi index 04de395..aa99f5d 100644 --- a/patches/ffi_last_abi +++ b/patches/ffi_last_abi @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -165,6 +165,12 @@ +@@ -182,6 +182,12 @@ * testsuite/libffi.call/cls_longdouble.c: Likewise. * testsuite/libffi.call/huge_struct.c: Likewise. diff --git a/patches/fix-grammar b/patches/fix-grammar index 36b4379..c0a9aff 100644 --- a/patches/fix-grammar +++ b/patches/fix-grammar @@ -15,7 +15,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -42,6 +42,10 @@ +@@ -59,6 +59,10 @@ instructions. * src/powerpc/aix_closure.S: Declare .ffi_closure_helper_DARWIN. diff --git a/patches/fix-ppc32 b/patches/fix-ppc32 index 68c2286..a1973b7 100644 --- a/patches/fix-ppc32 +++ b/patches/fix-ppc32 @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -29,6 +29,11 @@ +@@ -46,6 +46,11 @@ Use them to handle ELF vs. ECOFF differences. [__osf__] (_GLOBAL__F_ffi_call_osf): Define. diff --git a/patches/fix-xfails b/patches/fix-xfails index 369e9db..67bdd5c 100644 --- a/patches/fix-xfails +++ b/patches/fix-xfails @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -35,7 +35,12 @@ +@@ -52,7 +52,12 @@ 2011-02-09 Anthony Green <green@moxielogic.com> @@ -16,7 +16,7 @@ Index: libffi/ChangeLog 2011-02-09 Landon Fuller <landonf@macports.org> -@@ -55,6 +60,7 @@ +@@ -72,6 +77,7 @@ * src/closures.c: Handle FFI_EXEC_TRAMPOLINE_TABLE case. * build-ios.sh: New file. * fficonfig.h.in, configure, Makefile.in: Rebuilt. diff --git a/patches/fix_maxopt b/patches/fix_maxopt index 38ae812..3d4faf2 100644 --- a/patches/fix_maxopt +++ b/patches/fix_maxopt @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -29,6 +29,11 @@ +@@ -46,6 +46,11 @@ Use them to handle ELF vs. ECOFF differences. [__osf__] (_GLOBAL__F_ffi_call_osf): Define. @@ -14,1665 +14,6 @@ Index: libffi/ChangeLog 2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure: Regenerate. -Index: libffi/configure -=================================================================== ---- libffi.orig/configure -+++ libffi/configure -@@ -621,6 +621,9 @@ FFI_DEBUG_FALSE - FFI_DEBUG_TRUE - TARGETDIR - TARGET -+FFI_EXEC_TRAMPOLINE_TABLE -+FFI_EXEC_TRAMPOLINE_TABLE_FALSE -+FFI_EXEC_TRAMPOLINE_TABLE_TRUE - sys_symbol_underscore - HAVE_LONG_DOUBLE - ALLOCA -@@ -685,6 +688,7 @@ TESTSUBDIR_TRUE - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE -+PRTDIAG - CPP - OTOOL64 - OTOOL -@@ -751,6 +755,7 @@ am__isrc - INSTALL_DATA - INSTALL_SCRIPT - INSTALL_PROGRAM -+ax_enable_builddir_sed - target_os - target_vendor - target_cpu -@@ -804,6 +809,7 @@ SHELL' - ac_subst_files='' - ac_user_opts=' - enable_option_checking -+enable_builddir - enable_dependency_tracking - enable_shared - enable_static -@@ -812,6 +818,8 @@ enable_fast_install - with_gnu_ld - with_sysroot - enable_libtool_lock -+enable_portable_binary -+with_gcc_arch - enable_maintainer_mode - enable_debug - enable_structs -@@ -1446,6 +1454,8 @@ Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --disable-builddir disable automatic build in subdir of sources -+ - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] build shared libraries [default=yes] -@@ -1453,6 +1463,9 @@ Optional Features: - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) -+ --enable-portable-binary -+ disable compiler optimizations that would produce -+ unportable binaries - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-debug debugging mode -@@ -1468,6 +1481,8 @@ Optional Packages: - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). -+ --with-gcc-arch=<arch> use architecture <arch> for gcc -march/-mtune, -+ instead of guessing - - Some influential environment variables: - CC C compiler command -@@ -2643,6 +2658,110 @@ target_alias=${target_alias-$host_alias} - - . ${srcdir}/configure.host - -+ -+ # [$]@ is unsable in 2.60+ but earlier autoconf had no ac_configure_args -+ if test "${ac_configure_args+set}" != "set" ; then -+ ac_configure_args= -+ for ac_arg in ${1+"$@"}; do -+ ac_configure_args="$ac_configure_args '$ac_arg'" -+ done -+ fi -+ -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+ -+ -+ax_enable_builddir="." -+# Check whether --enable-builddir was given. -+if test "${enable_builddir+set}" = set; then : -+ enableval=$enable_builddir; ax_enable_builddir="$enableval" -+else -+ ax_enable_builddir="auto" -+fi -+ -+if test ".$ac_srcdir_defaulted" != ".no" ; then -+if test ".$srcdir" = ".." ; then -+ if test -f config.status ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: toplevel srcdir already configured... skipping subdir build" >&5 -+$as_echo "$as_me: toplevel srcdir already configured... skipping subdir build" >&6;} -+ else -+ test ".$ax_enable_builddir" = "." && ax_enable_builddir="." -+ test ".$ax_enable_builddir" = ".no" && ax_enable_builddir="." -+ test ".$TARGET" = "." && TARGET="$target" -+ test ".$ax_enable_builddir" = ".auto" && ax_enable_builddir="$TARGET" -+ if test ".$ax_enable_builddir" != ".." ; then # we know where to go and -+ as_dir=$ax_enable_builddir; as_fn_mkdir_p -+ echo __.$ax_enable_builddir.__ > $ax_enable_builddir/conftest.tmp -+ cd $ax_enable_builddir -+ if grep __.$ax_enable_builddir.__ conftest.tmp >/dev/null 2>/dev/null ; then -+ rm conftest.tmp -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: continue configure in default builddir \"./$ax_enable_builddir\"" >&5 -+$as_echo "continue configure in default builddir \"./$ax_enable_builddir\"" >&6; } -+ else -+ as_fn_error $? "could not change to default builddir \"./$ax_enable_builddir\"" "$LINENO" 5 -+ fi -+ srcdir=`echo "$ax_enable_builddir" | -+ sed -e 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g;s,[/]$,,;'` -+ # going to restart from subdirectory location -+ test -f $srcdir/config.log && mv $srcdir/config.log . -+ test -f $srcdir/confdefs.h && mv $srcdir/confdefs.h . -+ test -f $srcdir/conftest.log && mv $srcdir/conftest.log . -+ test -f $srcdir/$cache_file && mv $srcdir/$cache_file . -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ....exec $SHELL $srcdir/$0 \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" ${1+\"$@\"}" >&5 -+$as_echo "....exec $SHELL $srcdir/$0 \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" ${1+\"$@\"}" >&6; } -+ case "$0" in # restart -+ /\\*) eval $SHELL "'$0'" "'--srcdir=$srcdir'" "'--enable-builddir=$ax_enable_builddir'" $ac_configure_args ;; -+ *) eval $SHELL "'$srcdir/$0'" "'--srcdir=$srcdir'" "'--enable-builddir=$ax_enable_builddir'" $ac_configure_args ;; -+ esac ; exit $? -+ fi -+ fi -+fi fi -+test ".$ax_enable_builddir" = ".auto" && ax_enable_builddir="." -+# Extract the first word of "gsed sed", so it can be a program name with args. -+set dummy gsed sed; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_ax_enable_builddir_sed+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $ax_enable_builddir_sed in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ax_enable_builddir_sed="$ax_enable_builddir_sed" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_ax_enable_builddir_sed="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_ax_enable_builddir_sed" && ac_cv_path_ax_enable_builddir_sed="sed" -+ ;; -+esac -+fi -+ax_enable_builddir_sed=$ac_cv_path_ax_enable_builddir_sed -+if test -n "$ax_enable_builddir_sed"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_enable_builddir_sed" >&5 -+$as_echo "$ax_enable_builddir_sed" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ax_enable_builddir_auxdir="$am_aux_dir" -+ac_config_commands="$ac_config_commands buildir" -+ -+ - am__api_version='1.11' - - # Find a good install program. We prefer a C program (faster), -@@ -2800,9 +2919,6 @@ test "$program_suffix" != NONE && - ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' - program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` -- - if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) -@@ -11835,205 +11951,1090 @@ CC="$lt_save_CC" - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 --$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -- # Check whether --enable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then : -- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval --else -- USE_MAINTAINER_MODE=no --fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 --$as_echo "$USE_MAINTAINER_MODE" >&6; } -- if test $USE_MAINTAINER_MODE = yes; then -- MAINTAINER_MODE_TRUE= -- MAINTAINER_MODE_FALSE='#' -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5 -+$as_echo_n "checking for C compiler vendor... " >&6; } -+if ${ax_cv_c_compiler_vendor+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- MAINTAINER_MODE_TRUE='#' -- MAINTAINER_MODE_FALSE= --fi -- -- MAINT=$MAINTAINER_MODE_TRUE -+ ax_cv_c_compiler_vendor=unknown -+ # note: don't check for gcc first since some other compilers define __GNUC__ -+ for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ clang:__clang__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do -+ vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+int -+main () -+{ - -+#if !($vencpp) -+ thisisanerror; -+#endif - --for ac_header in sys/mman.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_mman_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_MMAN_H 1 -+ ; -+ return 0; -+} - _ACEOF -- -+if ac_fn_c_try_compile "$LINENO"; then : -+ ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done - --done -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_vendor" >&5 -+$as_echo "$ax_cv_c_compiler_vendor" >&6; } - --for ac_func in mmap --do : -- ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" --if test "x$ac_cv_func_mmap" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_MMAP 1 --_ACEOF - --fi --done - - --ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_mman_h" = xyes; then : -- libffi_header_sys_mman_h=yes --else -- libffi_header_sys_mman_h=no --fi - - --ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" --if test "x$ac_cv_func_mmap" = xyes; then : -- libffi_func_mmap=yes -+# Check whether --enable-portable-binary was given. -+if test "${enable_portable_binary+set}" = set; then : -+ enableval=$enable_portable_binary; acx_maxopt_portable=$withval - else -- libffi_func_mmap=no -+ acx_maxopt_portable=no - fi - --if test "$libffi_header_sys_mman_h" != yes \ -- || test "$libffi_func_mmap" != yes; then -- ac_cv_func_mmap_file=no -- ac_cv_func_mmap_dev_zero=no -- ac_cv_func_mmap_anon=no --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether read-only mmap of a plain file works" >&5 --$as_echo_n "checking whether read-only mmap of a plain file works... " >&6; } --if ${ac_cv_func_mmap_file+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- # Add a system to this blacklist if -- # mmap(0, stat_size, PROT_READ, MAP_PRIVATE, fd, 0) doesn't return a -- # memory area containing the same data that you'd get if you applied -- # read() to the same fd. The only system known to have a problem here -- # is VMS, where text files have record structure. -- case "$host_os" in -- vms* | ultrix*) -- ac_cv_func_mmap_file=no ;; -- *) -- ac_cv_func_mmap_file=yes;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_file" >&5 --$as_echo "$ac_cv_func_mmap_file" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap from /dev/zero works" >&5 --$as_echo_n "checking whether mmap from /dev/zero works... " >&6; } --if ${ac_cv_func_mmap_dev_zero+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- # Add a system to this blacklist if it has mmap() but /dev/zero -- # does not exist, or if mmapping /dev/zero does not give anonymous -- # zeroed pages with both the following properties: -- # 1. If you map N consecutive pages in with one call, and then -- # unmap any subset of those pages, the pages that were not -- # explicitly unmapped remain accessible. -- # 2. If you map two adjacent blocks of memory and then unmap them -- # both at once, they must both go away. -- # Systems known to be in this category are Windows (all variants), -- # VMS, and Darwin. -- case "$host_os" in -- vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) -- ac_cv_func_mmap_dev_zero=no ;; -- *) -- ac_cv_func_mmap_dev_zero=yes;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_dev_zero" >&5 --$as_echo "$ac_cv_func_mmap_dev_zero" >&6; } - -- # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5 --$as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; } --if ${ac_cv_decl_map_anon+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+# Try to determine "good" native compiler flags if none specified via CFLAGS -+if test "$ac_test_CFLAGS" != "set"; then -+ CFLAGS="" -+ case $ax_cv_c_compiler_vendor in -+ dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host" -+ if test "x$acx_maxopt_portable" = xno; then -+ CFLAGS="$CFLAGS -arch host" -+ fi;; -+ -+ sun) CFLAGS="-native -fast -xO5 -dalign" -+ if test "x$acx_maxopt_portable" = xyes; then -+ CFLAGS="$CFLAGS -xarch=generic" -+ fi;; -+ -+ hp) CFLAGS="+Oall +Optrs_ansi +DSnative" -+ if test "x$acx_maxopt_portable" = xyes; then -+ CFLAGS="$CFLAGS +DAportable" -+ fi;; -+ -+ ibm) if test "x$acx_maxopt_portable" = xno; then -+ xlc_opt="-qarch=auto -qtune=auto" -+ else -+ xlc_opt="-qtune=auto" -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $xlc_opt" >&5 -+$as_echo_n "checking whether C compiler accepts $xlc_opt... " >&6; } -+ax_save_FLAGS=$CFLAGS -+ CFLAGS="$xlc_opt" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <sys/types.h> --#include <sys/mman.h> --#include <unistd.h> -- --#ifndef MAP_ANONYMOUS --#define MAP_ANONYMOUS MAP_ANON --#endif - - int - main () - { --int n = MAP_ANONYMOUS; -+ - ; - return 0; - } - _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_decl_map_anon=yes -+ eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=yes - else -- ac_cv_decl_map_anon=no -+ eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_map_anon" >&5 --$as_echo "$ac_cv_decl_map_anon" >&6; } -+ CFLAGS=$ax_save_FLAGS -+eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 -+$as_echo "$ax_check_compiler_flags" >&6; } -+if test "x$ax_check_compiler_flags" = xyes; then -+ CFLAGS="-O3 -qansialias -w $xlc_opt" -+else -+ CFLAGS="-O3 -qansialias -w" -+ echo "******************************************************" -+ echo "* You seem to have the IBM C compiler. It is *" -+ echo "* recommended for best performance that you use: *" -+ echo "* *" -+ echo "* CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *" -+ echo "* ^^^ ^^^ *" -+ echo "* where xxx is pwr2, pwr3, 604, or whatever kind of *" -+ echo "* CPU you have. (Set the CFLAGS environment var. *" -+ echo "* and re-run configure.) For more info, man cc. *" -+ echo "******************************************************" -+fi -+ -+ ;; -+ -+ intel) CFLAGS="-O3 -ansi_alias" -+ if test "x$acx_maxopt_portable" = xno; then -+ icc_archflag=unknown -+ icc_flags="" -+ case $host_cpu in -+ i686*|x86_64*) -+ # icc accepts gcc assembly syntax, so these should work: - -- if test $ac_cv_decl_map_anon = no; then -- ac_cv_func_mmap_anon=no -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap with MAP_ANON(YMOUS) works" >&5 --$as_echo_n "checking whether mmap with MAP_ANON(YMOUS) works... " >&6; } --if ${ac_cv_func_mmap_anon+:} false; then : -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5 -+$as_echo_n "checking for x86 cpuid 0 output... " >&6; } -+if ${ax_cv_gcc_x86_cpuid_0+:} false; then : - $as_echo_n "(cached) " >&6 - else -- # Add a system to this blacklist if it has mmap() and MAP_ANON or -- # MAP_ANONYMOUS, but using mmap(..., MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) -- # doesn't give anonymous zeroed pages with the same properties listed -- # above for use of /dev/zero. -- # Systems known to be in this category are Windows, VMS, and SCO Unix. -- case "$host_os" in -- vms* | cygwin* | pe | mingw* | sco* | udk* ) -- ac_cv_func_mmap_anon=no ;; -- *) -- ac_cv_func_mmap_anon=yes;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_anon" >&5 --$as_echo "$ac_cv_func_mmap_anon" >&6; } -- fi --fi -- --if test $ac_cv_func_mmap_file = yes; then -+ if test "$cross_compiling" = yes; then : -+ ax_cv_gcc_x86_cpuid_0=unknown -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ - --$as_echo "#define HAVE_MMAP_FILE 1" >>confdefs.h -+ int op = 0, eax, ebx, ecx, edx; -+ FILE *f; -+ __asm__("cpuid" -+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -+ : "a" (op)); -+ f = fopen("conftest_cpuid", "w"); if (!f) return 1; -+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -+ fclose(f); -+ return 0; - -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid -+else -+ ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid - fi --if test $ac_cv_func_mmap_dev_zero = yes; then -- --$as_echo "#define HAVE_MMAP_DEV_ZERO 1" >>confdefs.h -- -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi --if test $ac_cv_func_mmap_anon = yes; then -- --$as_echo "#define HAVE_MMAP_ANON 1" >>confdefs.h - - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0" >&5 -+$as_echo "$ax_cv_gcc_x86_cpuid_0" >&6; } -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- if test -d $srcdir/testsuite; then -- TESTSUBDIR_TRUE= -- TESTSUBDIR_FALSE='#' --else -- TESTSUBDIR_TRUE='#' -- TESTSUBDIR_FALSE= --fi - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - --TARGETDIR="unknown" --case "$host" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5 -+$as_echo_n "checking for x86 cpuid 1 output... " >&6; } -+if ${ax_cv_gcc_x86_cpuid_1+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ax_cv_gcc_x86_cpuid_1=unknown -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+ -+ int op = 1, eax, ebx, ecx, edx; -+ FILE *f; -+ __asm__("cpuid" -+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -+ : "a" (op)); -+ f = fopen("conftest_cpuid", "w"); if (!f) return 1; -+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -+ fclose(f); -+ return 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid -+else -+ ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_1" >&5 -+$as_echo "$ax_cv_gcc_x86_cpuid_1" >&6; } -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG -+ *:756e6547:*:*) # Intel -+ case $ax_cv_gcc_x86_cpuid_1 in -+ *6a?:*[234]:*:*|*6[789b]?:*:*:*) icc_flags="-xK";; -+ *f3[347]:*:*:*|*f41347:*:*:*) icc_flags="-xP -xN -xW -xK";; -+ *f??:*:*:*) icc_flags="-xN -xW -xK";; -+ esac ;; -+ esac ;; -+ esac -+ if test "x$icc_flags" != x; then -+ for flag in $icc_flags; do -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -+$as_echo_n "checking whether C compiler accepts $flag... " >&6; } -+ax_save_FLAGS=$CFLAGS -+ CFLAGS="$flag" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes -+else -+ eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$ax_save_FLAGS -+eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 -+$as_echo "$ax_check_compiler_flags" >&6; } -+if test "x$ax_check_compiler_flags" = xyes; then -+ icc_archflag=$flag; break -+else -+ : -+fi -+ -+ done -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc architecture flag" >&5 -+$as_echo_n "checking for icc architecture flag... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icc_archflag" >&5 -+$as_echo "$icc_archflag" >&6; } -+ if test "x$icc_archflag" != xunknown; then -+ CFLAGS="$CFLAGS $icc_archflag" -+ fi -+ fi -+ ;; -+ -+ gnu) -+ # default optimization flags for gcc on all systems -+ CFLAGS="-O3 -fomit-frame-pointer" -+ -+ # -fstrict-aliasing for gcc-2.95+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5 -+$as_echo_n "checking whether C compiler accepts -fstrict-aliasing... " >&6; } -+if ${ax_cv_c_flags__fstrict_aliasing+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ ax_save_FLAGS=$CFLAGS -+ CFLAGS="-fstrict-aliasing" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ax_cv_c_flags__fstrict_aliasing=yes -+else -+ ax_cv_c_flags__fstrict_aliasing=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$ax_save_FLAGS -+fi -+ -+eval ax_check_compiler_flags=$ax_cv_c_flags__fstrict_aliasing -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 -+$as_echo "$ax_check_compiler_flags" >&6; } -+if test "x$ax_check_compiler_flags" = xyes; then -+ CFLAGS="$CFLAGS -fstrict-aliasing" -+else -+ : -+fi -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffast-math" >&5 -+$as_echo_n "checking whether C compiler accepts -ffast-math... " >&6; } -+if ${ax_cv_c_flags__ffast_math+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ ax_save_FLAGS=$CFLAGS -+ CFLAGS="-ffast-math" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ax_cv_c_flags__ffast_math=yes -+else -+ ax_cv_c_flags__ffast_math=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$ax_save_FLAGS -+fi -+ -+eval ax_check_compiler_flags=$ax_cv_c_flags__ffast_math -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 -+$as_echo "$ax_check_compiler_flags" >&6; } -+if test "x$ax_check_compiler_flags" = xyes; then -+ CFLAGS="$CFLAGS -ffast-math" -+else -+ : -+fi -+ -+ -+ -+ -+ -+ -+# Check whether --with-gcc-arch was given. -+if test "${with_gcc_arch+set}" = set; then : -+ withval=$with_gcc_arch; ax_gcc_arch=$withval -+else -+ ax_gcc_arch=yes -+fi -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc architecture flag" >&5 -+$as_echo_n "checking for gcc architecture flag... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -+$as_echo "" >&6; } -+if ${ax_cv_gcc_archflag+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ax_cv_gcc_archflag="unknown" -+ -+if test "$GCC" = yes; then -+ -+if test "x$ax_gcc_arch" = xyes; then -+ax_gcc_arch="" -+if test "$cross_compiling" = no; then -+case $host_cpu in -+ i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5 -+$as_echo_n "checking for x86 cpuid 0 output... " >&6; } -+if ${ax_cv_gcc_x86_cpuid_0+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ax_cv_gcc_x86_cpuid_0=unknown -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+ -+ int op = 0, eax, ebx, ecx, edx; -+ FILE *f; -+ __asm__("cpuid" -+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -+ : "a" (op)); -+ f = fopen("conftest_cpuid", "w"); if (!f) return 1; -+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -+ fclose(f); -+ return 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid -+else -+ ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0" >&5 -+$as_echo "$ax_cv_gcc_x86_cpuid_0" >&6; } -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5 -+$as_echo_n "checking for x86 cpuid 1 output... " >&6; } -+if ${ax_cv_gcc_x86_cpuid_1+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ax_cv_gcc_x86_cpuid_1=unknown -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+ -+ int op = 1, eax, ebx, ecx, edx; -+ FILE *f; -+ __asm__("cpuid" -+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -+ : "a" (op)); -+ f = fopen("conftest_cpuid", "w"); if (!f) return 1; -+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -+ fclose(f); -+ return 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid -+else -+ ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_1" >&5 -+$as_echo "$ax_cv_gcc_x86_cpuid_1" >&6; } -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ case $ax_cv_gcc_x86_cpuid_0 in -+ *:756e6547:*:*) # Intel -+ case $ax_cv_gcc_x86_cpuid_1 in -+ *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;; -+ *5??:*:*:*) ax_gcc_arch=pentium ;; -+ *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -+ *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -+ *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -+ *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; -+ *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -+ *6??:*:*:*) ax_gcc_arch=pentiumpro ;; -+ *f3[347]:*:*:*|*f41347:*:*:*) -+ case $host_cpu in -+ x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;; -+ *) ax_gcc_arch="prescott pentium4 pentiumpro" ;; -+ esac ;; -+ *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";; -+ esac ;; -+ *:68747541:*:*) # AMD -+ case $ax_cv_gcc_x86_cpuid_1 in -+ *5[67]?:*:*:*) ax_gcc_arch=k6 ;; -+ *5[8d]?:*:*:*) ax_gcc_arch="k6-2 k6" ;; -+ *5[9]?:*:*:*) ax_gcc_arch="k6-3 k6" ;; -+ *60?:*:*:*) ax_gcc_arch=k7 ;; -+ *6[12]?:*:*:*) ax_gcc_arch="athlon k7" ;; -+ *6[34]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;; -+ *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;; -+ *6[68a]?:*:*:*) -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0x80000006 output" >&5 -+$as_echo_n "checking for x86 cpuid 0x80000006 output... " >&6; } -+if ${ax_cv_gcc_x86_cpuid_0x80000006+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ax_cv_gcc_x86_cpuid_0x80000006=unknown -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+ -+ int op = 0x80000006, eax, ebx, ecx, edx; -+ FILE *f; -+ __asm__("cpuid" -+ : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -+ : "a" (op)); -+ f = fopen("conftest_cpuid", "w"); if (!f) return 1; -+ fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -+ fclose(f); -+ return 0; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ax_cv_gcc_x86_cpuid_0x80000006=`cat conftest_cpuid`; rm -f conftest_cpuid -+else -+ ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5 -+$as_echo "$ax_cv_gcc_x86_cpuid_0x80000006" >&6; } -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ # L2 cache size -+ case $ax_cv_gcc_x86_cpuid_0x80000006 in -+ *:*:*[1-9a-f]??????:*) # (L2 = ecx >> 16) >= 256 -+ ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;; -+ *) ax_gcc_arch="athlon-4 athlon k7" ;; -+ esac ;; -+ *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; -+ *f5?:*:*:*) ax_gcc_arch="opteron k8" ;; -+ *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;; -+ *f??:*:*:*) ax_gcc_arch="k8" ;; -+ esac ;; -+ *:746e6543:*:*) # IDT -+ case $ax_cv_gcc_x86_cpuid_1 in -+ *54?:*:*:*) ax_gcc_arch=winchip-c6 ;; -+ *58?:*:*:*) ax_gcc_arch=winchip2 ;; -+ *6[78]?:*:*:*) ax_gcc_arch=c3 ;; -+ *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;; -+ esac ;; -+ esac -+ if test x"$ax_gcc_arch" = x; then # fallback -+ case $host_cpu in -+ i586*) ax_gcc_arch=pentium ;; -+ i686*) ax_gcc_arch=pentiumpro ;; -+ esac -+ fi -+ ;; -+ -+ sparc*) -+ # Extract the first word of "prtdiag", so it can be a program name with args. -+set dummy prtdiag; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_PRTDIAG+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $PRTDIAG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PRTDIAG="$PRTDIAG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_dummy="$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/" -+for as_dir in $as_dummy -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_PRTDIAG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_PRTDIAG" && ac_cv_path_PRTDIAG="prtdiag" -+ ;; -+esac -+fi -+PRTDIAG=$ac_cv_path_PRTDIAG -+if test -n "$PRTDIAG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRTDIAG" >&5 -+$as_echo "$PRTDIAG" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` -+ cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters` -+ case $cputype in -+ *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; -+ *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; -+ *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;; -+ *supersparc*|*tms390z5[05]*) ax_gcc_arch="supersparc v8" ;; -+ *hypersparc*|*rt62[056]*) ax_gcc_arch="hypersparc v8" ;; -+ *cypress*) ax_gcc_arch=cypress ;; -+ esac ;; -+ -+ alphaev5) ax_gcc_arch=ev5 ;; -+ alphaev56) ax_gcc_arch=ev56 ;; -+ alphapca56) ax_gcc_arch="pca56 ev56" ;; -+ alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;; -+ alphaev6) ax_gcc_arch=ev6 ;; -+ alphaev67) ax_gcc_arch=ev67 ;; -+ alphaev68) ax_gcc_arch="ev68 ev67" ;; -+ alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;; -+ alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;; -+ alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;; -+ -+ powerpc*) -+ cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null` -+ cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'` -+ case $cputype in -+ *750*) ax_gcc_arch="750 G3" ;; -+ *740[0-9]*) ax_gcc_arch="$cputype 7400 G4" ;; -+ *74[4-5][0-9]*) ax_gcc_arch="$cputype 7450 G4" ;; -+ *74[0-9][0-9]*) ax_gcc_arch="$cputype G4" ;; -+ *970*) ax_gcc_arch="970 G5 power4";; -+ *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";; -+ *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";; -+ 603ev|8240) ax_gcc_arch="$cputype 603e 603";; -+ *) ax_gcc_arch=$cputype ;; -+ esac -+ ax_gcc_arch="$ax_gcc_arch powerpc" -+ ;; -+esac -+fi # not cross-compiling -+fi # guess arch -+ -+if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then -+for arch in $ax_gcc_arch; do -+ if test "x$acx_maxopt_portable" = xyes; then # if we require portable code -+ flags="-mtune=$arch" -+ # -mcpu=$arch and m$arch generate nonportable code on every arch except -+ # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. -+ case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac -+ else -+ flags="-march=$arch -mcpu=$arch -m$arch" -+ fi -+ for flag in $flags; do -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -+$as_echo_n "checking whether C compiler accepts $flag... " >&6; } -+ax_save_FLAGS=$CFLAGS -+ CFLAGS="$flag" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes -+else -+ eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$ax_save_FLAGS -+eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 -+$as_echo "$ax_check_compiler_flags" >&6; } -+if test "x$ax_check_compiler_flags" = xyes; then -+ ax_cv_gcc_archflag=$flag; break -+else -+ : -+fi -+ -+ done -+ test "x$ax_cv_gcc_archflag" = xunknown || break -+done -+fi -+ -+fi # $GCC=yes -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc architecture flag" >&5 -+$as_echo_n "checking for gcc architecture flag... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_archflag" >&5 -+$as_echo "$ax_cv_gcc_archflag" >&6; } -+if test "x$ax_cv_gcc_archflag" = xunknown; then -+ : -+else -+ CFLAGS="$CFLAGS $ax_cv_gcc_archflag" -+fi -+ -+ ;; -+ esac -+ -+ if test -z "$CFLAGS"; then -+ echo "" -+ echo "********************************************************" -+ echo "* WARNING: Don't know the best CFLAGS for this system *" -+ echo "* Use ./configure CFLAGS=... to specify your own flags *" -+ echo "* (otherwise, a default of CFLAGS=-O3 will be used) *" -+ echo "********************************************************" -+ echo "" -+ CFLAGS="-O3" -+ fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CFLAGS" >&5 -+$as_echo_n "checking whether C compiler accepts $CFLAGS... " >&6; } -+ax_save_FLAGS=$CFLAGS -+ CFLAGS="$CFLAGS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=yes -+else -+ eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS=$ax_save_FLAGS -+eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 -+$as_echo "$ax_check_compiler_flags" >&6; } -+if test "x$ax_check_compiler_flags" = xyes; then -+ : -+else -+ -+ echo "" -+ echo "********************************************************" -+ echo "* WARNING: The guessed CFLAGS don't seem to work with *" -+ echo "* your compiler. *" -+ echo "* Use ./configure CFLAGS=... to specify your own flags *" -+ echo "********************************************************" -+ echo "" -+ CFLAGS="" -+ -+fi -+ -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5 -+$as_echo_n "checking CFLAGS for maximum warnings... " >&6; } -+if ${ac_cv_cflags_warn_all+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_cflags_warn_all="no, unknown" -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ ac_save_CFLAGS="$CFLAGS" -+for ac_arg in "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # -+do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+ CFLAGS="$ac_save_CFLAGS" -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5 -+$as_echo "$ac_cv_cflags_warn_all" >&6; } -+case ".$ac_cv_cflags_warn_all" in -+ .ok|.ok,*) ;; -+ .|.no|.no,*) -+ ;; -+ *) -+ if echo " $CFLAGS " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null -+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_warn_all"; } >&5 -+ (: CFLAGS does contain $ac_cv_cflags_warn_all) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\""; } >&5 -+ (: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ CFLAGS="$CFLAGS $ac_cv_cflags_warn_all" -+ fi -+ ;; -+esac -+ -+if test "x$GCC" = "xyes"; then -+ CFLAGS="$CFLAGS -fexceptions" -+fi -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -+ # Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then : -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -+else -+ USE_MAINTAINER_MODE=no -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -+$as_echo "$USE_MAINTAINER_MODE" >&6; } -+ if test $USE_MAINTAINER_MODE = yes; then -+ MAINTAINER_MODE_TRUE= -+ MAINTAINER_MODE_FALSE='#' -+else -+ MAINTAINER_MODE_TRUE='#' -+ MAINTAINER_MODE_FALSE= -+fi -+ -+ MAINT=$MAINTAINER_MODE_TRUE -+ -+ -+ -+for ac_header in sys/mman.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_mman_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_MMAN_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+for ac_func in mmap -+do : -+ ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -+if test "x$ac_cv_func_mmap" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_MMAP 1 -+_ACEOF -+ -+fi -+done -+ -+ -+ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_mman_h" = xyes; then : -+ libffi_header_sys_mman_h=yes -+else -+ libffi_header_sys_mman_h=no -+fi -+ -+ -+ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -+if test "x$ac_cv_func_mmap" = xyes; then : -+ libffi_func_mmap=yes -+else -+ libffi_func_mmap=no -+fi -+ -+if test "$libffi_header_sys_mman_h" != yes \ -+ || test "$libffi_func_mmap" != yes; then -+ ac_cv_func_mmap_file=no -+ ac_cv_func_mmap_dev_zero=no -+ ac_cv_func_mmap_anon=no -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether read-only mmap of a plain file works" >&5 -+$as_echo_n "checking whether read-only mmap of a plain file works... " >&6; } -+if ${ac_cv_func_mmap_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ # Add a system to this blacklist if -+ # mmap(0, stat_size, PROT_READ, MAP_PRIVATE, fd, 0) doesn't return a -+ # memory area containing the same data that you'd get if you applied -+ # read() to the same fd. The only system known to have a problem here -+ # is VMS, where text files have record structure. -+ case "$host_os" in -+ vms* | ultrix*) -+ ac_cv_func_mmap_file=no ;; -+ *) -+ ac_cv_func_mmap_file=yes;; -+ esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_file" >&5 -+$as_echo "$ac_cv_func_mmap_file" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap from /dev/zero works" >&5 -+$as_echo_n "checking whether mmap from /dev/zero works... " >&6; } -+if ${ac_cv_func_mmap_dev_zero+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ # Add a system to this blacklist if it has mmap() but /dev/zero -+ # does not exist, or if mmapping /dev/zero does not give anonymous -+ # zeroed pages with both the following properties: -+ # 1. If you map N consecutive pages in with one call, and then -+ # unmap any subset of those pages, the pages that were not -+ # explicitly unmapped remain accessible. -+ # 2. If you map two adjacent blocks of memory and then unmap them -+ # both at once, they must both go away. -+ # Systems known to be in this category are Windows (all variants), -+ # VMS, and Darwin. -+ case "$host_os" in -+ vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) -+ ac_cv_func_mmap_dev_zero=no ;; -+ *) -+ ac_cv_func_mmap_dev_zero=yes;; -+ esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_dev_zero" >&5 -+$as_echo "$ac_cv_func_mmap_dev_zero" >&6; } -+ -+ # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5 -+$as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; } -+if ${ac_cv_decl_map_anon+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <sys/types.h> -+#include <sys/mman.h> -+#include <unistd.h> -+ -+#ifndef MAP_ANONYMOUS -+#define MAP_ANONYMOUS MAP_ANON -+#endif -+ -+int -+main () -+{ -+int n = MAP_ANONYMOUS; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_decl_map_anon=yes -+else -+ ac_cv_decl_map_anon=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_map_anon" >&5 -+$as_echo "$ac_cv_decl_map_anon" >&6; } -+ -+ if test $ac_cv_decl_map_anon = no; then -+ ac_cv_func_mmap_anon=no -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap with MAP_ANON(YMOUS) works" >&5 -+$as_echo_n "checking whether mmap with MAP_ANON(YMOUS) works... " >&6; } -+if ${ac_cv_func_mmap_anon+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ # Add a system to this blacklist if it has mmap() and MAP_ANON or -+ # MAP_ANONYMOUS, but using mmap(..., MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) -+ # doesn't give anonymous zeroed pages with the same properties listed -+ # above for use of /dev/zero. -+ # Systems known to be in this category are Windows, VMS, and SCO Unix. -+ case "$host_os" in -+ vms* | cygwin* | pe | mingw* | sco* | udk* ) -+ ac_cv_func_mmap_anon=no ;; -+ *) -+ ac_cv_func_mmap_anon=yes;; -+ esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_anon" >&5 -+$as_echo "$ac_cv_func_mmap_anon" >&6; } -+ fi -+fi -+ -+if test $ac_cv_func_mmap_file = yes; then -+ -+$as_echo "#define HAVE_MMAP_FILE 1" >>confdefs.h -+ -+fi -+if test $ac_cv_func_mmap_dev_zero = yes; then -+ -+$as_echo "#define HAVE_MMAP_DEV_ZERO 1" >>confdefs.h -+ -+fi -+if test $ac_cv_func_mmap_anon = yes; then -+ -+$as_echo "#define HAVE_MMAP_ANON 1" >>confdefs.h -+ -+fi -+ -+ -+ if test -d $srcdir/testsuite; then -+ TESTSUBDIR_TRUE= -+ TESTSUBDIR_FALSE='#' -+else -+ TESTSUBDIR_TRUE='#' -+ TESTSUBDIR_FALSE= -+fi -+ -+ -+TARGETDIR="unknown" -+case "$host" in - alpha*-*-*) - TARGET=ALPHA; TARGETDIR=alpha; - # Support 128-bit long double, changeable via command-line switch. -@@ -13282,13 +14283,30 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" > - fi - fi - -+ -+FFI_EXEC_TRAMPOLINE_TABLE=0 - case "$target" in -+ *arm*-apple-darwin*) -+ FFI_EXEC_TRAMPOLINE_TABLE=1 -+ -+$as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h -+ -+ ;; - *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*) - - $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h - - ;; - esac -+ if test x$FFI_EXEC_TRAMPOLINE_TABLE = x1; then -+ FFI_EXEC_TRAMPOLINE_TABLE_TRUE= -+ FFI_EXEC_TRAMPOLINE_TABLE_FALSE='#' -+else -+ FFI_EXEC_TRAMPOLINE_TABLE_TRUE='#' -+ FFI_EXEC_TRAMPOLINE_TABLE_FALSE= -+fi -+ -+ - - if test x$TARGET = xX86_64; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports unwind section type" >&5 -@@ -13716,6 +14734,10 @@ if test -z "${PA64_HPUX_TRUE}" && test - - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - -+if test -z "${FFI_EXEC_TRAMPOLINE_TABLE_TRUE}" && test -z "${FFI_EXEC_TRAMPOLINE_TABLE_FALSE}"; then -+ as_fn_error $? "conditional \"FFI_EXEC_TRAMPOLINE_TABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${FFI_DEBUG_TRUE}" && test -z "${FFI_DEBUG_FALSE}"; then - as_fn_error $? "conditional \"FFI_DEBUG\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -14318,6 +15340,14 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - # - # INIT-COMMANDS - # -+ax_enable_builddir_srcdir="$srcdir" # $srcdir -+ax_enable_builddir_host="$HOST" # $HOST / $host -+ax_enable_builddir_version="$VERSION" # $VERSION -+ax_enable_builddir_package="$PACKAGE" # $PACKAGE -+ax_enable_builddir_auxdir="$ax_enable_builddir_auxdir" # $AUX -+ax_enable_builddir_sed="$ax_enable_builddir_sed" # $SED -+ax_enable_builddir="$ax_enable_builddir" # $SUB -+ - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -@@ -14607,6 +15637,7 @@ for ac_config_target in $ac_config_targe - do - case $ac_config_target in - "fficonfig.h") CONFIG_HEADERS="$CONFIG_HEADERS fficonfig.h" ;; -+ "buildir") CONFIG_COMMANDS="$CONFIG_COMMANDS buildir" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;; -@@ -15245,6 +16276,150 @@ $as_echo "$as_me: executing $ac_file com - - - case $ac_file$ac_mode in -+ "buildir":C) ac_top_srcdir="$ax_enable_builddir_srcdir" -+ if test ".$ax_enable_builddir" = ".." ; then -+ if test -f "$top_srcdir/Makefile" ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: skipping top_srcdir/Makefile - left untouched" >&5 -+$as_echo "$as_me: skipping top_srcdir/Makefile - left untouched" >&6;} -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: skipping top_srcdir/Makefile - not created" >&5 -+$as_echo "$as_me: skipping top_srcdir/Makefile - not created" >&6;} -+ fi -+ else -+ if test -f "$ac_top_srcdir/Makefile" ; then -+ a=`grep "^VERSION " "$ac_top_srcdir/Makefile"` ; b=`grep "^VERSION " Makefile` -+ test "$a" != "$b" && rm "$ac_top_srcdir/Makefile" -+ fi -+ if test -f "$ac_top_srcdir/Makefile" ; then -+ echo "$ac_top_srcdir/Makefile : $ac_top_srcdir/Makefile.in" > $tmp/conftemp.mk -+ echo " @ echo 'REMOVED,,,' >\$@" >> $tmp/conftemp.mk -+ eval "${MAKE-make} -f $tmp/conftemp.mk 2>/dev/null >/dev/null" -+ if grep '^REMOVED,,,' "$ac_top_srcdir/Makefile" >/dev/null -+ then rm $ac_top_srcdir/Makefile ; fi -+ cp $tmp/conftemp.mk $ac_top_srcdir/makefiles.mk~ ## DEBUGGING -+ fi -+ if test ! -f "$ac_top_srcdir/Makefile" ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: create top_srcdir/Makefile guessed from local Makefile" >&5 -+$as_echo "$as_me: create top_srcdir/Makefile guessed from local Makefile" >&6;} -+ x='`' ; cat >$tmp/conftemp.sed <<_EOF -+/^\$/n -+x -+/^\$/bS -+x -+/\\\\\$/{H;d;} -+{H;s/.*//;x;} -+bM -+:S -+x -+/\\\\\$/{h;d;} -+{h;s/.*//;x;} -+:M -+s/\\(\\n\\) /\\1 /g -+/^ /d -+/^[ ]*[\\#]/d -+/^VPATH *=/d -+s/^srcdir *=.*/srcdir = ./ -+s/^top_srcdir *=.*/top_srcdir = ./ -+/[:=]/!d -+/^\\./d -+/ = /b -+/ .= /b -+/:/!b -+s/:.*/:/ -+s/ / /g -+s/ \\([a-z][a-z-]*[a-zA-Z0-9]\\)\\([ :]\\)/ \\1 \\1-all\\2/g -+s/^\\([a-z][a-z-]*[a-zA-Z0-9]\\)\\([ :]\\)/\\1 \\1-all\\2/ -+s/ / /g -+/^all all-all[ :]/i\\ -+all-configured : all-all -+s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-all//g -+/-all-all/d -+a\\ -+ @ HOST="\$(HOST)\" \\\\\\ -+ ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ -+ ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ -+ ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ -+ ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" = "0" ; then : \\\\\\ -+ ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\ -+ ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ -+ ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\ -+ ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -+ ; (cd "\$\$i" && test ! -f configure && \$(MAKE) \$\$use) || exit; done -+/dist-all *:/a\\ -+ @ HOST="\$(HOST)\" \\\\\\ -+ ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ -+ ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ -+ ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ -+ ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\ -+ ; if test "\$\$found" = "0" ; then : \\\\\\ -+ ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ -+ ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -+ ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\ -+ ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done -+/dist-[a-zA-Z0-9]*-all *:/a\\ -+ @ HOST="\$(HOST)\" \\\\\\ -+ ; test ".\$\$HOST" = "." && HOST=$x sh ./config.guess $x \\\\\\ -+ ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ -+ ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ -+ ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\ -+ ; if test "\$\$found" = "0" ; then : \\\\\\ -+ ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ -+ ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -+ ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\ -+ ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done -+/distclean-all *:/a\\ -+ @ HOST="\$(HOST)\" \\\\\\ -+ ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ -+ ; BUILD=$x grep "^#### .*|" Makefile | sed -e 's/.*|//' $x \\\\\\ -+ ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ -+ ; echo "MAKE \$\$HOST : \$\$n * \$\@ (all local builds)" \\\\\\ -+ ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ -+ ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -+ ; echo "# rm -r \$\$i"; done ; echo "# (sleep 3)" ; sleep 3 \\\\\\ -+ ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -+ ; echo "\$\$i" | grep "^/" > /dev/null && continue \\\\\\ -+ ; echo "\$\$i" | grep "^../" > /dev/null && continue \\\\\\ -+ ; echo "rm -r \$\$i"; (rm -r "\$\$i") ; done ; rm Makefile -+_EOF -+ cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~" ## DEBUGGING -+ $ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >$ac_top_srcdir/Makefile -+ if test -f "$ac_top_srcdir/Makefile.mk" ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5 -+$as_echo "$as_me: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&6;} -+ cat $ac_top_srcdir/Makefile.mk >>$ac_top_srcdir/Makefile -+ fi ; xxxx="####" -+ echo "$xxxx CONFIGURATIONS FOR TOPLEVEL MAKEFILE: " >>$ac_top_srcdir/Makefile -+ # sanity check -+ if grep '^; echo "MAKE ' $ac_top_srcdir/Makefile >/dev/null ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: buggy sed found - it deletes tab in \"a\" text parts" >&5 -+$as_echo "$as_me: buggy sed found - it deletes tab in \"a\" text parts" >&6;} -+ $ax_enable_builddir_sed -e '/^@ HOST=/s/^/ /' -e '/^; /s/^/ /' $ac_top_srcdir/Makefile \ -+ >$ac_top_srcdir/Makefile~ -+ (test -s $ac_top_srcdir/Makefile~ && mv $ac_top_srcdir/Makefile~ $ac_top_srcdir/Makefile) 2>/dev/null -+ fi -+ else -+ xxxx="\\#\\#\\#\\#" -+ # echo "/^$xxxx *$ax_enable_builddir_host /d" >$tmp/conftemp.sed -+ echo "s!^$xxxx [^|]* | *$ax_enable_builddir *\$!$xxxx ...... $ax_enable_builddir!" >$tmp/conftemp.sed -+ $ax_enable_builddir_sed -f "$tmp/conftemp.sed" "$ac_top_srcdir/Makefile" >$tmp/mkfile.tmp -+ cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefiles.sed~" ## DEBUGGING -+ cp "$tmp/mkfile.tmp" "$ac_top_srcdir/makefiles.out~" ## DEBUGGING -+ if cmp -s "$ac_top_srcdir/Makefile" "$tmp/mkfile.tmp" 2>/dev/null ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: keeping top_srcdir/Makefile from earlier configure" >&5 -+$as_echo "$as_me: keeping top_srcdir/Makefile from earlier configure" >&6;} -+ rm "$tmp/mkfile.tmp" -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: reusing top_srcdir/Makefile from earlier configure" >&5 -+$as_echo "$as_me: reusing top_srcdir/Makefile from earlier configure" >&6;} -+ mv "$tmp/mkfile.tmp" "$ac_top_srcdir/Makefile" -+ fi -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: build in $ax_enable_builddir (HOST=$ax_enable_builddir_host)" >&5 -+$as_echo "$as_me: build in $ax_enable_builddir (HOST=$ax_enable_builddir_host)" >&6;} -+ xxxx="####" -+ echo "$xxxx" "$ax_enable_builddir_host" "|$ax_enable_builddir" >>$ac_top_srcdir/Makefile -+ fi -+ ;; - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval Index: libffi/m4/ax_cc_maxopt.m4 =================================================================== --- libffi.orig/m4/ax_cc_maxopt.m4 diff --git a/patches/hpux-mallinfo b/patches/hpux-mallinfo index 6484c4f..728ab84 100644 --- a/patches/hpux-mallinfo +++ b/patches/hpux-mallinfo @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,11 @@ +@@ -50,6 +50,11 @@ * configure: Regenerate. diff --git a/patches/interix b/patches/interix index 4e270d2..be81f7e 100644 --- a/patches/interix +++ b/patches/interix @@ -64,7 +64,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -35,6 +35,17 @@ +@@ -52,6 +52,17 @@ 2011-02-09 Anthony Green <green@moxielogic.com> diff --git a/patches/ios b/patches/ios index b60917f..14aa8f9 100644 --- a/patches/ios +++ b/patches/ios @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,29 @@ +@@ -50,6 +50,29 @@ * configure: Regenerate. @@ -36,23 +36,21 @@ Index: libffi/Makefile.am =================================================================== --- libffi.orig/Makefile.am +++ libffi/Makefile.am -@@ -4,37 +4,34 @@ AUTOMAKE_OPTIONS = foreign subdir-object - - SUBDIRS = include testsuite man - --EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ -- 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/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ -- src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ -- src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ +@@ -10,31 +10,28 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change + src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ + src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ + src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ - src/ia64/unix.S \ - 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/powerpc/ffi.c src/powerpc/sysv.S \ -- src/powerpc/linux64.S src/powerpc/linux64_closure.S \ ++ src/ia64/unix.S 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/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 \ @@ -62,8 +60,16 @@ Index: libffi/Makefile.am - 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/darwin64.S \ -- src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/win64.S \ -- src/x86/darwin.S src/x86/freebsd.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/darwin64.S \ + src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ +- src/x86/win64.S src/x86/freebsd.S \ - src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \ - src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \ - src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h \ @@ -71,33 +77,13 @@ Index: libffi/Makefile.am - src/moxie/ffi.c src/moxie/eabi.S \ - libtool-version ChangeLog.libffi m4/libtool.m4 \ - m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 -+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ -+ src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ -+ src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S \ -+ src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \ -+ src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \ -+ src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \ -+ src/ia64/ia64_flags.h src/ia64/unix.S 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/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/darwin64.S src/x86/ffi.c src/x86/sysv.S \ -+ src/x86/win32.S src/x86/win64.S src/x86/darwin.S \ -+ src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S \ -+ src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c \ -+ src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/frv/eabi.S \ -+ src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ -+ src/moxie/eabi.S libtool-version ChangeLog.libffi \ -+ m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ ++ src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \ ++ src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \ ++ src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \ ++ src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ ++ src/moxie/ffi.c src/moxie/eabi.S libtool-version \ ++ ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ ++ m4/ltoptions.m4 m4/ltsugar.m4 + m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh info_TEXINFOS = doc/libffi.texi @@ -116,100 +102,105 @@ Index: libffi/Makefile.in =================================================================== --- libffi.orig/Makefile.in +++ libffi/Makefile.in -@@ -52,20 +52,21 @@ target_triplet = @target@ +@@ -52,21 +52,22 @@ target_triplet = @target@ @POWERPC_DARWIN_TRUE@am__append_14 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S @POWERPC_FREEBSD_TRUE@am__append_15 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S @ARM_TRUE@am__append_16 = src/arm/sysv.S src/arm/ffi.c -@AVR32_TRUE@am__append_17 = src/avr32/sysv.S src/avr32/ffi.c -@LIBFFI_CRIS_TRUE@am__append_18 = src/cris/sysv.S src/cris/ffi.c -@FRV_TRUE@am__append_19 = src/frv/eabi.S src/frv/ffi.c --@S390_TRUE@am__append_20 = src/s390/sysv.S src/s390/ffi.c --@X86_64_TRUE@am__append_21 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S --@SH_TRUE@am__append_22 = src/sh/sysv.S src/sh/ffi.c --@SH64_TRUE@am__append_23 = src/sh64/sysv.S src/sh64/ffi.c --@PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c --@PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c +-@MOXIE_TRUE@am__append_20 = src/moxie/eabi.S src/moxie/ffi.c +-@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c +-@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S +-@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c +-@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c +-@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c +-@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c +@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_17 = src/arm/trampoline.S +@AVR32_TRUE@am__append_18 = src/avr32/sysv.S src/avr32/ffi.c +@LIBFFI_CRIS_TRUE@am__append_19 = src/cris/sysv.S src/cris/ffi.c +@FRV_TRUE@am__append_20 = src/frv/eabi.S src/frv/ffi.c -+@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c -+@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -+@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c -+@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c -+@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c -+@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c ++@MOXIE_TRUE@am__append_21 = src/moxie/eabi.S src/moxie/ffi.c ++@S390_TRUE@am__append_22 = src/s390/sysv.S src/s390/ffi.c ++@X86_64_TRUE@am__append_23 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S ++@SH_TRUE@am__append_24 = src/sh/sysv.S src/sh/ffi.c ++@SH64_TRUE@am__append_25 = src/sh64/sysv.S src/sh64/ffi.c ++@PA_LINUX_TRUE@am__append_26 = src/pa/linux.S src/pa/ffi.c ++@PA_HPUX_TRUE@am__append_27 = src/pa/hpux32.S src/pa/ffi.c # Build debug. Define FFI_DEBUG on the commandline so that, when building with # MSVC, it can link against the debug CRT. --@FFI_DEBUG_TRUE@am__append_26 = -DFFI_DEBUG -+@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG +-@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG ++@FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG # Build opt. --@FFI_DEBUG_FALSE@am__append_27 = -O2 -+@FFI_DEBUG_FALSE@am__append_28 = -O2 +-@FFI_DEBUG_FALSE@am__append_28 = -O2 ++@FFI_DEBUG_FALSE@am__append_29 = -O2 subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ -@@ -142,16 +143,17 @@ am_libffi_la_OBJECTS = src/debug.lo src/ +@@ -141,17 +142,18 @@ am_libffi_la_OBJECTS = src/debug.lo src/ @POWERPC_FREEBSD_TRUE@ src/powerpc/sysv.lo \ @POWERPC_FREEBSD_TRUE@ src/powerpc/ppc_closure.lo @ARM_TRUE@am__objects_16 = src/arm/sysv.lo src/arm/ffi.lo -@AVR32_TRUE@am__objects_17 = src/avr32/sysv.lo src/avr32/ffi.lo -@LIBFFI_CRIS_TRUE@am__objects_18 = src/cris/sysv.lo src/cris/ffi.lo -@FRV_TRUE@am__objects_19 = src/frv/eabi.lo src/frv/ffi.lo --@S390_TRUE@am__objects_20 = src/s390/sysv.lo src/s390/ffi.lo --@X86_64_TRUE@am__objects_21 = src/x86/ffi64.lo src/x86/unix64.lo \ +-@MOXIE_TRUE@am__objects_20 = src/moxie/eabi.lo src/moxie/ffi.lo +-@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo +-@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \ +@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_17 = src/arm/trampoline.lo +@AVR32_TRUE@am__objects_18 = src/avr32/sysv.lo src/avr32/ffi.lo +@LIBFFI_CRIS_TRUE@am__objects_19 = src/cris/sysv.lo src/cris/ffi.lo +@FRV_TRUE@am__objects_20 = src/frv/eabi.lo src/frv/ffi.lo -+@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo -+@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \ ++@MOXIE_TRUE@am__objects_21 = src/moxie/eabi.lo src/moxie/ffi.lo ++@S390_TRUE@am__objects_22 = src/s390/sysv.lo src/s390/ffi.lo ++@X86_64_TRUE@am__objects_23 = src/x86/ffi64.lo src/x86/unix64.lo \ @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo --@SH_TRUE@am__objects_22 = src/sh/sysv.lo src/sh/ffi.lo --@SH64_TRUE@am__objects_23 = src/sh64/sysv.lo src/sh64/ffi.lo --@PA_LINUX_TRUE@am__objects_24 = src/pa/linux.lo src/pa/ffi.lo --@PA_HPUX_TRUE@am__objects_25 = src/pa/hpux32.lo src/pa/ffi.lo -+@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo -+@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo -+@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo -+@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo +-@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo +-@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo +-@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo +-@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo ++@SH_TRUE@am__objects_24 = src/sh/sysv.lo src/sh/ffi.lo ++@SH64_TRUE@am__objects_25 = src/sh64/sysv.lo src/sh64/ffi.lo ++@PA_LINUX_TRUE@am__objects_26 = src/pa/linux.lo src/pa/ffi.lo ++@PA_HPUX_TRUE@am__objects_27 = src/pa/hpux32.lo src/pa/ffi.lo nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ -@@ -160,17 +162,17 @@ nodist_libffi_la_OBJECTS = $(am__objects +@@ -160,17 +162,18 @@ nodist_libffi_la_OBJECTS = $(am__objects $(am__objects_15) $(am__objects_16) $(am__objects_17) \ $(am__objects_18) $(am__objects_19) $(am__objects_20) \ $(am__objects_21) $(am__objects_22) $(am__objects_23) \ -- $(am__objects_24) $(am__objects_25) -+ $(am__objects_24) $(am__objects_25) $(am__objects_26) +- $(am__objects_24) $(am__objects_25) $(am__objects_26) ++ $(am__objects_24) $(am__objects_25) $(am__objects_26) \ ++ $(am__objects_27) libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ $(nodist_libffi_la_OBJECTS) libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ libffi_convenience_la_LIBADD = --am__objects_26 = src/debug.lo src/prep_cif.lo src/types.lo \ -+am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \ +-am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \ ++am__objects_28 = src/debug.lo src/prep_cif.lo src/types.lo \ src/raw_api.lo src/java_raw_api.lo src/closures.lo --am_libffi_convenience_la_OBJECTS = $(am__objects_26) --am__objects_27 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ -+am_libffi_convenience_la_OBJECTS = $(am__objects_27) -+am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ +-am_libffi_convenience_la_OBJECTS = $(am__objects_27) +-am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ ++am_libffi_convenience_la_OBJECTS = $(am__objects_28) ++am__objects_29 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ $(am__objects_7) $(am__objects_8) $(am__objects_9) \ $(am__objects_10) $(am__objects_11) $(am__objects_12) \ -@@ -178,8 +180,8 @@ am__objects_27 = $(am__objects_1) $(am__ +@@ -178,8 +181,8 @@ am__objects_28 = $(am__objects_1) $(am__ $(am__objects_16) $(am__objects_17) $(am__objects_18) \ $(am__objects_19) $(am__objects_20) $(am__objects_21) \ $(am__objects_22) $(am__objects_23) $(am__objects_24) \ -- $(am__objects_25) --nodist_libffi_convenience_la_OBJECTS = $(am__objects_27) -+ $(am__objects_25) $(am__objects_26) -+nodist_libffi_convenience_la_OBJECTS = $(am__objects_28) +- $(am__objects_25) $(am__objects_26) +-nodist_libffi_convenience_la_OBJECTS = $(am__objects_28) ++ $(am__objects_25) $(am__objects_26) $(am__objects_27) ++nodist_libffi_convenience_la_OBJECTS = $(am__objects_29) libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ $(nodist_libffi_convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -@@ -297,6 +299,7 @@ ECHO_N = @ECHO_N@ +@@ -297,6 +300,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -217,7 +208,7 @@ Index: libffi/Makefile.in FGREP = @FGREP@ GREP = @GREP@ HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@ -@@ -386,6 +389,7 @@ psdir = @psdir@ +@@ -386,6 +390,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -225,23 +216,21 @@ Index: libffi/Makefile.in sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ -@@ -399,37 +403,34 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign subdir-objects - SUBDIRS = include testsuite man --EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ -- 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/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ -- src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ -- src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ +@@ -405,31 +410,27 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change + src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ + src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ + src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ - src/ia64/unix.S \ - 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/powerpc/ffi.c src/powerpc/sysv.S \ -- src/powerpc/linux64.S src/powerpc/linux64_closure.S \ ++ src/ia64/unix.S 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/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 \ @@ -251,8 +240,16 @@ Index: libffi/Makefile.in - 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/darwin64.S \ -- src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/win64.S \ -- src/x86/darwin.S src/x86/freebsd.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/darwin64.S \ + src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ +- src/x86/win64.S src/x86/freebsd.S \ - src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \ - src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \ - src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h \ @@ -260,51 +257,31 @@ Index: libffi/Makefile.in - src/moxie/ffi.c src/moxie/eabi.S \ - libtool-version ChangeLog.libffi m4/libtool.m4 \ - m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 -+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ -+ src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ -+ src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S \ -+ src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \ -+ src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \ -+ src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \ -+ src/ia64/ia64_flags.h src/ia64/unix.S 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/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/darwin64.S src/x86/ffi.c src/x86/sysv.S \ -+ src/x86/win32.S src/x86/win64.S src/x86/darwin.S \ -+ src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S \ -+ src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c \ -+ src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/frv/eabi.S \ -+ src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ -+ src/moxie/eabi.S libtool-version ChangeLog.libffi \ -+ m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ -+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh ++ src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \ ++ src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \ ++ src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \ ++ src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ ++ src/moxie/ffi.c src/moxie/eabi.S libtool-version \ ++ ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ ++ m4/ltoptions.m4 m4/ltsugar.m4 info_TEXINFOS = doc/libffi.texi -@@ -488,10 +489,10 @@ nodist_libffi_la_SOURCES = $(am__append_ +@@ -488,10 +489,11 @@ nodist_libffi_la_SOURCES = $(am__append_ $(am__append_15) $(am__append_16) $(am__append_17) \ $(am__append_18) $(am__append_19) $(am__append_20) \ $(am__append_21) $(am__append_22) $(am__append_23) \ -- $(am__append_24) $(am__append_25) -+ $(am__append_24) $(am__append_25) $(am__append_26) +- $(am__append_24) $(am__append_25) $(am__append_26) ++ $(am__append_24) $(am__append_25) $(am__append_26) \ ++ $(am__append_27) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) --AM_CFLAGS = -Wall -g -fexceptions $(am__append_26) $(am__append_27) -+AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28) +-AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28) ++AM_CFLAGS = -Wall -g -fexceptions $(am__append_28) $(am__append_29) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) -@@ -727,6 +728,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp) +@@ -727,6 +729,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp) src/arm/$(DEPDIR)/$(am__dirstamp) src/arm/ffi.lo: src/arm/$(am__dirstamp) \ src/arm/$(DEPDIR)/$(am__dirstamp) @@ -313,7 +290,7 @@ Index: libffi/Makefile.in src/avr32/$(am__dirstamp): @$(MKDIR_P) src/avr32 @: > src/avr32/$(am__dirstamp) -@@ -814,6 +817,8 @@ mostlyclean-compile: +@@ -824,6 +828,8 @@ mostlyclean-compile: -rm -f src/arm/ffi.lo -rm -f src/arm/sysv.$(OBJEXT) -rm -f src/arm/sysv.lo @@ -322,7 +299,7 @@ Index: libffi/Makefile.in -rm -f src/avr32/ffi.$(OBJEXT) -rm -f src/avr32/ffi.lo -rm -f src/avr32/sysv.$(OBJEXT) -@@ -932,6 +937,7 @@ distclean-compile: +@@ -946,6 +952,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/sysv.Plo@am__quote@ @@ -330,11 +307,19 @@ Index: libffi/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@ +@@ -1813,6 +1820,7 @@ uninstall-am: uninstall-dvi-am uninstall + uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ + uninstall-pkgconfigDATA uninstall-ps-am + ++ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh + + # No install-html or install-pdf support in automake yet + .PHONY: install-html install-pdf Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac +++ libffi/configure.ac -@@ -328,13 +328,23 @@ if test x$TARGET = xX86_WIN64; then +@@ -322,13 +322,23 @@ if test x$TARGET = xX86_WIN64; then fi fi @@ -384,9 +369,9 @@ Index: libffi/src/arm/ffi.c ARM Foreign Function Interface -@@ -337,6 +338,220 @@ ffi_prep_incoming_args_SYSV(char *stack, +@@ -339,6 +340,220 @@ ffi_prep_incoming_args_SYSV(char *stack, - /* How to make a trampoline. */ + extern unsigned int ffi_arm_trampoline[3]; +#if FFI_EXEC_TRAMPOLINE_TABLE + @@ -605,7 +590,7 @@ Index: libffi/src/arm/ffi.c #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \ ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ unsigned int __fun = (unsigned int)(FUN); \ -@@ -353,6 +568,7 @@ ffi_prep_incoming_args_SYSV(char *stack, +@@ -353,6 +568,7 @@ extern unsigned int ffi_arm_trampoline[3 mapping. */ \ }) @@ -703,7 +688,7 @@ Index: libffi/src/arm/sysv.S UNWIND .fnstart .endm #endif -@@ -141,8 +164,7 @@ _L__\name: +@@ -141,8 +164,7 @@ _L__\name: #endif .endm diff --git a/patches/ios-fixes b/patches/ios-fixes index 8cafd80..083f16f 100644 --- a/patches/ios-fixes +++ b/patches/ios-fixes @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -70,7 +70,7 @@ +@@ -87,7 +87,7 @@ * src/prep_cif.c (UNLIKELY, LIKELY): Define. (initialize_aggregate): Check for bad types. diff --git a/patches/irix b/patches/irix index cd3d612..f283a30 100644 --- a/patches/irix +++ b/patches/irix @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,14 @@ +@@ -50,6 +50,14 @@ * configure: Regenerate. diff --git a/patches/ml64-safeseh b/patches/ml64-safeseh index 7216ce5..b90aab8 100644 --- a/patches/ml64-safeseh +++ b/patches/ml64-safeseh @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -173,6 +173,10 @@ +@@ -190,6 +190,10 @@ * src/prep_cif.c: Push stack space computation into src/x86/ffi.c for X86_ANY so return value space doesn't get added twice. diff --git a/patches/more-openbsd b/patches/more-openbsd index d3c1e6e..104d03e 100644 --- a/patches/more-openbsd +++ b/patches/more-openbsd @@ -2,1540 +2,18 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -1,3 +1,8 @@ +@@ -789,6 +789,11 @@ + * man/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + +2011-08-22 Jasper Lievisse Adriaanse <jasper@openbsd.org> + + * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support. + * configure: Rebuilt. + - 2011-07-11 Andrew Haley <aph@redhat.com> - - * src/arm/ffi.c (FFI_INIT_TRAMPOLINE): Clear icache. -Index: libffi/configure -=================================================================== ---- libffi.orig/configure -+++ libffi/configure -@@ -688,7 +688,6 @@ TESTSUBDIR_TRUE - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE --PRTDIAG - CPP - OTOOL64 - OTOOL -@@ -755,7 +754,6 @@ am__isrc - INSTALL_DATA - INSTALL_SCRIPT - INSTALL_PROGRAM --ax_enable_builddir_sed - target_os - target_vendor - target_cpu -@@ -809,7 +807,6 @@ SHELL' - ac_subst_files='' - ac_user_opts=' - enable_option_checking --enable_builddir - enable_dependency_tracking - enable_shared - enable_static -@@ -818,8 +815,6 @@ enable_fast_install - with_gnu_ld - with_sysroot - enable_libtool_lock --enable_portable_binary --with_gcc_arch - enable_maintainer_mode - enable_debug - enable_structs -@@ -1454,8 +1449,6 @@ Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-builddir disable automatic build in subdir of sources -- - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] build shared libraries [default=yes] -@@ -1463,9 +1456,6 @@ Optional Features: - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) -- --enable-portable-binary -- disable compiler optimizations that would produce -- unportable binaries - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-debug debugging mode -@@ -1481,8 +1471,6 @@ Optional Packages: - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). -- --with-gcc-arch=<arch> use architecture <arch> for gcc -march/-mtune, -- instead of guessing - - Some influential environment variables: - CC C compiler command -@@ -2658,109 +2646,7 @@ target_alias=${target_alias-$host_alias} - - . ${srcdir}/configure.host - -- -- # [$]@ is unsable in 2.60+ but earlier autoconf had no ac_configure_args -- if test "${ac_configure_args+set}" != "set" ; then -- ac_configure_args= -- for ac_arg in ${1+"$@"}; do -- ac_configure_args="$ac_configure_args '$ac_arg'" -- done -- fi -- --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` -- -- --ax_enable_builddir="." --# Check whether --enable-builddir was given. --if test "${enable_builddir+set}" = set; then : -- enableval=$enable_builddir; ax_enable_builddir="$enableval" --else -- ax_enable_builddir="auto" --fi -- --if test ".$ac_srcdir_defaulted" != ".no" ; then --if test ".$srcdir" = ".." ; then -- if test -f config.status ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: toplevel srcdir already configured... skipping subdir build" >&5 --$as_echo "$as_me: toplevel srcdir already configured... skipping subdir build" >&6;} -- else -- test ".$ax_enable_builddir" = "." && ax_enable_builddir="." -- test ".$ax_enable_builddir" = ".no" && ax_enable_builddir="." -- test ".$TARGET" = "." && TARGET="$target" -- test ".$ax_enable_builddir" = ".auto" && ax_enable_builddir="$TARGET" -- if test ".$ax_enable_builddir" != ".." ; then # we know where to go and -- as_dir=$ax_enable_builddir; as_fn_mkdir_p -- echo __.$ax_enable_builddir.__ > $ax_enable_builddir/conftest.tmp -- cd $ax_enable_builddir -- if grep __.$ax_enable_builddir.__ conftest.tmp >/dev/null 2>/dev/null ; then -- rm conftest.tmp -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: continue configure in default builddir \"./$ax_enable_builddir\"" >&5 --$as_echo "continue configure in default builddir \"./$ax_enable_builddir\"" >&6; } -- else -- as_fn_error $? "could not change to default builddir \"./$ax_enable_builddir\"" "$LINENO" 5 -- fi -- srcdir=`echo "$ax_enable_builddir" | -- sed -e 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g;s,[/]$,,;'` -- # going to restart from subdirectory location -- test -f $srcdir/config.log && mv $srcdir/config.log . -- test -f $srcdir/confdefs.h && mv $srcdir/confdefs.h . -- test -f $srcdir/conftest.log && mv $srcdir/conftest.log . -- test -f $srcdir/$cache_file && mv $srcdir/$cache_file . -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ....exec $SHELL $srcdir/$0 \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" ${1+\"$@\"}" >&5 --$as_echo "....exec $SHELL $srcdir/$0 \"--srcdir=$srcdir\" \"--enable-builddir=$ax_enable_builddir\" ${1+\"$@\"}" >&6; } -- case "$0" in # restart -- /\\*) eval $SHELL "'$0'" "'--srcdir=$srcdir'" "'--enable-builddir=$ax_enable_builddir'" $ac_configure_args ;; -- *) eval $SHELL "'$srcdir/$0'" "'--srcdir=$srcdir'" "'--enable-builddir=$ax_enable_builddir'" $ac_configure_args ;; -- esac ; exit $? -- fi -- fi --fi fi --test ".$ax_enable_builddir" = ".auto" && ax_enable_builddir="." --# Extract the first word of "gsed sed", so it can be a program name with args. --set dummy gsed sed; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_ax_enable_builddir_sed+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $ax_enable_builddir_sed in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_ax_enable_builddir_sed="$ax_enable_builddir_sed" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_ax_enable_builddir_sed="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_ax_enable_builddir_sed" && ac_cv_path_ax_enable_builddir_sed="sed" -- ;; --esac --fi --ax_enable_builddir_sed=$ac_cv_path_ax_enable_builddir_sed --if test -n "$ax_enable_builddir_sed"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_enable_builddir_sed" >&5 --$as_echo "$ax_enable_builddir_sed" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --ax_enable_builddir_auxdir="$am_aux_dir" --ac_config_commands="$ac_config_commands buildir" -- -+AX_ENABLE_BUILDDIR - - am__api_version='1.11' - -@@ -2919,6 +2805,9 @@ test "$program_suffix" != NONE && - ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' - program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+ - if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) -@@ -11950,1037 +11839,158 @@ CC="$lt_save_CC" - - - -+AX_CC_MAXOPT -+AX_CFLAGS_WARN_ALL -+if test "x$GCC" = "xyes"; then -+ CFLAGS="$CFLAGS -fexceptions" -+fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5 --$as_echo_n "checking for C compiler vendor... " >&6; } --if ${ax_cv_c_compiler_vendor+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ax_cv_c_compiler_vendor=unknown -- # note: don't check for gcc first since some other compilers define __GNUC__ -- for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ pathscale:__PATHCC__,__PATHSCALE__ clang:__clang__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do -- vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- --#if !($vencpp) -- thisisanerror; --#endif - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -+ # Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then : -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -+else -+ USE_MAINTAINER_MODE=no - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- done - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -+$as_echo "$USE_MAINTAINER_MODE" >&6; } -+ if test $USE_MAINTAINER_MODE = yes; then -+ MAINTAINER_MODE_TRUE= -+ MAINTAINER_MODE_FALSE='#' -+else -+ MAINTAINER_MODE_TRUE='#' -+ MAINTAINER_MODE_FALSE= - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_vendor" >&5 --$as_echo "$ax_cv_c_compiler_vendor" >&6; } -- - -+ MAINT=$MAINTAINER_MODE_TRUE - - - -+for ac_header in sys/mman.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_mman_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_MMAN_H 1 -+_ACEOF - --# Check whether --enable-portable-binary was given. --if test "${enable_portable_binary+set}" = set; then : -- enableval=$enable_portable_binary; acx_maxopt_portable=$withval --else -- acx_maxopt_portable=no - fi - -+done - --# Try to determine "good" native compiler flags if none specified via CFLAGS --if test "$ac_test_CFLAGS" != "set"; then -- CFLAGS="" -- case $ax_cv_c_compiler_vendor in -- dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host" -- if test "x$acx_maxopt_portable" = xno; then -- CFLAGS="$CFLAGS -arch host" -- fi;; -- -- sun) CFLAGS="-native -fast -xO5 -dalign" -- if test "x$acx_maxopt_portable" = xyes; then -- CFLAGS="$CFLAGS -xarch=generic" -- fi;; -- -- hp) CFLAGS="+Oall +Optrs_ansi +DSnative" -- if test "x$acx_maxopt_portable" = xyes; then -- CFLAGS="$CFLAGS +DAportable" -- fi;; -- -- ibm) if test "x$acx_maxopt_portable" = xno; then -- xlc_opt="-qarch=auto -qtune=auto" -- else -- xlc_opt="-qtune=auto" -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $xlc_opt" >&5 --$as_echo_n "checking whether C compiler accepts $xlc_opt... " >&6; } --ax_save_FLAGS=$CFLAGS -- CFLAGS="$xlc_opt" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} -+for ac_func in mmap -+do : -+ ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -+if test "x$ac_cv_func_mmap" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_MMAP 1 - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=yes --else -- eval `$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh`=no -+ - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$ax_save_FLAGS --eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$xlc_opt" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 --$as_echo "$ax_check_compiler_flags" >&6; } --if test "x$ax_check_compiler_flags" = xyes; then -- CFLAGS="-O3 -qansialias -w $xlc_opt" --else -- CFLAGS="-O3 -qansialias -w" -- echo "******************************************************" -- echo "* You seem to have the IBM C compiler. It is *" -- echo "* recommended for best performance that you use: *" -- echo "* *" -- echo "* CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *" -- echo "* ^^^ ^^^ *" -- echo "* where xxx is pwr2, pwr3, 604, or whatever kind of *" -- echo "* CPU you have. (Set the CFLAGS environment var. *" -- echo "* and re-run configure.) For more info, man cc. *" -- echo "******************************************************" --fi -- -- ;; -- -- intel) CFLAGS="-O3 -ansi_alias" -- if test "x$acx_maxopt_portable" = xno; then -- icc_archflag=unknown -- icc_flags="" -- case $host_cpu in -- i686*|x86_64*) -- # icc accepts gcc assembly syntax, so these should work: -+done - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5 --$as_echo_n "checking for x86 cpuid 0 output... " >&6; } --if ${ax_cv_gcc_x86_cpuid_0+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- ax_cv_gcc_x86_cpuid_0=unknown -+ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_mman_h" = xyes; then : -+ libffi_header_sys_mman_h=yes - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <stdio.h> --int --main () --{ -+ libffi_header_sys_mman_h=no -+fi - -- int op = 0, eax, ebx, ecx, edx; -- FILE *f; -- __asm__("cpuid" -- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -- : "a" (op)); -- f = fopen("conftest_cpuid", "w"); if (!f) return 1; -- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -- fclose(f); -- return 0; - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid -+ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" -+if test "x$ac_cv_func_mmap" = xyes; then : -+ libffi_func_mmap=yes - else -- ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext -+ libffi_func_mmap=no - fi - -+if test "$libffi_header_sys_mman_h" != yes \ -+ || test "$libffi_func_mmap" != yes; then -+ ac_cv_func_mmap_file=no -+ ac_cv_func_mmap_dev_zero=no -+ ac_cv_func_mmap_anon=no -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether read-only mmap of a plain file works" >&5 -+$as_echo_n "checking whether read-only mmap of a plain file works... " >&6; } -+if ${ac_cv_func_mmap_file+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ # Add a system to this blacklist if -+ # mmap(0, stat_size, PROT_READ, MAP_PRIVATE, fd, 0) doesn't return a -+ # memory area containing the same data that you'd get if you applied -+ # read() to the same fd. The only system known to have a problem here -+ # is VMS, where text files have record structure. -+ case "$host_os" in -+ vms* | ultrix*) -+ ac_cv_func_mmap_file=no ;; -+ *) -+ ac_cv_func_mmap_file=yes;; -+ esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0" >&5 --$as_echo "$ax_cv_gcc_x86_cpuid_0" >&6; } --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5 --$as_echo_n "checking for x86 cpuid 1 output... " >&6; } --if ${ax_cv_gcc_x86_cpuid_1+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_file" >&5 -+$as_echo "$ac_cv_func_mmap_file" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap from /dev/zero works" >&5 -+$as_echo_n "checking whether mmap from /dev/zero works... " >&6; } -+if ${ac_cv_func_mmap_dev_zero+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -- ax_cv_gcc_x86_cpuid_1=unknown -+ # Add a system to this blacklist if it has mmap() but /dev/zero -+ # does not exist, or if mmapping /dev/zero does not give anonymous -+ # zeroed pages with both the following properties: -+ # 1. If you map N consecutive pages in with one call, and then -+ # unmap any subset of those pages, the pages that were not -+ # explicitly unmapped remain accessible. -+ # 2. If you map two adjacent blocks of memory and then unmap them -+ # both at once, they must both go away. -+ # Systems known to be in this category are Windows (all variants), -+ # VMS, and Darwin. -+ case "$host_os" in -+ vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) -+ ac_cv_func_mmap_dev_zero=no ;; -+ *) -+ ac_cv_func_mmap_dev_zero=yes;; -+ esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_dev_zero" >&5 -+$as_echo "$ac_cv_func_mmap_dev_zero" >&6; } -+ -+ # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5 -+$as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; } -+if ${ac_cv_decl_map_anon+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <stdio.h> --int --main () --{ -- -- int op = 1, eax, ebx, ecx, edx; -- FILE *f; -- __asm__("cpuid" -- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -- : "a" (op)); -- f = fopen("conftest_cpuid", "w"); if (!f) return 1; -- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -- fclose(f); -- return 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid --else -- ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_1" >&5 --$as_echo "$ax_cv_gcc_x86_cpuid_1" >&6; } --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -+#include <sys/types.h> -+#include <sys/mman.h> -+#include <unistd.h> - -- case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG -- *:756e6547:*:*) # Intel -- case $ax_cv_gcc_x86_cpuid_1 in -- *6a?:*[234]:*:*|*6[789b]?:*:*:*) icc_flags="-xK";; -- *f3[347]:*:*:*|*f41347:*:*:*) icc_flags="-xP -xN -xW -xK";; -- *f??:*:*:*) icc_flags="-xN -xW -xK";; -- esac ;; -- esac ;; -- esac -- if test "x$icc_flags" != x; then -- for flag in $icc_flags; do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 --$as_echo_n "checking whether C compiler accepts $flag... " >&6; } --ax_save_FLAGS=$CFLAGS -- CFLAGS="$flag" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+#ifndef MAP_ANONYMOUS -+#define MAP_ANONYMOUS MAP_ANON -+#endif - - int - main () - { -- -+int n = MAP_ANONYMOUS; - ; - return 0; - } - _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : -- eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes -+ ac_cv_decl_map_anon=yes - else -- eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no -+ ac_cv_decl_map_anon=no - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$ax_save_FLAGS --eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 --$as_echo "$ax_check_compiler_flags" >&6; } --if test "x$ax_check_compiler_flags" = xyes; then -- icc_archflag=$flag; break --else -- : - fi -- -- done -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc architecture flag" >&5 --$as_echo_n "checking for icc architecture flag... " >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icc_archflag" >&5 --$as_echo "$icc_archflag" >&6; } -- if test "x$icc_archflag" != xunknown; then -- CFLAGS="$CFLAGS $icc_archflag" -- fi -- fi -- ;; -- -- gnu) -- # default optimization flags for gcc on all systems -- CFLAGS="-O3 -fomit-frame-pointer" -- -- # -fstrict-aliasing for gcc-2.95+ -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstrict-aliasing" >&5 --$as_echo_n "checking whether C compiler accepts -fstrict-aliasing... " >&6; } --if ${ax_cv_c_flags__fstrict_aliasing+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -- ax_save_FLAGS=$CFLAGS -- CFLAGS="-fstrict-aliasing" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ax_cv_c_flags__fstrict_aliasing=yes --else -- ax_cv_c_flags__fstrict_aliasing=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$ax_save_FLAGS --fi -- --eval ax_check_compiler_flags=$ax_cv_c_flags__fstrict_aliasing --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 --$as_echo "$ax_check_compiler_flags" >&6; } --if test "x$ax_check_compiler_flags" = xyes; then -- CFLAGS="$CFLAGS -fstrict-aliasing" --else -- : --fi -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffast-math" >&5 --$as_echo_n "checking whether C compiler accepts -ffast-math... " >&6; } --if ${ax_cv_c_flags__ffast_math+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -- ax_save_FLAGS=$CFLAGS -- CFLAGS="-ffast-math" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ax_cv_c_flags__ffast_math=yes --else -- ax_cv_c_flags__ffast_math=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$ax_save_FLAGS --fi -- --eval ax_check_compiler_flags=$ax_cv_c_flags__ffast_math --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 --$as_echo "$ax_check_compiler_flags" >&6; } --if test "x$ax_check_compiler_flags" = xyes; then -- CFLAGS="$CFLAGS -ffast-math" --else -- : --fi -- -- -- -- -- -- --# Check whether --with-gcc-arch was given. --if test "${with_gcc_arch+set}" = set; then : -- withval=$with_gcc_arch; ax_gcc_arch=$withval --else -- ax_gcc_arch=yes --fi -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc architecture flag" >&5 --$as_echo_n "checking for gcc architecture flag... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 --$as_echo "" >&6; } --if ${ax_cv_gcc_archflag+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- --ax_cv_gcc_archflag="unknown" -- --if test "$GCC" = yes; then -- --if test "x$ax_gcc_arch" = xyes; then --ax_gcc_arch="" --if test "$cross_compiling" = no; then --case $host_cpu in -- i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0 output" >&5 --$as_echo_n "checking for x86 cpuid 0 output... " >&6; } --if ${ax_cv_gcc_x86_cpuid_0+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- ax_cv_gcc_x86_cpuid_0=unknown --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <stdio.h> --int --main () --{ -- -- int op = 0, eax, ebx, ecx, edx; -- FILE *f; -- __asm__("cpuid" -- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -- : "a" (op)); -- f = fopen("conftest_cpuid", "w"); if (!f) return 1; -- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -- fclose(f); -- return 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid --else -- ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0" >&5 --$as_echo "$ax_cv_gcc_x86_cpuid_0" >&6; } --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 1 output" >&5 --$as_echo_n "checking for x86 cpuid 1 output... " >&6; } --if ${ax_cv_gcc_x86_cpuid_1+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- ax_cv_gcc_x86_cpuid_1=unknown --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <stdio.h> --int --main () --{ -- -- int op = 1, eax, ebx, ecx, edx; -- FILE *f; -- __asm__("cpuid" -- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -- : "a" (op)); -- f = fopen("conftest_cpuid", "w"); if (!f) return 1; -- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -- fclose(f); -- return 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid --else -- ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_1" >&5 --$as_echo "$ax_cv_gcc_x86_cpuid_1" >&6; } --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- -- case $ax_cv_gcc_x86_cpuid_0 in -- *:756e6547:*:*) # Intel -- case $ax_cv_gcc_x86_cpuid_1 in -- *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;; -- *5??:*:*:*) ax_gcc_arch=pentium ;; -- *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -- *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -- *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -- *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; -- *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -- *6??:*:*:*) ax_gcc_arch=pentiumpro ;; -- *f3[347]:*:*:*|*f41347:*:*:*) -- case $host_cpu in -- x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;; -- *) ax_gcc_arch="prescott pentium4 pentiumpro" ;; -- esac ;; -- *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";; -- esac ;; -- *:68747541:*:*) # AMD -- case $ax_cv_gcc_x86_cpuid_1 in -- *5[67]?:*:*:*) ax_gcc_arch=k6 ;; -- *5[8d]?:*:*:*) ax_gcc_arch="k6-2 k6" ;; -- *5[9]?:*:*:*) ax_gcc_arch="k6-3 k6" ;; -- *60?:*:*:*) ax_gcc_arch=k7 ;; -- *6[12]?:*:*:*) ax_gcc_arch="athlon k7" ;; -- *6[34]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;; -- *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;; -- *6[68a]?:*:*:*) -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86 cpuid 0x80000006 output" >&5 --$as_echo_n "checking for x86 cpuid 0x80000006 output... " >&6; } --if ${ax_cv_gcc_x86_cpuid_0x80000006+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- ax_cv_gcc_x86_cpuid_0x80000006=unknown --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <stdio.h> --int --main () --{ -- -- int op = 0x80000006, eax, ebx, ecx, edx; -- FILE *f; -- __asm__("cpuid" -- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) -- : "a" (op)); -- f = fopen("conftest_cpuid", "w"); if (!f) return 1; -- fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); -- fclose(f); -- return 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- ax_cv_gcc_x86_cpuid_0x80000006=`cat conftest_cpuid`; rm -f conftest_cpuid --else -- ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5 --$as_echo "$ax_cv_gcc_x86_cpuid_0x80000006" >&6; } --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- # L2 cache size -- case $ax_cv_gcc_x86_cpuid_0x80000006 in -- *:*:*[1-9a-f]??????:*) # (L2 = ecx >> 16) >= 256 -- ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;; -- *) ax_gcc_arch="athlon-4 athlon k7" ;; -- esac ;; -- *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; -- *f5?:*:*:*) ax_gcc_arch="opteron k8" ;; -- *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;; -- *f??:*:*:*) ax_gcc_arch="k8" ;; -- esac ;; -- *:746e6543:*:*) # IDT -- case $ax_cv_gcc_x86_cpuid_1 in -- *54?:*:*:*) ax_gcc_arch=winchip-c6 ;; -- *58?:*:*:*) ax_gcc_arch=winchip2 ;; -- *6[78]?:*:*:*) ax_gcc_arch=c3 ;; -- *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;; -- esac ;; -- esac -- if test x"$ax_gcc_arch" = x; then # fallback -- case $host_cpu in -- i586*) ax_gcc_arch=pentium ;; -- i686*) ax_gcc_arch=pentiumpro ;; -- esac -- fi -- ;; -- -- sparc*) -- # Extract the first word of "prtdiag", so it can be a program name with args. --set dummy prtdiag; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_PRTDIAG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PRTDIAG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PRTDIAG="$PRTDIAG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --as_dummy="$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/" --for as_dir in $as_dummy --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PRTDIAG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_PRTDIAG" && ac_cv_path_PRTDIAG="prtdiag" -- ;; --esac --fi --PRTDIAG=$ac_cv_path_PRTDIAG --if test -n "$PRTDIAG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRTDIAG" >&5 --$as_echo "$PRTDIAG" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` -- cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters` -- case $cputype in -- *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; -- *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; -- *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;; -- *supersparc*|*tms390z5[05]*) ax_gcc_arch="supersparc v8" ;; -- *hypersparc*|*rt62[056]*) ax_gcc_arch="hypersparc v8" ;; -- *cypress*) ax_gcc_arch=cypress ;; -- esac ;; -- -- alphaev5) ax_gcc_arch=ev5 ;; -- alphaev56) ax_gcc_arch=ev56 ;; -- alphapca56) ax_gcc_arch="pca56 ev56" ;; -- alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;; -- alphaev6) ax_gcc_arch=ev6 ;; -- alphaev67) ax_gcc_arch=ev67 ;; -- alphaev68) ax_gcc_arch="ev68 ev67" ;; -- alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;; -- alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;; -- alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;; -- -- powerpc*) -- cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null` -- cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'` -- case $cputype in -- *750*) ax_gcc_arch="750 G3" ;; -- *740[0-9]*) ax_gcc_arch="$cputype 7400 G4" ;; -- *74[4-5][0-9]*) ax_gcc_arch="$cputype 7450 G4" ;; -- *74[0-9][0-9]*) ax_gcc_arch="$cputype G4" ;; -- *970*) ax_gcc_arch="970 G5 power4";; -- *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";; -- *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";; -- 603ev|8240) ax_gcc_arch="$cputype 603e 603";; -- *) ax_gcc_arch=$cputype ;; -- esac -- ax_gcc_arch="$ax_gcc_arch powerpc" -- ;; --esac --fi # not cross-compiling --fi # guess arch -- --if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then --for arch in $ax_gcc_arch; do -- if test "x$acx_maxopt_portable" = xyes; then # if we require portable code -- flags="-mtune=$arch" -- # -mcpu=$arch and m$arch generate nonportable code on every arch except -- # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. -- case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac -- else -- flags="-march=$arch -mcpu=$arch -m$arch" -- fi -- for flag in $flags; do -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 --$as_echo_n "checking whether C compiler accepts $flag... " >&6; } --ax_save_FLAGS=$CFLAGS -- CFLAGS="$flag" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes --else -- eval `$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$ax_save_FLAGS --eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$flag" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 --$as_echo "$ax_check_compiler_flags" >&6; } --if test "x$ax_check_compiler_flags" = xyes; then -- ax_cv_gcc_archflag=$flag; break --else -- : --fi -- -- done -- test "x$ax_cv_gcc_archflag" = xunknown || break --done --fi -- --fi # $GCC=yes -- --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc architecture flag" >&5 --$as_echo_n "checking for gcc architecture flag... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_archflag" >&5 --$as_echo "$ax_cv_gcc_archflag" >&6; } --if test "x$ax_cv_gcc_archflag" = xunknown; then -- : --else -- CFLAGS="$CFLAGS $ax_cv_gcc_archflag" --fi -- -- ;; -- esac -- -- if test -z "$CFLAGS"; then -- echo "" -- echo "********************************************************" -- echo "* WARNING: Don't know the best CFLAGS for this system *" -- echo "* Use ./configure CFLAGS=... to specify your own flags *" -- echo "* (otherwise, a default of CFLAGS=-O3 will be used) *" -- echo "********************************************************" -- echo "" -- CFLAGS="-O3" -- fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CFLAGS" >&5 --$as_echo_n "checking whether C compiler accepts $CFLAGS... " >&6; } --ax_save_FLAGS=$CFLAGS -- CFLAGS="$CFLAGS" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=yes --else -- eval `$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS=$ax_save_FLAGS --eval ax_check_compiler_flags=$`$as_echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5 --$as_echo "$ax_check_compiler_flags" >&6; } --if test "x$ax_check_compiler_flags" = xyes; then -- : --else -- -- echo "" -- echo "********************************************************" -- echo "* WARNING: The guessed CFLAGS don't seem to work with *" -- echo "* your compiler. *" -- echo "* Use ./configure CFLAGS=... to specify your own flags *" -- echo "********************************************************" -- echo "" -- CFLAGS="" -- --fi -- -- --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5 --$as_echo_n "checking CFLAGS for maximum warnings... " >&6; } --if ${ac_cv_cflags_warn_all+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_cflags_warn_all="no, unknown" -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- ac_save_CFLAGS="$CFLAGS" --for ac_arg in "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # --do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --done -- CFLAGS="$ac_save_CFLAGS" -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5 --$as_echo "$ac_cv_cflags_warn_all" >&6; } --case ".$ac_cv_cflags_warn_all" in -- .ok|.ok,*) ;; -- .|.no|.no,*) -- ;; -- *) -- if echo " $CFLAGS " | grep " $ac_cv_cflags_warn_all " 2>&1 >/dev/null -- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ac_cv_cflags_warn_all"; } >&5 -- (: CFLAGS does contain $ac_cv_cflags_warn_all) 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } -- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\""; } >&5 -- (: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } -- CFLAGS="$CFLAGS $ac_cv_cflags_warn_all" -- fi -- ;; --esac -- --if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -fexceptions" --fi -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 --$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -- # Check whether --enable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then : -- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval --else -- USE_MAINTAINER_MODE=no --fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 --$as_echo "$USE_MAINTAINER_MODE" >&6; } -- if test $USE_MAINTAINER_MODE = yes; then -- MAINTAINER_MODE_TRUE= -- MAINTAINER_MODE_FALSE='#' --else -- MAINTAINER_MODE_TRUE='#' -- MAINTAINER_MODE_FALSE= --fi -- -- MAINT=$MAINTAINER_MODE_TRUE -- -- -- --for ac_header in sys/mman.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_mman_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_MMAN_H 1 --_ACEOF -- --fi -- --done -- --for ac_func in mmap --do : -- ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" --if test "x$ac_cv_func_mmap" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_MMAP 1 --_ACEOF -- --fi --done -- -- --ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_mman_h" = xyes; then : -- libffi_header_sys_mman_h=yes --else -- libffi_header_sys_mman_h=no --fi -- -- --ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" --if test "x$ac_cv_func_mmap" = xyes; then : -- libffi_func_mmap=yes --else -- libffi_func_mmap=no --fi -- --if test "$libffi_header_sys_mman_h" != yes \ -- || test "$libffi_func_mmap" != yes; then -- ac_cv_func_mmap_file=no -- ac_cv_func_mmap_dev_zero=no -- ac_cv_func_mmap_anon=no --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether read-only mmap of a plain file works" >&5 --$as_echo_n "checking whether read-only mmap of a plain file works... " >&6; } --if ${ac_cv_func_mmap_file+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- # Add a system to this blacklist if -- # mmap(0, stat_size, PROT_READ, MAP_PRIVATE, fd, 0) doesn't return a -- # memory area containing the same data that you'd get if you applied -- # read() to the same fd. The only system known to have a problem here -- # is VMS, where text files have record structure. -- case "$host_os" in -- vms* | ultrix*) -- ac_cv_func_mmap_file=no ;; -- *) -- ac_cv_func_mmap_file=yes;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_file" >&5 --$as_echo "$ac_cv_func_mmap_file" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap from /dev/zero works" >&5 --$as_echo_n "checking whether mmap from /dev/zero works... " >&6; } --if ${ac_cv_func_mmap_dev_zero+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- # Add a system to this blacklist if it has mmap() but /dev/zero -- # does not exist, or if mmapping /dev/zero does not give anonymous -- # zeroed pages with both the following properties: -- # 1. If you map N consecutive pages in with one call, and then -- # unmap any subset of those pages, the pages that were not -- # explicitly unmapped remain accessible. -- # 2. If you map two adjacent blocks of memory and then unmap them -- # both at once, they must both go away. -- # Systems known to be in this category are Windows (all variants), -- # VMS, and Darwin. -- case "$host_os" in -- vms* | cygwin* | pe | mingw* | darwin* | ultrix* | hpux10* | hpux11.00) -- ac_cv_func_mmap_dev_zero=no ;; -- *) -- ac_cv_func_mmap_dev_zero=yes;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_dev_zero" >&5 --$as_echo "$ac_cv_func_mmap_dev_zero" >&6; } -- -- # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5 --$as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; } --if ${ac_cv_decl_map_anon+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <sys/types.h> --#include <sys/mman.h> --#include <unistd.h> -- --#ifndef MAP_ANONYMOUS --#define MAP_ANONYMOUS MAP_ANON --#endif -- --int --main () --{ --int n = MAP_ANONYMOUS; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_decl_map_anon=yes --else -- ac_cv_decl_map_anon=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_map_anon" >&5 --$as_echo "$ac_cv_decl_map_anon" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_map_anon" >&5 -+$as_echo "$ac_cv_decl_map_anon" >&6; } - - if test $ac_cv_decl_map_anon = no; then - ac_cv_func_mmap_anon=no -@@ -13065,7 +12075,7 @@ case "$host" in - TARGET=FRV; TARGETDIR=frv - ;; - -- hppa*-*-linux* | parisc*-*-linux*) -+ hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*) - TARGET=PA_LINUX; TARGETDIR=pa - ;; - hppa*64-*-hpux*) -@@ -13133,7 +12143,7 @@ case "$host" in - powerpc-*-aix* | rs6000-*-aix*) - TARGET=POWERPC_AIX; TARGETDIR=powerpc - ;; -- powerpc-*-freebsd*) -+ powerpc-*-freebsd* | powerpc-*-openbsd*) - TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc - ;; - powerpc64-*-freebsd*) -@@ -15340,14 +14350,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - # - # INIT-COMMANDS - # --ax_enable_builddir_srcdir="$srcdir" # $srcdir --ax_enable_builddir_host="$HOST" # $HOST / $host --ax_enable_builddir_version="$VERSION" # $VERSION --ax_enable_builddir_package="$PACKAGE" # $PACKAGE --ax_enable_builddir_auxdir="$ax_enable_builddir_auxdir" # $AUX --ax_enable_builddir_sed="$ax_enable_builddir_sed" # $SED --ax_enable_builddir="$ax_enable_builddir" # $SUB -- - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -@@ -15637,7 +14639,6 @@ for ac_config_target in $ac_config_targe - do - case $ac_config_target in - "fficonfig.h") CONFIG_HEADERS="$CONFIG_HEADERS fficonfig.h" ;; -- "buildir") CONFIG_COMMANDS="$CONFIG_COMMANDS buildir" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;; -@@ -16276,150 +15277,6 @@ $as_echo "$as_me: executing $ac_file com - + 2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - case $ac_file$ac_mode in -- "buildir":C) ac_top_srcdir="$ax_enable_builddir_srcdir" -- if test ".$ax_enable_builddir" = ".." ; then -- if test -f "$top_srcdir/Makefile" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: skipping top_srcdir/Makefile - left untouched" >&5 --$as_echo "$as_me: skipping top_srcdir/Makefile - left untouched" >&6;} -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: skipping top_srcdir/Makefile - not created" >&5 --$as_echo "$as_me: skipping top_srcdir/Makefile - not created" >&6;} -- fi -- else -- if test -f "$ac_top_srcdir/Makefile" ; then -- a=`grep "^VERSION " "$ac_top_srcdir/Makefile"` ; b=`grep "^VERSION " Makefile` -- test "$a" != "$b" && rm "$ac_top_srcdir/Makefile" -- fi -- if test -f "$ac_top_srcdir/Makefile" ; then -- echo "$ac_top_srcdir/Makefile : $ac_top_srcdir/Makefile.in" > $tmp/conftemp.mk -- echo " @ echo 'REMOVED,,,' >\$@" >> $tmp/conftemp.mk -- eval "${MAKE-make} -f $tmp/conftemp.mk 2>/dev/null >/dev/null" -- if grep '^REMOVED,,,' "$ac_top_srcdir/Makefile" >/dev/null -- then rm $ac_top_srcdir/Makefile ; fi -- cp $tmp/conftemp.mk $ac_top_srcdir/makefiles.mk~ ## DEBUGGING -- fi -- if test ! -f "$ac_top_srcdir/Makefile" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: create top_srcdir/Makefile guessed from local Makefile" >&5 --$as_echo "$as_me: create top_srcdir/Makefile guessed from local Makefile" >&6;} -- x='`' ; cat >$tmp/conftemp.sed <<_EOF --/^\$/n --x --/^\$/bS --x --/\\\\\$/{H;d;} --{H;s/.*//;x;} --bM --:S --x --/\\\\\$/{h;d;} --{h;s/.*//;x;} --:M --s/\\(\\n\\) /\\1 /g --/^ /d --/^[ ]*[\\#]/d --/^VPATH *=/d --s/^srcdir *=.*/srcdir = ./ --s/^top_srcdir *=.*/top_srcdir = ./ --/[:=]/!d --/^\\./d --/ = /b --/ .= /b --/:/!b --s/:.*/:/ --s/ / /g --s/ \\([a-z][a-z-]*[a-zA-Z0-9]\\)\\([ :]\\)/ \\1 \\1-all\\2/g --s/^\\([a-z][a-z-]*[a-zA-Z0-9]\\)\\([ :]\\)/\\1 \\1-all\\2/ --s/ / /g --/^all all-all[ :]/i\\ --all-configured : all-all --s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-all//g --/-all-all/d --a\\ -- @ HOST="\$(HOST)\" \\\\\\ -- ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ -- ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ -- ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ -- ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" = "0" ; then : \\\\\\ -- ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\ -- ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ -- ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\ -- ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -- ; (cd "\$\$i" && test ! -f configure && \$(MAKE) \$\$use) || exit; done --/dist-all *:/a\\ -- @ HOST="\$(HOST)\" \\\\\\ -- ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ -- ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ -- ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ -- ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\ -- ; if test "\$\$found" = "0" ; then : \\\\\\ -- ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ -- ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -- ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\ -- ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done --/dist-[a-zA-Z0-9]*-all *:/a\\ -- @ HOST="\$(HOST)\" \\\\\\ -- ; test ".\$\$HOST" = "." && HOST=$x sh ./config.guess $x \\\\\\ -- ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ -- ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ -- ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\ -- ; if test "\$\$found" = "0" ; then : \\\\\\ -- ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ -- ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -- ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\ -- ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done --/distclean-all *:/a\\ -- @ HOST="\$(HOST)\" \\\\\\ -- ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ -- ; BUILD=$x grep "^#### .*|" Makefile | sed -e 's/.*|//' $x \\\\\\ -- ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ -- ; echo "MAKE \$\$HOST : \$\$n * \$\@ (all local builds)" \\\\\\ -- ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ -- ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -- ; echo "# rm -r \$\$i"; done ; echo "# (sleep 3)" ; sleep 3 \\\\\\ -- ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ -- ; echo "\$\$i" | grep "^/" > /dev/null && continue \\\\\\ -- ; echo "\$\$i" | grep "^../" > /dev/null && continue \\\\\\ -- ; echo "rm -r \$\$i"; (rm -r "\$\$i") ; done ; rm Makefile --_EOF -- cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~" ## DEBUGGING -- $ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >$ac_top_srcdir/Makefile -- if test -f "$ac_top_srcdir/Makefile.mk" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5 --$as_echo "$as_me: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&6;} -- cat $ac_top_srcdir/Makefile.mk >>$ac_top_srcdir/Makefile -- fi ; xxxx="####" -- echo "$xxxx CONFIGURATIONS FOR TOPLEVEL MAKEFILE: " >>$ac_top_srcdir/Makefile -- # sanity check -- if grep '^; echo "MAKE ' $ac_top_srcdir/Makefile >/dev/null ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: buggy sed found - it deletes tab in \"a\" text parts" >&5 --$as_echo "$as_me: buggy sed found - it deletes tab in \"a\" text parts" >&6;} -- $ax_enable_builddir_sed -e '/^@ HOST=/s/^/ /' -e '/^; /s/^/ /' $ac_top_srcdir/Makefile \ -- >$ac_top_srcdir/Makefile~ -- (test -s $ac_top_srcdir/Makefile~ && mv $ac_top_srcdir/Makefile~ $ac_top_srcdir/Makefile) 2>/dev/null -- fi -- else -- xxxx="\\#\\#\\#\\#" -- # echo "/^$xxxx *$ax_enable_builddir_host /d" >$tmp/conftemp.sed -- echo "s!^$xxxx [^|]* | *$ax_enable_builddir *\$!$xxxx ...... $ax_enable_builddir!" >$tmp/conftemp.sed -- $ax_enable_builddir_sed -f "$tmp/conftemp.sed" "$ac_top_srcdir/Makefile" >$tmp/mkfile.tmp -- cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefiles.sed~" ## DEBUGGING -- cp "$tmp/mkfile.tmp" "$ac_top_srcdir/makefiles.out~" ## DEBUGGING -- if cmp -s "$ac_top_srcdir/Makefile" "$tmp/mkfile.tmp" 2>/dev/null ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: keeping top_srcdir/Makefile from earlier configure" >&5 --$as_echo "$as_me: keeping top_srcdir/Makefile from earlier configure" >&6;} -- rm "$tmp/mkfile.tmp" -- else -- { $as_echo "$as_me:${as_lineno-$LINENO}: reusing top_srcdir/Makefile from earlier configure" >&5 --$as_echo "$as_me: reusing top_srcdir/Makefile from earlier configure" >&6;} -- mv "$tmp/mkfile.tmp" "$ac_top_srcdir/Makefile" -- fi -- fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: build in $ax_enable_builddir (HOST=$ax_enable_builddir_host)" >&5 --$as_echo "$as_me: build in $ax_enable_builddir (HOST=$ax_enable_builddir_host)" >&6;} -- xxxx="####" -- echo "$xxxx" "$ax_enable_builddir_host" "|$ax_enable_builddir" >>$ac_top_srcdir/Makefile -- fi -- ;; - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval + * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force. Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac @@ -1549,7 +27,7 @@ Index: libffi/configure.ac TARGET=PA_LINUX; TARGETDIR=pa ;; hppa*64-*-hpux*) -@@ -151,7 +151,7 @@ case "$host" in +@@ -155,7 +155,7 @@ case "$host" in powerpc-*-aix* | rs6000-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc ;; diff --git a/patches/msvcc b/patches/msvcc index e5dbbef..34f80cd 100644 --- a/patches/msvcc +++ b/patches/msvcc @@ -2,12 +2,14 @@ Index: libffi/Makefile.am =================================================================== --- libffi.orig/Makefile.am +++ libffi/Makefile.am -@@ -31,7 +31,9 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change - src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ - src/moxie/eabi.S libtool-version ChangeLog.libffi \ - m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ +@@ -30,8 +30,10 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change + src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ + src/moxie/ffi.c src/moxie/eabi.S libtool-version \ + ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ +- m4/ltoptions.m4 m4/ltsugar.m4 - m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh -+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ ++ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 build-ios.sh \ ++ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ + msvcc.sh + @@ -17,13 +19,22 @@ Index: libffi/Makefile.in =================================================================== --- libffi.orig/Makefile.in +++ libffi/Makefile.in -@@ -428,7 +428,8 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change - src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ - src/moxie/eabi.S libtool-version ChangeLog.libffi \ - m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ -- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh -+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ +@@ -428,7 +428,9 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change + src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ + src/moxie/ffi.c src/moxie/eabi.S libtool-version \ + ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ +- m4/ltoptions.m4 m4/ltsugar.m4 ++ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 build-ios.sh \ ++ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ + msvcc.sh info_TEXINFOS = doc/libffi.texi +@@ -1818,7 +1820,6 @@ uninstall-am: uninstall-dvi-am uninstall + uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ + uninstall-pkgconfigDATA uninstall-ps-am + +- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh + + # No install-html or install-pdf support in automake yet + .PHONY: install-html install-pdf diff --git a/patches/msvcc-warning b/patches/msvcc-warning index 549fd30..5911f96 100644 --- a/patches/msvcc-warning +++ b/patches/msvcc-warning @@ -55,7 +55,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -231,6 +231,11 @@ +@@ -248,6 +248,11 @@ * man/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. diff --git a/patches/ppc64-darwin b/patches/ppc64-darwin index 5ead772..a93babf 100644 --- a/patches/ppc64-darwin +++ b/patches/ppc64-darwin @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,10 @@ +@@ -50,6 +50,10 @@ * configure: Regenerate. @@ -17,7 +17,7 @@ Index: libffi/configure =================================================================== --- libffi.orig/configure +++ libffi/configure -@@ -12126,7 +12126,7 @@ case "$host" in +@@ -12130,7 +12130,7 @@ case "$host" in powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc ;; @@ -26,7 +26,7 @@ Index: libffi/configure TARGET=POWERPC_DARWIN; TARGETDIR=powerpc ;; powerpc-*-aix* | rs6000-*-aix*) -@@ -12135,7 +12135,7 @@ case "$host" in +@@ -12139,7 +12139,7 @@ case "$host" in powerpc-*-freebsd*) TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc ;; @@ -39,7 +39,7 @@ Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac +++ libffi/configure.ac -@@ -137,7 +137,7 @@ case "$host" in +@@ -141,7 +141,7 @@ case "$host" in powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc ;; @@ -48,7 +48,7 @@ Index: libffi/configure.ac TARGET=POWERPC_DARWIN; TARGETDIR=powerpc ;; powerpc-*-aix* | rs6000-*-aix*) -@@ -146,7 +146,7 @@ case "$host" in +@@ -150,7 +150,7 @@ case "$host" in powerpc-*-freebsd*) TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc ;; diff --git a/patches/remove-debug-code b/patches/remove-debug-code index 31494b5..2458656 100644 --- a/patches/remove-debug-code +++ b/patches/remove-debug-code @@ -3,17 +3,17 @@ Index: libffi/ChangeLog --- libffi.orig/ChangeLog +++ libffi/ChangeLog @@ -1,3 +1,23 @@ -+2011-09-06 Anthony Green <green@moxielogic.com> ++2011-11-12 Anthony Green <green@moxielogic.com> + + * Makefile.am (AM_CCASFLAGS): Add -g option to build assembly + files with debug info. + * Makefile.in: Rebuilt. + -+2011-08-24 Jasper Lievisse Adriaanse <jasper@openbsd.org> ++2011-11-12 Jasper Lievisse Adriaanse <jasper@openbsd.org> + + * README: Update list of supported OpenBSD systems. + -+2011-08-32 Anthony Green <green@moxielogic.com> ++2011-11-12 Anthony Green <green@moxielogic.com> + + * libtool-version: Update. + * Makefile.am (nodist_libffi_la_SOURCES): Add src/debug.c if @@ -23,25 +23,14 @@ Index: libffi/ChangeLog + * Makefile.in: Rebuilt. + * README: Update for 3.0.11. + - 2011-08-22 Jasper Lievisse Adriaanse <jasper@openbsd.org> + 2011-11-10 Richard Henderson <rth@redhat.com> - * configure.ac: Add OpenBSD/hppa and OpenBSD/powerpc support. + * configure.ac (GCC_AS_CFI_PSEUDO_OP): Use it instead of inline check. Index: libffi/Makefile.am =================================================================== --- libffi.orig/Makefile.am +++ libffi/Makefile.am -@@ -31,9 +31,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change - src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ - src/moxie/eabi.S libtool-version ChangeLog.libffi \ - m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ -- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ -- msvcc.sh -- -+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh msvcc.sh - - info_TEXINFOS = doc/libffi.texi - -@@ -88,7 +86,7 @@ ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4 +@@ -88,7 +88,7 @@ ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4 lib_LTLIBRARIES = libffi.la noinst_LTLIBRARIES = libffi_convenience.la @@ -50,7 +39,7 @@ Index: libffi/Makefile.am src/raw_api.c src/java_raw_api.c src/closures.c pkgconfigdir = $(libdir)/pkgconfig -@@ -96,6 +94,10 @@ pkgconfig_DATA = libffi.pc +@@ -96,6 +96,10 @@ pkgconfig_DATA = libffi.pc nodist_libffi_la_SOURCES = @@ -61,7 +50,7 @@ Index: libffi/Makefile.am if MIPS nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S endif -@@ -188,7 +190,7 @@ endif +@@ -191,7 +195,7 @@ endif libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src @@ -74,7 +63,7 @@ Index: libffi/Makefile.in =================================================================== --- libffi.orig/Makefile.in +++ libffi/Makefile.in -@@ -36,35 +36,36 @@ POST_UNINSTALL = : +@@ -36,36 +36,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @@ -98,12 +87,13 @@ Index: libffi/Makefile.in -@AVR32_TRUE@am__append_18 = src/avr32/sysv.S src/avr32/ffi.c -@LIBFFI_CRIS_TRUE@am__append_19 = src/cris/sysv.S src/cris/ffi.c -@FRV_TRUE@am__append_20 = src/frv/eabi.S src/frv/ffi.c --@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c --@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S --@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c --@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c --@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c --@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c +-@MOXIE_TRUE@am__append_21 = src/moxie/eabi.S src/moxie/ffi.c +-@S390_TRUE@am__append_22 = src/s390/sysv.S src/s390/ffi.c +-@X86_64_TRUE@am__append_23 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S +-@SH_TRUE@am__append_24 = src/sh/sysv.S src/sh/ffi.c +-@SH64_TRUE@am__append_25 = src/sh64/sysv.S src/sh64/ffi.c +-@PA_LINUX_TRUE@am__append_26 = src/pa/linux.S src/pa/ffi.c +-@PA_HPUX_TRUE@am__append_27 = src/pa/hpux32.S src/pa/ffi.c +@FFI_DEBUG_TRUE@am__append_1 = src/debug.c +@MIPS_TRUE@am__append_2 = src/mips/ffi.c src/mips/o32.S src/mips/n32.S +@X86_TRUE@am__append_3 = src/x86/ffi.c src/x86/sysv.S @@ -125,43 +115,21 @@ Index: libffi/Makefile.in +@AVR32_TRUE@am__append_19 = src/avr32/sysv.S src/avr32/ffi.c +@LIBFFI_CRIS_TRUE@am__append_20 = src/cris/sysv.S src/cris/ffi.c +@FRV_TRUE@am__append_21 = src/frv/eabi.S src/frv/ffi.c -+@S390_TRUE@am__append_22 = src/s390/sysv.S src/s390/ffi.c -+@X86_64_TRUE@am__append_23 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -+@SH_TRUE@am__append_24 = src/sh/sysv.S src/sh/ffi.c -+@SH64_TRUE@am__append_25 = src/sh64/sysv.S src/sh64/ffi.c -+@PA_LINUX_TRUE@am__append_26 = src/pa/linux.S src/pa/ffi.c -+@PA_HPUX_TRUE@am__append_27 = src/pa/hpux32.S src/pa/ffi.c ++@MOXIE_TRUE@am__append_22 = src/moxie/eabi.S src/moxie/ffi.c ++@S390_TRUE@am__append_23 = src/s390/sysv.S src/s390/ffi.c ++@X86_64_TRUE@am__append_24 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S ++@SH_TRUE@am__append_25 = src/sh/sysv.S src/sh/ffi.c ++@SH64_TRUE@am__append_26 = src/sh64/sysv.S src/sh64/ffi.c ++@PA_LINUX_TRUE@am__append_27 = src/pa/linux.S src/pa/ffi.c ++@PA_HPUX_TRUE@am__append_28 = src/pa/hpux32.S src/pa/ffi.c # Build debug. Define FFI_DEBUG on the commandline so that, when building with # MSVC, it can link against the debug CRT. --@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG -+@FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG +-@FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG ++@FFI_DEBUG_TRUE@am__append_29 = -DFFI_DEBUG subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ -@@ -73,10 +74,18 @@ DIST_COMMON = README $(am__configure_dep - compile config.guess config.sub depcomp install-sh ltmain.sh \ - mdate-sh missing texinfo.tex - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ -- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ -- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ -- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac -+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \ -+ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ -+ $(top_srcdir)/m4/ax_check_compiler_flags.m4 \ -+ $(top_srcdir)/m4/ax_compiler_vendor.m4 \ -+ $(top_srcdir)/m4/ax_configure_args.m4 \ -+ $(top_srcdir)/m4/ax_enable_builddir.m4 \ -+ $(top_srcdir)/m4/ax_gcc_archflag.m4 \ -+ $(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \ -+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ -+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ -+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -@@ -111,47 +120,48 @@ am__installdirs = "$(DESTDIR)$(libdir)" +@@ -120,48 +121,49 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libffi_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp @@ -217,89 +185,65 @@ Index: libffi/Makefile.in -@AVR32_TRUE@am__objects_18 = src/avr32/sysv.lo src/avr32/ffi.lo -@LIBFFI_CRIS_TRUE@am__objects_19 = src/cris/sysv.lo src/cris/ffi.lo -@FRV_TRUE@am__objects_20 = src/frv/eabi.lo src/frv/ffi.lo --@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo --@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \ +-@MOXIE_TRUE@am__objects_21 = src/moxie/eabi.lo src/moxie/ffi.lo +-@S390_TRUE@am__objects_22 = src/s390/sysv.lo src/s390/ffi.lo +-@X86_64_TRUE@am__objects_23 = src/x86/ffi64.lo src/x86/unix64.lo \ +@ARM_TRUE@am__objects_17 = src/arm/sysv.lo src/arm/ffi.lo +@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_18 = src/arm/trampoline.lo +@AVR32_TRUE@am__objects_19 = src/avr32/sysv.lo src/avr32/ffi.lo +@LIBFFI_CRIS_TRUE@am__objects_20 = src/cris/sysv.lo src/cris/ffi.lo +@FRV_TRUE@am__objects_21 = src/frv/eabi.lo src/frv/ffi.lo -+@S390_TRUE@am__objects_22 = src/s390/sysv.lo src/s390/ffi.lo -+@X86_64_TRUE@am__objects_23 = src/x86/ffi64.lo src/x86/unix64.lo \ ++@MOXIE_TRUE@am__objects_22 = src/moxie/eabi.lo src/moxie/ffi.lo ++@S390_TRUE@am__objects_23 = src/s390/sysv.lo src/s390/ffi.lo ++@X86_64_TRUE@am__objects_24 = src/x86/ffi64.lo src/x86/unix64.lo \ @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo --@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo --@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo --@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo --@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo -+@SH_TRUE@am__objects_24 = src/sh/sysv.lo src/sh/ffi.lo -+@SH64_TRUE@am__objects_25 = src/sh64/sysv.lo src/sh64/ffi.lo -+@PA_LINUX_TRUE@am__objects_26 = src/pa/linux.lo src/pa/ffi.lo -+@PA_HPUX_TRUE@am__objects_27 = src/pa/hpux32.lo src/pa/ffi.lo +-@SH_TRUE@am__objects_24 = src/sh/sysv.lo src/sh/ffi.lo +-@SH64_TRUE@am__objects_25 = src/sh64/sysv.lo src/sh64/ffi.lo +-@PA_LINUX_TRUE@am__objects_26 = src/pa/linux.lo src/pa/ffi.lo +-@PA_HPUX_TRUE@am__objects_27 = src/pa/hpux32.lo src/pa/ffi.lo ++@SH_TRUE@am__objects_25 = src/sh/sysv.lo src/sh/ffi.lo ++@SH64_TRUE@am__objects_26 = src/sh64/sysv.lo src/sh64/ffi.lo ++@PA_LINUX_TRUE@am__objects_27 = src/pa/linux.lo src/pa/ffi.lo ++@PA_HPUX_TRUE@am__objects_28 = src/pa/hpux32.lo src/pa/ffi.lo nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ $(am__objects_6) $(am__objects_7) $(am__objects_8) \ -@@ -160,17 +170,18 @@ nodist_libffi_la_OBJECTS = $(am__objects - $(am__objects_15) $(am__objects_16) $(am__objects_17) \ +@@ -171,17 +173,17 @@ nodist_libffi_la_OBJECTS = $(am__objects $(am__objects_18) $(am__objects_19) $(am__objects_20) \ $(am__objects_21) $(am__objects_22) $(am__objects_23) \ -- $(am__objects_24) $(am__objects_25) $(am__objects_26) -+ $(am__objects_24) $(am__objects_25) $(am__objects_26) \ -+ $(am__objects_27) + $(am__objects_24) $(am__objects_25) $(am__objects_26) \ +- $(am__objects_27) ++ $(am__objects_27) $(am__objects_28) libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ $(nodist_libffi_la_OBJECTS) libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ libffi_convenience_la_LIBADD = --am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \ +-am__objects_28 = src/debug.lo src/prep_cif.lo src/types.lo \ - src/raw_api.lo src/java_raw_api.lo src/closures.lo --am_libffi_convenience_la_OBJECTS = $(am__objects_27) --am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ -+am__objects_28 = src/prep_cif.lo src/types.lo src/raw_api.lo \ +-am_libffi_convenience_la_OBJECTS = $(am__objects_28) +-am__objects_29 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ ++am__objects_29 = src/prep_cif.lo src/types.lo src/raw_api.lo \ + src/java_raw_api.lo src/closures.lo -+am_libffi_convenience_la_OBJECTS = $(am__objects_28) -+am__objects_29 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ ++am_libffi_convenience_la_OBJECTS = $(am__objects_29) ++am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ $(am__objects_7) $(am__objects_8) $(am__objects_9) \ $(am__objects_10) $(am__objects_11) $(am__objects_12) \ -@@ -178,8 +189,8 @@ am__objects_28 = $(am__objects_1) $(am__ +@@ -189,8 +191,9 @@ am__objects_29 = $(am__objects_1) $(am__ $(am__objects_16) $(am__objects_17) $(am__objects_18) \ $(am__objects_19) $(am__objects_20) $(am__objects_21) \ $(am__objects_22) $(am__objects_23) $(am__objects_24) \ -- $(am__objects_25) $(am__objects_26) --nodist_libffi_convenience_la_OBJECTS = $(am__objects_28) -+ $(am__objects_25) $(am__objects_26) $(am__objects_27) -+nodist_libffi_convenience_la_OBJECTS = $(am__objects_29) +- $(am__objects_25) $(am__objects_26) $(am__objects_27) +-nodist_libffi_convenience_la_OBJECTS = $(am__objects_29) ++ $(am__objects_25) $(am__objects_26) $(am__objects_27) \ ++ $(am__objects_28) ++nodist_libffi_convenience_la_OBJECTS = $(am__objects_30) libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ $(nodist_libffi_convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -@@ -332,6 +343,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -+PRTDIAG = @PRTDIAG@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -@@ -352,6 +364,7 @@ am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ - am__tar = @am__tar@ - am__untar = @am__untar@ -+ax_enable_builddir_sed = @ax_enable_builddir_sed@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ -@@ -428,8 +441,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change - src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \ - src/moxie/eabi.S libtool-version ChangeLog.libffi \ - m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ -- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \ -- msvcc.sh -+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh msvcc.sh - - info_TEXINFOS = doc/libffi.texi - -@@ -475,7 +487,7 @@ MAKEOVERRIDES = +@@ -488,7 +491,7 @@ MAKEOVERRIDES = ACLOCAL_AMFLAGS = $(ACLOCAL_AMFLAGS) -I m4 lib_LTLIBRARIES = libffi.la noinst_LTLIBRARIES = libffi_convenience.la @@ -308,17 +252,16 @@ Index: libffi/Makefile.in src/raw_api.c src/java_raw_api.c src/closures.c pkgconfigdir = $(libdir)/pkgconfig -@@ -488,13 +500,14 @@ nodist_libffi_la_SOURCES = $(am__append_ - $(am__append_15) $(am__append_16) $(am__append_17) \ +@@ -502,13 +505,13 @@ nodist_libffi_la_SOURCES = $(am__append_ $(am__append_18) $(am__append_19) $(am__append_20) \ $(am__append_21) $(am__append_22) $(am__append_23) \ -- $(am__append_24) $(am__append_25) $(am__append_26) -+ $(am__append_24) $(am__append_25) $(am__append_26) \ -+ $(am__append_27) + $(am__append_24) $(am__append_25) $(am__append_26) \ +- $(am__append_27) ++ $(am__append_27) $(am__append_28) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) --AM_CFLAGS = -g $(am__append_27) -+AM_CFLAGS = -g $(am__append_28) +-AM_CFLAGS = -g $(am__append_28) ++AM_CFLAGS = -g $(am__append_29) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -AM_CCASFLAGS = $(AM_CPPFLAGS) @@ -326,7 +269,7 @@ Index: libffi/Makefile.in all: fficonfig.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -599,12 +612,12 @@ src/$(am__dirstamp): +@@ -613,12 +616,12 @@ src/$(am__dirstamp): src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/$(DEPDIR) @: > src/$(DEPDIR)/$(am__dirstamp) diff --git a/patches/sparc-abi-check b/patches/sparc-abi-check index a1f49f5..ab6a678 100644 --- a/patches/sparc-abi-check +++ b/patches/sparc-abi-check @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,11 @@ +@@ -50,6 +50,11 @@ * configure: Regenerate. diff --git a/patches/sparc-v8-aggregate-returns b/patches/sparc-v8-aggregate-returns index 6b8460e..6cbc879 100644 --- a/patches/sparc-v8-aggregate-returns +++ b/patches/sparc-v8-aggregate-returns @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -33,6 +33,12 @@ +@@ -50,6 +50,12 @@ * configure: Regenerate. diff --git a/patches/stand-alone b/patches/stand-alone index 0a89a2f..6c4838c 100644 --- a/patches/stand-alone +++ b/patches/stand-alone @@ -627,16 +627,15 @@ Index: libffi/Makefile.am SUBDIRS = include testsuite man -@@ -27,10 +26,17 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change - src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \ +@@ -28,10 +27,16 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \ src/sparc/ffi.c src/x86/darwin64.S \ -- src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ -+ src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/win64.S \ -+ src/x86/darwin.S src/x86/freebsd.S \ + src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ ++ src/x86/win64.S src/x86/freebsd.S \ src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \ src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \ -- src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c +- src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ +- src/moxie/ffi.c src/moxie/eabi.S + src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h \ + src/dlmalloc.c \ + src/moxie/ffi.c src/moxie/eabi.S \ @@ -647,7 +646,7 @@ Index: libffi/Makefile.am ## ################################################################ -@@ -78,12 +84,17 @@ AM_MAKEFLAGS = \ +@@ -79,12 +84,17 @@ AM_MAKEFLAGS = \ MAKEOVERRIDES= @@ -666,7 +665,7 @@ Index: libffi/Makefile.am nodist_libffi_la_SOURCES = if MIPS -@@ -167,17 +178,12 @@ nodist_libffi_convenience_la_SOURCES = $ +@@ -171,17 +181,12 @@ nodist_libffi_convenience_la_SOURCES = $ AM_CFLAGS = -Wall -g -fexceptions @@ -692,18 +691,54 @@ Index: libffi/configure =================================================================== --- libffi.orig/configure +++ libffi/configure -@@ -1,8 +1,8 @@ +@@ -1,13 +1,15 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.68 for libffi 3.0.9. +-# Generated by GNU Autoconf 2.64 for libffi 3.0.9. +# Generated by GNU Autoconf 2.68 for libffi 3.0.11-rc1. - # --# Report bugs to <http://gcc.gnu.org/bugs.html>. ++# +# Report bugs to <http://sourceware.org/libffi.html>. # +-# Report bugs to <http://gcc.gnu.org/bugs.html>. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -@@ -247,7 +247,7 @@ fi +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software + # Foundation, Inc. + # ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## -------------------- ## +@@ -89,6 +91,7 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -222,11 +225,18 @@ IFS=$as_save_IFS + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. ++ # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ case $- in # (((( ++ *v*x* | *x*v* ) as_opts=-vx ;; ++ *v* ) as_opts=-v ;; ++ *x* ) as_opts=-x ;; ++ * ) as_opts= ;; ++ esac ++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + fi + + if test x$as_have_required = xno; then : +@@ -237,7 +247,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and @@ -712,7 +747,58 @@ Index: libffi/configure $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." -@@ -570,9 +570,9 @@ MAKEFLAGS= +@@ -325,7 +335,7 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -365,19 +375,19 @@ else + fi # as_fn_arith + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -537,10 +547,11 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr + SHELL=${CONFIG_SHELL-/bin/sh} + + +-exec 7<&0 </dev/null 6>&1 ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + + # Name of the host. +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +@@ -559,9 +570,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' @@ -725,7 +811,7 @@ Index: libffi/configure PACKAGE_URL='' # Factoring default headers for most tests. -@@ -651,6 +651,8 @@ POWERPC_AIX_FALSE +@@ -640,6 +651,8 @@ POWERPC_AIX_FALSE POWERPC_AIX_TRUE POWERPC_FALSE POWERPC_TRUE @@ -734,7 +820,19 @@ Index: libffi/configure M68K_FALSE M68K_TRUE M32R_FALSE -@@ -758,7 +760,6 @@ build_os +@@ -675,8 +688,11 @@ OTOOL + LIPO + NMEDIT + DSYMUTIL ++MANIFEST_TOOL + RANLIB ++ac_ct_AR + AR ++DLLTOOL + OBJDUMP + LN_S + NM +@@ -744,7 +760,6 @@ build_os build_vendor build_cpu build @@ -742,7 +840,7 @@ Index: libffi/configure target_alias host_alias build_alias -@@ -800,7 +801,6 @@ SHELL' +@@ -786,13 +801,13 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -750,7 +848,153 @@ Index: libffi/configure enable_dependency_tracking enable_shared enable_static -@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then + with_pic + enable_fast_install + with_gnu_ld ++with_sysroot + enable_libtool_lock + enable_maintainer_mode + enable_debug +@@ -869,8 +884,9 @@ do + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -915,7 +931,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -941,7 +957,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1145,7 +1161,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1161,7 +1177,7 @@ do + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1191,8 +1207,8 @@ do + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) as_fn_error "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" + ;; + + *=*) +@@ -1200,7 +1216,7 @@ Try \`$0 --help' for more information." + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1210,7 +1226,7 @@ Try \`$0 --help' for more information." + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +@@ -1218,13 +1234,13 @@ done + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1247,7 +1263,7 @@ do + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1261,8 +1277,8 @@ target=$target_alias + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1277,9 +1293,9 @@ test "$silent" = yes && exec 6>/dev/null + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1318,11 +1334,11 @@ else + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1348,7 +1364,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF @@ -759,7 +1003,16 @@ Index: libffi/configure Usage: $0 [OPTION]... [VAR=VALUE]... -@@ -1435,7 +1435,7 @@ fi +@@ -1362,7 +1378,7 @@ Configuration: + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1419,7 +1435,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in @@ -768,7 +1021,7 @@ Index: libffi/configure esac cat <<\_ACEOF -@@ -1443,7 +1443,6 @@ Optional Features: +@@ -1427,7 +1443,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] @@ -776,7 +1029,25 @@ Index: libffi/configure --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] -@@ -1482,7 +1481,7 @@ Some influential environment variables: +@@ -1448,6 +1463,8 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-sysroot=DIR Search for dependent libraries within DIR ++ (or the compiler's sysroot if not specified). + + Some influential environment variables: + CC C compiler command +@@ -1455,7 +1472,7 @@ Some influential environment variables: + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + LIBS libraries to pass to the linker, e.g. -l<library> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) +@@ -1464,7 +1481,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -785,38 +1056,354 @@ Index: libffi/configure _ACEOF ac_status=$? fi -@@ -1545,7 +1544,7 @@ fi +@@ -1527,10 +1544,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.9 +-generated by GNU Autoconf 2.64 +libffi configure 3.0.11-rc1 - generated by GNU Autoconf 2.68 ++generated by GNU Autoconf 2.68 + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1574,8 +1591,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -1620,8 +1637,8 @@ fi + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link - Copyright (C) 2010 Free Software Foundation, Inc. -@@ -1890,9 +1889,9 @@ $as_echo "$as_me: WARNING: $2: see the A +@@ -1634,7 +1651,7 @@ ac_fn_c_check_header_compile () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1652,7 +1669,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_compile + +@@ -1677,7 +1694,7 @@ $as_echo "$ac_try_echo"; } >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1688,8 +1705,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -1730,8 +1747,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -1743,7 +1760,7 @@ ac_fn_c_check_func () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1798,7 +1815,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_func + +@@ -1810,10 +1827,10 @@ $as_echo "$ac_res" >&6; } + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1849,7 +1866,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1872,17 +1889,15 @@ $as_echo "$as_me: WARNING: $2: see the A $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} --( $as_echo "## ------------------------------------------- ## +-( cat <<\_ASBOX +-## ------------------------------------------- ## -## Report this to http://gcc.gnu.org/bugs.html ## --## ------------------------------------------- ##" +-## ------------------------------------------- ## +-_ASBOX +( $as_echo "## ------------------------------------------------ ## +## Report this to http://sourceware.org/libffi.html ## +## ------------------------------------------------ ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -@@ -2146,7 +2145,7 @@ cat >config.log <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1891,10 +1906,64 @@ eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_mongrel + ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_c_check_type ++ + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES + # -------------------------------------------- + # Tries to find the compile-time value of EXPR in a program that includes +@@ -2068,16 +2137,16 @@ rm -f core *.core core.conftest.* gmon.o + rm -f conftest.val + + fi +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.9, which was +-generated by GNU Autoconf 2.64. Invocation command line was +It was created by libffi $as_me 3.0.11-rc1, which was - generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ -@@ -2497,44 +2496,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + +@@ -2187,11 +2256,9 @@ trap 'exit_status=$? + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2225,11 +2292,9 @@ $as_echo "$as_me: WARNING: cache variabl + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -2242,11 +2307,9 @@ _ASBOX + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -2260,11 +2323,9 @@ _ASBOX + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -2319,7 +2380,12 @@ _ACEOF + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -2330,18 +2396,22 @@ fi + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -2410,7 +2480,7 @@ if $ac_cache_corrupted; then + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +@@ -2423,62 +2493,27 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +- +- +- ac_config_headers="$ac_config_headers fficonfig.h" @@ -826,7 +1413,7 @@ Index: libffi/configure - enableval=$enable_multilib; case "$enableval" in - yes) multilib=yes ;; - no) multilib=no ;; -- *) as_fn_error $? "bad value $enableval for multilib option" "$LINENO" 5 ;; +- *) as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;; - esac -else - multilib=yes @@ -860,8 +1447,239 @@ Index: libffi/configure - ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -3117,7 +3078,7 @@ fi +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi + done + if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2492,27 +2527,27 @@ ac_configure="$SHELL $ac_aux_dir/configu + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then : ++if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -2530,14 +2565,14 @@ case $build_os in *\ *) build_os=`echo " + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then : ++if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +@@ -2545,7 +2580,7 @@ fi + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -2563,14 +2598,14 @@ case $host_os in *\ *) host_os=`echo "$h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 + $as_echo_n "checking target system type... " >&6; } +-if test "${ac_cv_target+set}" = set; then : ++if ${ac_cv_target+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host + else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || +- as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + fi + + fi +@@ -2578,7 +2613,7 @@ fi + $as_echo "$ac_cv_target" >&6; } + case $ac_cv_target in + *-*-*) ;; +-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; + esac + target=$ac_cv_target + ac_save_IFS=$IFS; IFS='-' +@@ -2624,7 +2659,7 @@ am__api_version='1.11' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then : ++if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2711,11 +2746,11 @@ am_lf=' + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2737,7 +2772,7 @@ if ( + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- as_fn_error "ls -t appears to fail. Make sure there is not a broken ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + +@@ -2747,7 +2782,7 @@ then + # Ok. + : + else +- as_fn_error "newly created file is older than distributed files! ++ as_fn_error $? "newly created file is older than distributed files! + Check your system clock" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -2801,7 +2836,7 @@ if test "$cross_compiling" != no; then + set dummy ${ac_tool_prefix}strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then : ++if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2841,7 +2876,7 @@ if test -z "$ac_cv_prog_STRIP"; then + set dummy strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2894,7 +2929,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then : ++ if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2919,6 +2954,7 @@ IFS=$as_save_IFS + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -2926,7 +2962,6 @@ fi + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +@@ -2945,7 +2980,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then : ++if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2985,7 +3020,7 @@ done + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2993,7 +3028,7 @@ SHELL = /bin/sh + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -3027,7 +3062,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`" + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -3043,7 +3078,7 @@ fi # Define the identity of the package. PACKAGE='libffi' @@ -870,7 +1688,304 @@ Index: libffi/configure cat >>confdefs.h <<_ACEOF -@@ -4148,6 +4109,7 @@ fi +@@ -3101,7 +3136,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3141,7 +3176,7 @@ if test -z "$ac_cv_prog_CC"; then + set dummy gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3194,7 +3229,7 @@ if test -z "$CC"; then + set dummy ${ac_tool_prefix}cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3234,7 +3269,7 @@ if test -z "$CC"; then + set dummy cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3293,7 +3328,7 @@ if test -z "$CC"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then : ++if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3337,7 +3372,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3391,8 +3426,8 @@ fi + + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "no acceptable C compiler found in \$PATH +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3413,8 +3448,8 @@ $as_echo "$ac_try_echo"; } >&5 + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done +@@ -3431,12 +3466,12 @@ main () + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3498,62 +3533,28 @@ test "$ac_cv_exeext" = no && ac_cv_exeex + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "C compiler cannot create executables +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -3583,19 +3584,78 @@ done + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then : ++if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3635,8 +3695,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -3646,7 +3706,7 @@ OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3683,7 +3743,7 @@ ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then : ++if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag +@@ -3761,7 +3821,7 @@ else + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then : ++if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no +@@ -3922,7 +3982,7 @@ depcc="$CC" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4049,6 +4109,7 @@ fi @@ -878,34 +1993,2017 @@ Index: libffi/configure # By default we simply use the C compiler to build assembly code. test "${CCAS+set}" = set || CCAS=$CC -@@ -8326,6 +8288,10 @@ _lt_linker_boilerplate=`cat conftest.err +@@ -4060,7 +4121,7 @@ depcc="$CCAS" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : ++if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4190,7 +4251,7 @@ $as_echo_n "checking whether cc understa + fi + set dummy $CC; ac_cc=`$as_echo "$2" | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4315,8 +4376,8 @@ esac + + + +-macro_version='2.2.7a' +-macro_revision='1.3134' ++macro_version='2.4' ++macro_revision='1.3293' + + + +@@ -4356,7 +4417,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 + $as_echo_n "checking how to print strings... " >&6; } + # Test print first, because it will be a builtin if present. +-if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' + elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then +@@ -4403,7 +4464,7 @@ esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then : ++if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -4458,7 +4519,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED +@@ -4485,7 +4546,7 @@ Xsed="$SED -e 1s/^X//" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then : ++if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4534,7 +4595,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP +@@ -4548,7 +4609,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then : ++if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4600,7 +4661,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4615,7 +4676,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then : ++if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -4667,7 +4728,7 @@ esac + done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -4746,7 +4807,7 @@ else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then : ++if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -4783,10 +4844,10 @@ else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -4813,7 +4874,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then : ++if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -4876,7 +4937,7 @@ else + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then : ++if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -4920,7 +4981,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -4992,7 +5053,7 @@ test -z "$NM" && NM=nm + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then : ++if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" +@@ -5027,7 +5088,7 @@ fi + # find the maximum length of command line arguments + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then : ++if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -5172,8 +5233,8 @@ $as_echo_n "checking whether the shell u + # Try some XSI features + xsi_shell=no + ( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -5222,9 +5283,83 @@ esac + + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 ++$as_echo_n "checking how to convert $build file names to $host format... " >&6; } ++if ${lt_cv_to_host_file_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 ++ ;; ++ esac ++ ;; ++ *-*-cygwin* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ++ ;; ++ *-*-cygwin* ) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++ * ) # otherwise, assume *nix ++ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin ++ ;; ++ esac ++ ;; ++ * ) # unhandled hosts (and "normal" native builds) ++ lt_cv_to_host_file_cmd=func_convert_file_noop ++ ;; ++esac ++ ++fi ++ ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 ++$as_echo "$lt_cv_to_host_file_cmd" >&6; } ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 ++$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } ++if ${lt_cv_to_tool_file_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ #assume ordinary cross tools, or native build. ++lt_cv_to_tool_file_cmd=func_convert_file_noop ++case $host in ++ *-*-mingw* ) ++ case $build in ++ *-*-mingw* ) # actually msys ++ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ++ ;; ++ esac ++ ;; ++esac ++ ++fi ++ ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 ++$as_echo "$lt_cv_to_tool_file_cmd" >&6; } ++ ++ ++ ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then : ++if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' +@@ -5238,6 +5373,11 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ if test "$GCC" != yes; then ++ reload_cmds=false ++ fi ++ ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -5260,7 +5400,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}objdump; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then : ++if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -5300,7 +5440,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then + set dummy objdump; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -5359,7 +5499,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then : ++if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -5406,7 +5546,8 @@ mingw* | pw32*) + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else +- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +@@ -5560,6 +5701,21 @@ esac + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } ++ ++file_magic_glob= ++want_nocaseglob=no ++if test "$build" = "$host"; then ++ case $host_os in ++ mingw* | pw32*) ++ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then ++ want_nocaseglob=yes ++ else ++ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` ++ fi ++ ;; ++ esac ++fi ++ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5575,12 +5731,166 @@ test -z "$deplibs_check_method" && depli + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_DLLTOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 ++$as_echo_n "checking how to associate runtime and link libraries... " >&6; } ++if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_sharedlib_from_linklib_cmd='unknown' ++ ++case $host_os in ++cygwin* | mingw* | pw32* | cegcc*) ++ # two different shell functions defined in ltmain.sh ++ # decide which to use based on capabilities of $DLLTOOL ++ case `$DLLTOOL --help 2>&1` in ++ *--identify-strict*) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib ++ ;; ++ *) ++ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback ++ ;; ++ esac ++ ;; ++*) ++ # fallback: assume linklib IS sharedlib ++ lt_cv_sharedlib_from_linklib_cmd="$ECHO" ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 ++$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } ++sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd ++test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO ++ ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ for ac_prog in ar ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then : ++if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -5593,7 +5903,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5613,14 +5923,18 @@ $as_echo "no" >&6; } + fi + + ++ test -n "$AR" && break ++ done + fi +-if test -z "$ac_cv_prog_AR"; then ++if test -z "$AR"; then + ac_ct_AR=$AR +- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++ for ac_prog in ar ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : ++if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -5633,7 +5947,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5652,6 +5966,10 @@ else + $as_echo "no" >&6; } + fi + ++ ++ test -n "$ac_ct_AR" && break ++done ++ + if test "x$ac_ct_AR" = x; then + AR="false" + else +@@ -5663,12 +5981,11 @@ ac_tool_warned=yes ;; + esac + AR=$ac_ct_AR + fi +-else +- AR="$ac_cv_prog_AR" + fi + +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru ++: ${AR=ar} ++: ${AR_FLAGS=cru} ++ + + + +@@ -5679,13 +5996,70 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru + + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 ++$as_echo_n "checking for archiver @FILE support... " >&6; } ++if ${lt_cv_ar_at_file+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ar_at_file=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ echo conftest.$ac_objext > conftest.lst ++ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ # Ensure the archiver fails upon bogus file names. ++ rm -f conftest.$ac_objext libconftest.a ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 ++ (eval $lt_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -ne 0; then ++ lt_cv_ar_at_file=@ ++ fi ++ fi ++ rm -f conftest.* libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 ++$as_echo "$lt_cv_ar_at_file" >&6; } ++ ++if test "x$lt_cv_ar_at_file" = xno; then ++ archiver_list_spec= ++else ++ archiver_list_spec=$lt_cv_ar_at_file ++fi ++ ++ ++ ++ ++ ++ + + if test -n "$ac_tool_prefix"; then + # 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then : ++if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -5725,7 +6099,7 @@ if test -z "$ac_cv_prog_STRIP"; then + set dummy strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -5784,7 +6158,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then : ++if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -5824,7 +6198,7 @@ if test -z "$ac_cv_prog_RANLIB"; then + set dummy ranlib; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -5953,7 +6327,7 @@ compiler=$CC + # Check for command to grab the raw symbol name followed by C symbol from nm. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : ++if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -6014,8 +6388,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -6051,6 +6425,7 @@ for ac_symprfx in "" "_"; do + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi ++ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -6092,6 +6467,18 @@ _LT_EOF + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext ++/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) ++/* DATA imports from DLLs on WIN32 con't be const, because runtime ++ relocations are performed -- see ld's documentation on pseudo-relocs. */ ++# define LT_DLSYM_CONST ++#elif defined(__osf__) ++/* This system does not cope well with relocations in const data. */ ++# define LT_DLSYM_CONST ++#else ++# define LT_DLSYM_CONST const ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -6103,7 +6490,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-const struct { ++LT_DLSYM_CONST struct { + const char *name; + void *address; + } +@@ -6129,8 +6516,8 @@ static const void *lt_preloaded_setup() + _LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" ++ lt_globsym_save_LIBS=$LIBS ++ lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 +@@ -6140,8 +6527,8 @@ _LT_EOF + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" ++ LIBS=$lt_globsym_save_LIBS ++ CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi +@@ -6178,6 +6565,16 @@ else + $as_echo "ok" >&6; } + fi + ++# Response file support. ++if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ nm_file_list_spec='@' ++elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then ++ nm_file_list_spec='@' ++fi ++ ++ ++ ++ + + + +@@ -6200,6 +6597,44 @@ fi + + + ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 ++$as_echo_n "checking for sysroot... " >&6; } ++ ++# Check whether --with-sysroot was given. ++if test "${with_sysroot+set}" = set; then : ++ withval=$with_sysroot; ++else ++ with_sysroot=no ++fi ++ ++ ++lt_sysroot= ++case ${with_sysroot} in #( ++ yes) ++ if test "$GCC" = yes; then ++ lt_sysroot=`$CC --print-sysroot 2>/dev/null` ++ fi ++ ;; #( ++ /*) ++ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ ;; #( ++ no|'') ++ ;; #( ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 ++$as_echo "${with_sysroot}" >&6; } ++ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ++ ;; ++esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 ++$as_echo "${lt_sysroot:-no}" >&6; } ++ ++ ++ ++ ++ + # Check whether --enable-libtool-lock was given. + if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +@@ -6325,7 +6760,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then : ++if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -6387,11 +6822,128 @@ sparc*-*solaris*) + ;; + esac + fi +- rm -rf conftest* +- ;; +-esac ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. ++set dummy ${ac_tool_prefix}mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MANIFEST_TOOL"; then ++ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL ++if test -n "$MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 ++$as_echo "$MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ++ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL ++ # Extract the first word of "mt", so it can be a program name with args. ++set dummy mt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_MANIFEST_TOOL"; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL ++if test -n "$ac_ct_MANIFEST_TOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 ++$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_MANIFEST_TOOL" = x; then ++ MANIFEST_TOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL ++ fi ++else ++ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" ++fi ++ ++test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 ++$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } ++if ${lt_cv_path_mainfest_tool+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_path_mainfest_tool=no ++ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 ++ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out ++ cat conftest.err >&5 ++ if $GREP 'Manifest Tool' conftest.out > /dev/null; then ++ lt_cv_path_mainfest_tool=yes ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 ++$as_echo "$lt_cv_path_mainfest_tool" >&6; } ++if test "x$lt_cv_path_mainfest_tool" != xyes; then ++ MANIFEST_TOOL=: ++fi ++ ++ ++ + +-need_locks="$enable_libtool_lock" + + + case $host_os in +@@ -6401,7 +6953,7 @@ need_locks="$enable_libtool_lock" + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : ++if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -6441,7 +6993,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then + set dummy dsymutil; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -6493,7 +7045,7 @@ fi + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then : ++if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -6533,7 +7085,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then + set dummy nmedit; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : ++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -6585,7 +7137,7 @@ fi + set dummy ${ac_tool_prefix}lipo; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LIPO+set}" = set; then : ++if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -6625,7 +7177,7 @@ if test -z "$ac_cv_prog_LIPO"; then + set dummy lipo; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : ++if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -6677,7 +7229,7 @@ fi + set dummy ${ac_tool_prefix}otool; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL+set}" = set; then : ++if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -6717,7 +7269,7 @@ if test -z "$ac_cv_prog_OTOOL"; then + set dummy otool; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : ++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -6769,7 +7321,7 @@ fi + set dummy ${ac_tool_prefix}otool64; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL64+set}" = set; then : ++if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -6809,7 +7361,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then + set dummy otool64; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : ++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -6884,7 +7436,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then : ++if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -6913,7 +7465,7 @@ fi + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : ++if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no +@@ -6945,7 +7497,7 @@ fi + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 + $as_echo_n "checking for -force_load linker flag... " >&6; } +-if test "${lt_cv_ld_force_load+set}" = set; then : ++if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_force_load=no +@@ -6956,6 +7508,8 @@ _LT_EOF + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 ++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF + int main() { return 0;} + _LT_EOF +@@ -7020,7 +7574,7 @@ if test -n "$CPP" && test -d "$CPP"; the + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then : ++ if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -7050,7 +7604,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -7066,11 +7620,11 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -7109,7 +7663,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -7125,18 +7679,18 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +@@ -7148,7 +7702,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -7265,8 +7819,7 @@ do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default + " +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -7280,7 +7833,7 @@ for ac_header in dlfcn.h + do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default + " +-if test "x$ac_cv_header_dlfcn_h" = x""yes; then : ++if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_DLFCN_H 1 + _ACEOF +@@ -7467,7 +8020,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then : ++if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -7545,7 +8098,7 @@ file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -7611,7 +8164,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -7735,10 +8288,6 @@ _lt_linker_boilerplate=`cat conftest.err $RM -r conftest* -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... +-## CAVEAT EMPTOR: +-## There is no encapsulation within the following macros, do not change +-## the running order or otherwise move them around unless you know exactly +-## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= -@@ -10876,14 +10842,10 @@ fi +@@ -7753,7 +8302,7 @@ if test "$GCC" = yes; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : ++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -7806,8 +8355,6 @@ fi + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -7972,6 +8519,12 @@ $as_echo_n "checking for $compiler optio + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; ++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) +@@ -8034,7 +8587,7 @@ $as_echo_n "checking for $compiler optio + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in +- f77* | f90* | f95*) ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; +@@ -8091,13 +8644,17 @@ case $host_os in + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- +- +- +- + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++if ${lt_cv_prog_compiler_pic+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++$as_echo "$lt_cv_prog_compiler_pic" >&6; } ++lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + + # + # Check to make sure the PIC flag actually works. +@@ -8105,7 +8662,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; } + if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : ++if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -8158,13 +8715,18 @@ fi + + + ++ ++ ++ ++ ++ + # + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then : ++if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -8207,7 +8769,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -8262,7 +8824,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -8508,7 +9070,8 @@ _LT_EOF + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +@@ -8556,7 +9119,7 @@ _LT_EOF + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then +- tmp_addflag= ++ tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler +@@ -8607,12 +9170,12 @@ _LT_EOF + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' +- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -8626,8 +9189,8 @@ _LT_EOF + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + +@@ -8645,8 +9208,8 @@ _LT_EOF + + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -8692,8 +9255,8 @@ _LT_EOF + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi +@@ -8823,7 +9386,13 @@ _LT_EOF + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath_+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8836,22 +9405,29 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +@@ -8863,7 +9439,13 @@ if test -z "$aix_libpath"; then aix_libp + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ if test "${lt_cv_aix_libpath+set}" = set; then ++ aix_libpath=$lt_cv_aix_libpath ++else ++ if ${lt_cv_aix_libpath_+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8876,22 +9458,29 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +-lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\(.*\)$/\1/ +- p +- } +- }' +-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-# Check for a 64-bit object if we didn't find anything. +-if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +-fi ++ lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\([^ ]*\) *$/\1/ ++ p ++ } ++ }' ++ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ # Check for a 64-bit object if we didn't find anything. ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++ fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ if test -z "$lt_cv_aix_libpath_"; then ++ lt_cv_aix_libpath_="/usr/lib:/lib" ++ fi ++ ++fi ++ ++ aix_libpath=$lt_cv_aix_libpath_ ++fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, +@@ -8936,20 +9525,63 @@ if test -z "$aix_libpath"; then aix_libp + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ case $cc_basename in ++ cl*) ++ # Native MSVC ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ file_list_spec='@' ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; ++ else ++ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; ++ fi~ ++ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ ++ linknames=' ++ # The linker will not automatically build a static lib if we build a DLL. ++ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ # Don't use ranlib ++ old_postinstall_cmds='chmod 644 $oldlib' ++ postlink_cmds='lt_outputfile="@OUTPUT@"~ ++ lt_tool_outputfile="@TOOL_OUTPUT@"~ ++ case $lt_outputfile in ++ *.exe|*.EXE) ;; ++ *) ++ lt_outputfile="$lt_outputfile.exe" ++ lt_tool_outputfile="$lt_tool_outputfile.exe" ++ ;; ++ esac~ ++ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then ++ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; ++ $RM "$lt_outputfile.manifest"; ++ fi' ++ ;; ++ *) ++ # Assume MSVC wrapper ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ esac + ;; + + darwin* | rhapsody*) +@@ -8989,6 +9621,10 @@ if test -z "$aix_libpath"; then aix_libp + hardcode_shlibpath_var=no + ;; + ++ freebsd1*) ++ ld_shlibs=no ++ ;; ++ + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little +@@ -9010,7 +9646,7 @@ if test -z "$aix_libpath"; then aix_libp + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no +@@ -9018,7 +9654,7 @@ if test -z "$aix_libpath"; then aix_libp + + hpux9*) + if test "$GCC" = yes; then +- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -9034,7 +9670,7 @@ if test -z "$aix_libpath"; then aix_libp + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -9058,10 +9694,10 @@ if test -z "$aix_libpath"; then aix_libp + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -9078,7 +9714,7 @@ if test -z "$aix_libpath"; then aix_libp + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 + $as_echo_n "checking if $CC understands -b... " >&6; } +-if test "${lt_cv_prog_compiler__b+set}" = set; then : ++if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler__b=no +@@ -9140,23 +9776,36 @@ fi + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ # This should be the same for all languages, so no per-tag cache variable. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 ++$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } ++if ${lt_cv_irix_exported_symbol+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-int foo(void) {} ++int foo (void) { return 0; } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ++ lt_cv_irix_exported_symbol=yes ++else ++ lt_cv_irix_exported_symbol=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 ++$as_echo "$lt_cv_irix_exported_symbol" >&6; } ++ if test "$lt_cv_irix_exported_symbol" = yes; then ++ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +@@ -9241,7 +9890,7 @@ rm -f core conftest.err conftest.$ac_obj + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' +@@ -9260,9 +9909,9 @@ rm -f core conftest.err conftest.$ac_obj + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) +@@ -9450,7 +10099,7 @@ x|xyes) + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : ++if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 + else + $RM conftest* +@@ -9838,8 +10487,9 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ case $GCC,$cc_basename in ++ yes,*) ++ # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -9872,13 +10522,71 @@ cygwin* | mingw* | pw32* | cegcc*) + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac ++ dynamic_linker='Win32 ld.exe' ++ ;; ++ ++ *,cl*) ++ # Native MSVC ++ libname_spec='$name' ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='${libname}.dll.lib' ++ ++ case $build_os in ++ mingw*) ++ sys_lib_search_path_spec= ++ lt_save_ifs=$IFS ++ IFS=';' ++ for lt_path in $LIB ++ do ++ IFS=$lt_save_ifs ++ # Let DOS variable expansion print the short 8.3 style file name. ++ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" ++ done ++ IFS=$lt_save_ifs ++ # Convert to MSYS style. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ++ ;; ++ cygwin*) ++ # Convert to unix form, then to dos form, then back to unix form ++ # but this time dos style (no spaces!) so that the unix form looks ++ # like /cygdrive/c/PROGRA~1:/cygdr... ++ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` ++ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` ++ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ *) ++ sys_lib_search_path_spec="$LIB" ++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # FIXME: find the short name or the path components, as spaces are ++ # common. (e.g. "Program Files" -> "PROGRA~1") ++ ;; ++ esac ++ ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ dynamic_linker='Win32 link.exe' + ;; + + *) ++ # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ dynamic_linker='Win32 ld.exe' + ;; + esac +- dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -9907,6 +10615,10 @@ dgux*) + shlibpath_var=LD_LIBRARY_PATH + ;; + ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ + freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. +@@ -9970,7 +10682,7 @@ haiku*) + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +@@ -10088,7 +10800,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH +- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : ++ if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_shlibpath_overrides_runpath=no +@@ -10126,10 +10838,14 @@ fi # before this can be enabled. hardcode_into_libs=yes -- # Add ABI-specific directories to the system library path. -- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -- ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -- -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -11865,6 +11827,7 @@ CC="$lt_save_CC" +@@ -10508,7 +11224,7 @@ else + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10542,7 +11258,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -10556,12 +11272,12 @@ fi + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +-if test "x$ac_cv_func_shl_load" = x""yes; then : ++if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + $as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then : ++if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10595,16 +11311,16 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +-if test "x$ac_cv_func_dlopen" = x""yes; then : ++if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10638,12 +11354,12 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + $as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then : ++if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10677,12 +11393,12 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : ++if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then : ++if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10716,7 +11432,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : ++if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -10757,7 +11473,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then : ++if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -10766,7 +11482,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10769 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10810,10 +11526,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -10863,7 +11579,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; } + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then : ++if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -10872,7 +11588,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10875 "configure" ++#line $LINENO "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10916,10 +11632,10 @@ else + /* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +-void fnord () __attribute__((visibility("default"))); ++int fnord () __attribute__((visibility("default"))); + #endif + +-void fnord () { int i=42; } ++int fnord () { return 42; } + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -11111,6 +11827,7 @@ CC="$lt_save_CC" @@ -913,7 +4011,79 @@ Index: libffi/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -@@ -12076,6 +12039,10 @@ case "$host" in +@@ -11137,7 +11854,7 @@ fi + for ac_header in sys/mman.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mman_h" = x""yes; then : ++if test "x$ac_cv_header_sys_mman_h" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SYS_MMAN_H 1 + _ACEOF +@@ -11149,7 +11866,7 @@ done + for ac_func in mmap + do : + ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +-if test "x$ac_cv_func_mmap" = x""yes; then : ++if test "x$ac_cv_func_mmap" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_MMAP 1 + _ACEOF +@@ -11159,7 +11876,7 @@ done + + + ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mman_h" = x""yes; then : ++if test "x$ac_cv_header_sys_mman_h" = xyes; then : + libffi_header_sys_mman_h=yes + else + libffi_header_sys_mman_h=no +@@ -11167,7 +11884,7 @@ fi + + + ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +-if test "x$ac_cv_func_mmap" = x""yes; then : ++if test "x$ac_cv_func_mmap" = xyes; then : + libffi_func_mmap=yes + else + libffi_func_mmap=no +@@ -11181,7 +11898,7 @@ if test "$libffi_header_sys_mman_h" != y + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether read-only mmap of a plain file works" >&5 + $as_echo_n "checking whether read-only mmap of a plain file works... " >&6; } +-if test "${ac_cv_func_mmap_file+set}" = set; then : ++if ${ac_cv_func_mmap_file+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Add a system to this blacklist if +@@ -11200,7 +11917,7 @@ fi + $as_echo "$ac_cv_func_mmap_file" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap from /dev/zero works" >&5 + $as_echo_n "checking whether mmap from /dev/zero works... " >&6; } +-if test "${ac_cv_func_mmap_dev_zero+set}" = set; then : ++if ${ac_cv_func_mmap_dev_zero+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Add a system to this blacklist if it has mmap() but /dev/zero +@@ -11226,7 +11943,7 @@ $as_echo "$ac_cv_func_mmap_dev_zero" >&6 + # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MAP_ANON(YMOUS)" >&5 + $as_echo_n "checking for MAP_ANON(YMOUS)... " >&6; } +-if test "${ac_cv_decl_map_anon+set}" = set; then : ++if ${ac_cv_decl_map_anon+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11262,7 +11979,7 @@ $as_echo "$ac_cv_decl_map_anon" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mmap with MAP_ANON(YMOUS) works" >&5 + $as_echo_n "checking whether mmap with MAP_ANON(YMOUS) works... " >&6; } +-if test "${ac_cv_func_mmap_anon+set}" = set; then : ++if ${ac_cv_func_mmap_anon+:} false; then : + $as_echo_n "(cached) " >&6 + else + # Add a system to this blacklist if it has mmap() and MAP_ANON or +@@ -11322,6 +12039,10 @@ case "$host" in amd64-*-freebsd* | amd64-*-openbsd*) TARGET=X86_64; TARGETDIR=x86 @@ -924,7 +4094,16 @@ Index: libffi/configure ;; avr32*-*-*) -@@ -12291,6 +12258,14 @@ else +@@ -11450,7 +12171,7 @@ esac + + + if test $TARGETDIR = unknown; then +- as_fn_error "\"libffi has not been ported to $host.\"" "$LINENO" 5 ++ as_fn_error $? "\"libffi has not been ported to $host.\"" "$LINENO" 5 + fi + + if test x$TARGET = xMIPS; then +@@ -11541,6 +12262,14 @@ else M68K_FALSE= fi @@ -939,7 +4118,263 @@ Index: libffi/configure if test x$TARGET = xPOWERPC; then POWERPC_TRUE= POWERPC_FALSE='#' -@@ -13386,21 +13361,25 @@ $as_echo "#define USING_PURIFY 1" >>conf +@@ -11664,7 +12393,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then : ++if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11777,7 +12506,7 @@ fi + for ac_func in memcpy + do : + ac_fn_c_check_func "$LINENO" "memcpy" "ac_cv_func_memcpy" +-if test "x$ac_cv_func_memcpy" = x""yes; then : ++if test "x$ac_cv_func_memcpy" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_MEMCPY 1 + _ACEOF +@@ -11785,11 +12514,22 @@ _ACEOF + fi + done + ++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" ++if test "x$ac_cv_type_size_t" = xyes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define size_t unsigned int ++_ACEOF ++ ++fi ++ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 + $as_echo_n "checking for working alloca.h... " >&6; } +-if test "${ac_cv_working_alloca_h+set}" = set; then : ++if ${ac_cv_working_alloca_h+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11822,7 +12562,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 + $as_echo_n "checking for alloca... " >&6; } +-if test "${ac_cv_func_alloca_works+set}" = set; then : ++if ${ac_cv_func_alloca_works+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11841,7 +12581,7 @@ else + #pragma alloca + # else + # ifndef alloca /* predefined by HP cc +Olibcalls */ +-char *alloca (); ++void *alloca (size_t); + # endif + # endif + # endif +@@ -11885,7 +12625,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 + $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } +-if test "${ac_cv_os_cray+set}" = set; then : ++if ${ac_cv_os_cray+:} false; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11912,8 +12652,7 @@ if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + + cat >>confdefs.h <<_ACEOF + #define CRAY_STACKSEG_END $ac_func +@@ -11927,7 +12666,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 + $as_echo_n "checking stack direction for C alloca... " >&6; } +-if test "${ac_cv_c_stack_direction+set}" = set; then : ++if ${ac_cv_c_stack_direction+:} false; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -11982,7 +12721,7 @@ fi + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 + $as_echo_n "checking size of double... " >&6; } +-if test "${ac_cv_sizeof_double+set}" = set; then : ++if ${ac_cv_sizeof_double+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : +@@ -11991,9 +12730,8 @@ else + if test "$ac_cv_type_double" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (double) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (double) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_double=0 + fi +@@ -12016,7 +12754,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5 + $as_echo_n "checking size of long double... " >&6; } +-if test "${ac_cv_sizeof_long_double+set}" = set; then : ++if ${ac_cv_sizeof_long_double+:} false; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then : +@@ -12025,9 +12763,8 @@ else + if test "$ac_cv_type_long_double" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (long double) +-See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "cannot compute sizeof (long double) ++See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_long_double=0 + fi +@@ -12061,7 +12798,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 + $as_echo_n "checking whether byte ordering is bigendian... " >&6; } +-if test "${ac_cv_c_bigendian+set}" = set; then : ++if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_c_bigendian=unknown +@@ -12279,50 +13016,17 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI + + ;; #( + *) +- as_fn_error "unknown endianness ++ as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .cfi pseudo-op support" >&5 +-$as_echo_n "checking assembler .cfi pseudo-op support... " >&6; } +-if test "${gcc_cv_as_cfi_pseudo_op+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- +- gcc_cv_as_cfi_pseudo_op=unknown +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-asm (".cfi_startproc\n\t.cfi_endproc"); +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gcc_cv_as_cfi_pseudo_op=yes +-else +- gcc_cv_as_cfi_pseudo_op=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_cfi_pseudo_op" >&5 +-$as_echo "$gcc_cv_as_cfi_pseudo_op" >&6; } +- if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then +- +-$as_echo "#define HAVE_AS_CFI_PSEUDO_OP 1" >>confdefs.h +- +- fi +- ++GCC_AS_CFI_PSEUDO_OP + + if test x$TARGET = xSPARC; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5 + $as_echo_n "checking assembler and linker support unaligned pc related relocs... " >&6; } +-if test "${libffi_cv_as_sparc_ua_pcrel+set}" = set; then : ++if ${libffi_cv_as_sparc_ua_pcrel+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12361,7 +13065,7 @@ $as_echo "#define HAVE_AS_SPARC_UA_PCREL + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .register pseudo-op support" >&5 + $as_echo_n "checking assembler .register pseudo-op support... " >&6; } +-if test "${libffi_cv_as_register_pseudo_op+set}" = set; then : ++if ${libffi_cv_as_register_pseudo_op+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12398,7 +13102,7 @@ fi + if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports pc related relocs" >&5 + $as_echo_n "checking assembler supports pc related relocs... " >&6; } +-if test "${libffi_cv_as_x86_pcrel+set}" = set; then : ++if ${libffi_cv_as_x86_pcrel+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12419,7 +13123,7 @@ $as_echo "#define HAVE_AS_X86_PCREL 1" > + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .ascii pseudo-op support" >&5 + $as_echo_n "checking assembler .ascii pseudo-op support... " >&6; } +-if test "${libffi_cv_as_ascii_pseudo_op+set}" = set; then : ++if ${libffi_cv_as_ascii_pseudo_op+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12454,7 +13158,7 @@ $as_echo "#define HAVE_AS_ASCII_PSEUDO_O + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .string pseudo-op support" >&5 + $as_echo_n "checking assembler .string pseudo-op support... " >&6; } +-if test "${libffi_cv_as_string_pseudo_op+set}" = set; then : ++if ${libffi_cv_as_string_pseudo_op+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12499,7 +13203,7 @@ esac + if test x$TARGET = xX86_64; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler supports unwind section type" >&5 + $as_echo_n "checking assembler supports unwind section type... " >&6; } +-if test "${libffi_cv_as_x86_64_unwind_section_type+set}" = set; then : ++if ${libffi_cv_as_x86_64_unwind_section_type+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12521,7 +13225,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether .eh_frame section should be read-only" >&5 + $as_echo_n "checking whether .eh_frame section should be read-only... " >&6; } +-if test "${libffi_cv_ro_eh_frame+set}" = set; then : ++if ${libffi_cv_ro_eh_frame+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12555,7 +13259,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((visibility(\"hidden\")))" >&5 + $as_echo_n "checking for __attribute__((visibility(\"hidden\")))... " >&6; } +-if test "${libffi_cv_hidden_visibility_attribute+set}" = set; then : ++if ${libffi_cv_hidden_visibility_attribute+:} false; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12629,21 +13333,25 @@ $as_echo "#define USING_PURIFY 1" >>conf fi @@ -978,7 +4413,7 @@ Index: libffi/configure if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" -@@ -13416,7 +13395,7 @@ ac_config_commands="$ac_config_commands +@@ -12659,7 +13367,7 @@ ac_config_commands="$ac_config_commands ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h" @@ -987,27 +4422,272 @@ Index: libffi/configure cat >confcache <<\_ACEOF -@@ -13600,6 +13579,10 @@ if test -z "${M68K_TRUE}" && test -z "${ - as_fn_error $? "conditional \"M68K\" was never defined. +@@ -12726,10 +13434,21 @@ $as_echo "$as_me: WARNING: cache variabl + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- test "x$cache_file" != "x/dev/null" && ++ if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} +- cat confcache >$cache_file ++ if test ! -f "$cache_file" || test -h "$cache_file"; then ++ cat confcache >"$cache_file" ++ else ++ case $cache_file in #( ++ */* | ?:*) ++ mv -f confcache "$cache_file"$$ && ++ mv -f "$cache_file"$$ "$cache_file" ;; #( ++ *) ++ mv -f confcache "$cache_file" ;; ++ esac ++ fi ++ fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +@@ -12745,6 +13464,7 @@ DEFS=-DHAVE_CONFIG_H + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +@@ -12768,132 +13488,136 @@ else + fi + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- as_fn_error "conditional \"AMDEP\" was never defined. ++ as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -+if test -z "${MOXIE_TRUE}" && test -z "${MOXIE_FALSE}"; then -+ as_fn_error $? "conditional \"MOXIE\" was never defined. + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then +- as_fn_error "conditional \"am__fastdepCCAS\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${TESTSUBDIR_TRUE}" && test -z "${TESTSUBDIR_FALSE}"; then +- as_fn_error "conditional \"TESTSUBDIR\" was never defined. ++ as_fn_error $? "conditional \"TESTSUBDIR\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${MIPS_TRUE}" && test -z "${MIPS_FALSE}"; then +- as_fn_error "conditional \"MIPS\" was never defined. ++ as_fn_error $? "conditional \"MIPS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then +- as_fn_error "conditional \"SPARC\" was never defined. ++ as_fn_error $? "conditional \"SPARC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${X86_TRUE}" && test -z "${X86_FALSE}"; then +- as_fn_error "conditional \"X86\" was never defined. ++ as_fn_error $? "conditional \"X86\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${X86_FREEBSD_TRUE}" && test -z "${X86_FREEBSD_FALSE}"; then +- as_fn_error "conditional \"X86_FREEBSD\" was never defined. ++ as_fn_error $? "conditional \"X86_FREEBSD\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${X86_WIN32_TRUE}" && test -z "${X86_WIN32_FALSE}"; then +- as_fn_error "conditional \"X86_WIN32\" was never defined. ++ as_fn_error $? "conditional \"X86_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${X86_WIN64_TRUE}" && test -z "${X86_WIN64_FALSE}"; then +- as_fn_error "conditional \"X86_WIN64\" was never defined. ++ as_fn_error $? "conditional \"X86_WIN64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${X86_DARWIN_TRUE}" && test -z "${X86_DARWIN_FALSE}"; then +- as_fn_error "conditional \"X86_DARWIN\" was never defined. ++ as_fn_error $? "conditional \"X86_DARWIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ALPHA_TRUE}" && test -z "${ALPHA_FALSE}"; then +- as_fn_error "conditional \"ALPHA\" was never defined. ++ as_fn_error $? "conditional \"ALPHA\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${IA64_TRUE}" && test -z "${IA64_FALSE}"; then +- as_fn_error "conditional \"IA64\" was never defined. ++ as_fn_error $? "conditional \"IA64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${M32R_TRUE}" && test -z "${M32R_FALSE}"; then +- as_fn_error "conditional \"M32R\" was never defined. ++ as_fn_error $? "conditional \"M32R\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${M68K_TRUE}" && test -z "${M68K_FALSE}"; then +- as_fn_error "conditional \"M68K\" was never defined. ++ as_fn_error $? "conditional \"M68K\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi ++if test -z "${MOXIE_TRUE}" && test -z "${MOXIE_FALSE}"; then ++ as_fn_error $? "conditional \"MOXIE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi if test -z "${POWERPC_TRUE}" && test -z "${POWERPC_FALSE}"; then - as_fn_error $? "conditional \"POWERPC\" was never defined. +- as_fn_error "conditional \"POWERPC\" was never defined. ++ as_fn_error $? "conditional \"POWERPC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${POWERPC_AIX_TRUE}" && test -z "${POWERPC_AIX_FALSE}"; then +- as_fn_error "conditional \"POWERPC_AIX\" was never defined. ++ as_fn_error $? "conditional \"POWERPC_AIX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${POWERPC_DARWIN_TRUE}" && test -z "${POWERPC_DARWIN_FALSE}"; then +- as_fn_error "conditional \"POWERPC_DARWIN\" was never defined. ++ as_fn_error $? "conditional \"POWERPC_DARWIN\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${POWERPC_FREEBSD_TRUE}" && test -z "${POWERPC_FREEBSD_FALSE}"; then +- as_fn_error "conditional \"POWERPC_FREEBSD\" was never defined. ++ as_fn_error $? "conditional \"POWERPC_FREEBSD\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ARM_TRUE}" && test -z "${ARM_FALSE}"; then +- as_fn_error "conditional \"ARM\" was never defined. ++ as_fn_error $? "conditional \"ARM\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AVR32_TRUE}" && test -z "${AVR32_FALSE}"; then +- as_fn_error "conditional \"AVR32\" was never defined. ++ as_fn_error $? "conditional \"AVR32\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${LIBFFI_CRIS_TRUE}" && test -z "${LIBFFI_CRIS_FALSE}"; then +- as_fn_error "conditional \"LIBFFI_CRIS\" was never defined. ++ as_fn_error $? "conditional \"LIBFFI_CRIS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${FRV_TRUE}" && test -z "${FRV_FALSE}"; then +- as_fn_error "conditional \"FRV\" was never defined. ++ as_fn_error $? "conditional \"FRV\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${S390_TRUE}" && test -z "${S390_FALSE}"; then +- as_fn_error "conditional \"S390\" was never defined. ++ as_fn_error $? "conditional \"S390\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${X86_64_TRUE}" && test -z "${X86_64_FALSE}"; then +- as_fn_error "conditional \"X86_64\" was never defined. ++ as_fn_error $? "conditional \"X86_64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${SH_TRUE}" && test -z "${SH_FALSE}"; then +- as_fn_error "conditional \"SH\" was never defined. ++ as_fn_error $? "conditional \"SH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -14070,7 +14053,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + fi + if test -z "${SH64_TRUE}" && test -z "${SH64_FALSE}"; then +- as_fn_error "conditional \"SH64\" was never defined. ++ as_fn_error $? "conditional \"SH64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${PA_LINUX_TRUE}" && test -z "${PA_LINUX_FALSE}"; then +- as_fn_error "conditional \"PA_LINUX\" was never defined. ++ as_fn_error $? "conditional \"PA_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${PA_HPUX_TRUE}" && test -z "${PA_HPUX_FALSE}"; then +- as_fn_error "conditional \"PA_HPUX\" was never defined. ++ as_fn_error $? "conditional \"PA_HPUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${PA64_HPUX_TRUE}" && test -z "${PA64_HPUX_FALSE}"; then +- as_fn_error "conditional \"PA64_HPUX\" was never defined. ++ as_fn_error $? "conditional \"PA64_HPUX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + +-: ${CONFIG_STATUS=./config.status} ++: "${CONFIG_STATUS=./config.status}" + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +@@ -12994,6 +13718,7 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. ++as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -13039,19 +13764,19 @@ export LANGUAGE + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +-# as_fn_error ERROR [LINENO LOG_FD] +-# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- + # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are + # provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. + as_fn_error () + { +- as_status=$?; test $as_status -eq 0 && as_status=1 +- if test "$3"; then +- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +- $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +@@ -13247,7 +13972,7 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + + } # as_fn_mkdir_p +@@ -13300,8 +14025,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.9, which was +-generated by GNU Autoconf 2.64. Invocation command line was +This file was extended by libffi $as_me 3.0.11-rc1, which was - generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES -@@ -14134,13 +14117,13 @@ $config_links + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -13342,6 +14067,7 @@ Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -13363,16 +14089,17 @@ $config_links Configuration commands: $config_commands @@ -1016,14 +4696,73 @@ Index: libffi/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.9 +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +libffi config.status 3.0.11-rc1 - configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" ++configured by $0, generated by GNU Autoconf 2.68, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -13390,11 +14117,16 @@ ac_need_defaults=: + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -13408,12 +14140,15 @@ do + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -13426,7 +14161,7 @@ do + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' + Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; +@@ -13435,7 +14170,7 @@ Try \`$0 --help' for more information."; + ac_cs_silent=: ;; -@@ -14259,17 +14242,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ + # This is an error. +- -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' + Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" +@@ -13479,20 +14214,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ # # INIT-COMMANDS # @@ -1038,10 +4777,113 @@ Index: libffi/configure -multi_basedir="$multi_basedir" -CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -CC="$CC" +-CXX="$CXX" +-GFORTRAN="$GFORTRAN" +-GCJ="$GCJ" AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -@@ -14559,7 +14531,6 @@ for ac_config_target in $ac_config_targe +@@ -13531,13 +14252,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_ + lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' + lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' + lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' ++lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' + reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' + reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' + OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' + deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' + file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' ++file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' ++want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' ++sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' + AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' + AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' ++archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' + STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' + RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' + old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +@@ -13552,14 +14280,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$l + lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' ++nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' ++lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' + objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' + MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' + lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' + lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' + lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' + lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' + need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' ++MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' + DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' + NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' + LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +@@ -13592,12 +14323,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcod + hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' + inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' + link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' + always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' + export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' + exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' + include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' + prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' ++postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' + file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' + variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' + need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +@@ -13652,8 +14383,13 @@ reload_flag \ + OBJDUMP \ + deplibs_check_method \ + file_magic_cmd \ ++file_magic_glob \ ++want_nocaseglob \ ++DLLTOOL \ ++sharedlib_from_linklib_cmd \ + AR \ + AR_FLAGS \ ++archiver_list_spec \ + STRIP \ + RANLIB \ + CC \ +@@ -13663,12 +14399,14 @@ lt_cv_sys_global_symbol_pipe \ + lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++nm_file_list_spec \ + lt_prog_compiler_no_builtin_flag \ +-lt_prog_compiler_wl \ + lt_prog_compiler_pic \ ++lt_prog_compiler_wl \ + lt_prog_compiler_static \ + lt_cv_prog_compiler_c_o \ + need_locks \ ++MANIFEST_TOOL \ + DSYMUTIL \ + NMEDIT \ + LIPO \ +@@ -13684,7 +14422,6 @@ no_undefined_flag \ + hardcode_libdir_flag_spec \ + hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ +-fix_srcfile_path \ + exclude_expsyms \ + include_expsyms \ + file_list_spec \ +@@ -13720,6 +14457,7 @@ module_cmds \ + module_expsym_cmds \ + export_symbols_cmds \ + prelink_cmds \ ++postlink_cmds \ + postinstall_cmds \ + postuninstall_cmds \ + finish_cmds \ +@@ -13765,7 +14503,6 @@ for ac_config_target in $ac_config_targe do case $ac_config_target in "fficonfig.h") CONFIG_HEADERS="$CONFIG_HEADERS fficonfig.h" ;; @@ -1049,15 +4891,319 @@ Index: libffi/configure "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;; -@@ -14570,6 +14541,7 @@ do +@@ -13776,8 +14513,9 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; +- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -13801,9 +14539,10 @@ fi + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ++ tmp= ac_tmp= + trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++ : "${ac_tmp:=$tmp}" ++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status + ' 0 + trap 'as_fn_exit 1' 1 2 13 15 + } +@@ -13811,12 +14550,13 @@ $debug || + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" ++ test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ac_tmp=$tmp + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -13833,12 +14573,12 @@ if test "x$ac_cr" = x; then + fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\r' ++ ac_cs_awk_cr='\\r' + else + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++echo 'BEGIN {' >"$ac_tmp/subs1.awk" && + _ACEOF + + +@@ -13847,18 +14587,18 @@ _ACEOF + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -13866,7 +14606,7 @@ done + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -13880,7 +14620,7 @@ s/'"$ac_delim"'$// + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -13894,7 +14634,7 @@ s/.\{148\}// + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -13914,7 +14654,7 @@ t delim + rm -f conf$$subs.awk + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && ++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +@@ -13946,21 +14686,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" + else + cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -13972,7 +14720,7 @@ fi # test -n "$CONFIG_FILES" + # No need to generate them if there are no CONFIG_HEADERS. + # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || ++cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +@@ -13984,11 +14732,11 @@ _ACEOF + # handling of long lines. + ac_delim='%!_!# ' + for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_t"; then ++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_tt"; then + break + elif $ac_last_try; then +- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -14073,7 +14821,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -14086,7 +14834,7 @@ do + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -15197,14 +15169,6 @@ $as_echo "$as_me: executing $ac_file com +@@ -14105,7 +14853,7 @@ do + for ac_f + do + case $ac_f in +- -) ac_f="$tmp/stdin";; ++ -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -14114,7 +14862,7 @@ do + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -14140,8 +14888,8 @@ $as_echo "$as_me: creating $ac_file" >&6 + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ *:-:* | *:-) cat >"$ac_tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -14277,23 +15025,24 @@ s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ ++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ ++ "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$tmp/stdin" ++ rm -f "$ac_tmp/stdin" + case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; ++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; ++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -14302,21 +15051,21 @@ which seems to be undefined. Please mak + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" +- } >"$tmp/config.h" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" ++ } >"$ac_tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" +- mv "$tmp/config.h" "$ac_file" \ +- || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ mv "$ac_tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error "could not create -" "$LINENO" 5 ++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -14370,19 +15119,19 @@ $as_echo X"$_am_arg" | + $as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then +- as_fn_error "$ac_source: file not found" "$LINENO" 5 ++ as_fn_error $? "$ac_source: file not found" "$LINENO" 5 + fi + rm -f "$ac_file" + + # Try a relative symlink, then a hard link, then a copy. +- case $srcdir in ++ case $ac_source in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; + *) ac_rel_source=$ac_top_build_prefix$ac_source ;; + esac + ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || + ln "$ac_source" "$ac_file" 2>/dev/null || + cp -p "$ac_source" "$ac_file" || +- as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 ++ as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +@@ -14392,14 +15141,6 @@ $as_echo "$as_me: executing $ac_file com case $ac_file$ac_mode in @@ -1072,6 +5218,508 @@ Index: libffi/configure "depfiles":C) test x"$AMDEP_TRUE" != x"" || { # Autoconf 2.62 quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval +@@ -14516,7 +15257,8 @@ $as_echo X"$file" | + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -14619,19 +15361,42 @@ SP2NL=$lt_lt_SP2NL + # turn newlines into spaces. + NL2SP=$lt_lt_NL2SP + ++# convert \$build file names to \$host format. ++to_host_file_cmd=$lt_cv_to_host_file_cmd ++ ++# convert \$build files to toolchain format. ++to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++ + # An object symbol dumper. + OBJDUMP=$lt_OBJDUMP + + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method + +-# Command to use when deplibs_check_method == "file_magic". ++# Command to use when deplibs_check_method = "file_magic". + file_magic_cmd=$lt_file_magic_cmd + ++# How to find potential files when deplibs_check_method = "file_magic". ++file_magic_glob=$lt_file_magic_glob ++ ++# Find potential files using nocaseglob when deplibs_check_method = "file_magic". ++want_nocaseglob=$lt_want_nocaseglob ++ ++# DLL creation program. ++DLLTOOL=$lt_DLLTOOL ++ ++# Command to associate shared and link libraries. ++sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd ++ + # The archiver. + AR=$lt_AR ++ ++# Flags to create an archive. + AR_FLAGS=$lt_AR_FLAGS + ++# How to feed a file listing to the archiver. ++archiver_list_spec=$lt_archiver_list_spec ++ + # A symbol stripping program. + STRIP=$lt_STRIP + +@@ -14661,6 +15426,12 @@ global_symbol_to_c_name_address=$lt_lt_c + # Transform the output of nm in a C name address pair when lib prefix is needed. + global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + ++# Specify filename containing input files for \$NM. ++nm_file_list_spec=$lt_nm_file_list_spec ++ ++# The root where to search for dependent libraries,and in which our libraries should be installed. ++lt_sysroot=$lt_sysroot ++ + # The name of the directory that contains temporary libtool files. + objdir=$objdir + +@@ -14670,6 +15441,9 @@ MAGIC_CMD=$MAGIC_CMD + # Must we lock files when doing compilation? + need_locks=$lt_need_locks + ++# Manifest tool. ++MANIFEST_TOOL=$lt_MANIFEST_TOOL ++ + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. + DSYMUTIL=$lt_DSYMUTIL + +@@ -14784,12 +15558,12 @@ with_gcc=$GCC + # Compiler flag to turn off builtin functions. + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +- + # Additional compiler flags for building library objects. + pic_flag=$lt_lt_prog_compiler_pic + ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ + # Compiler flag to prevent dynamic linking. + link_static_flag=$lt_lt_prog_compiler_static + +@@ -14876,9 +15650,6 @@ inherit_rpath=$inherit_rpath + # Whether libtool must link a program against all its dependency libraries. + link_all_deplibs=$link_all_deplibs + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +- + # Set to "yes" if exported symbols are required. + always_export_symbols=$always_export_symbols + +@@ -14894,6 +15665,9 @@ include_expsyms=$lt_include_expsyms + # Commands necessary for linking programs (against libraries) with templates. + prelink_cmds=$lt_prelink_cmds + ++# Commands necessary for finishing linking programs. ++postlink_cmds=$lt_postlink_cmds ++ + # Specify filename containing input files. + file_list_spec=$lt_file_list_spec + +@@ -14926,210 +15700,169 @@ ltmain="$ac_aux_dir/ltmain.sh" + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +- +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +- +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "${1}" | $SED "$basename"` +-} +- +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; +- esac +-} +- +-# sed scripts: +-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +- +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` +-} +- +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +-} +- +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +-} +- +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +- +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=\$2" +-} +-_LT_EOF +- ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=\$$1\$2" +-} +- +-_LT_EOF +- ;; +- esac ++ sed '$q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + ++ if test x"$xsi_shell" = xyes; then ++ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ ++func_dirname ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_basename ()$/,/^} # func_basename /c\ ++func_basename ()\ ++{\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ ++func_dirname_and_basename ()\ ++{\ ++\ case ${1} in\ ++\ */*) func_dirname_result="${1%/*}${2}" ;;\ ++\ * ) func_dirname_result="${3}" ;;\ ++\ esac\ ++\ func_basename_result="${1##*/}"\ ++} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ ++func_stripname ()\ ++{\ ++\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ ++\ # positional parameters, so assign one to ordinary parameter first.\ ++\ func_stripname_result=${3}\ ++\ func_stripname_result=${func_stripname_result#"${1}"}\ ++\ func_stripname_result=${func_stripname_result%"${2}"}\ ++} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ ++func_split_long_opt ()\ ++{\ ++\ func_split_long_opt_name=${1%%=*}\ ++\ func_split_long_opt_arg=${1#*=}\ ++} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ ++func_split_short_opt ()\ ++{\ ++\ func_split_short_opt_arg=${1#??}\ ++\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ ++} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ ++func_lo2o ()\ ++{\ ++\ case ${1} in\ ++\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ ++\ *) func_lo2o_result=${1} ;;\ ++\ esac\ ++} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_xform ()$/,/^} # func_xform /c\ ++func_xform ()\ ++{\ ++ func_xform_result=${1%.*}.lo\ ++} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_arith ()$/,/^} # func_arith /c\ ++func_arith ()\ ++{\ ++ func_arith_result=$(( $* ))\ ++} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_len ()$/,/^} # func_len /c\ ++func_len ()\ ++{\ ++ func_len_result=${#1}\ ++} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++fi ++ ++if test x"$lt_shell_append" = xyes; then ++ sed -e '/^func_append ()$/,/^} # func_append /c\ ++func_append ()\ ++{\ ++ eval "${1}+=\\${2}"\ ++} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ ++func_append_quoted ()\ ++{\ ++\ func_quote_for_eval "${2}"\ ++\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ ++} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++test 0 -eq $? || _lt_function_replace_fail=: ++ ++ ++ # Save a `func_append' function call where possible by direct use of '+=' ++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++else ++ # Save a `func_append' function call even when '+=' is not available ++ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ ++ && mv -f "$cfgfile.tmp" "$cfgfile" \ ++ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") ++ test 0 -eq $? || _lt_function_replace_fail=: ++fi ++ ++if test x"$_lt_function_replace_fail" = x":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 ++$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} ++fi + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + +@@ -15149,7 +15882,7 @@ _ACEOF + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -15170,7 +15903,7 @@ if test "$no_create" != yes; then + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac @@ -1119,7 +5767,7 @@ Index: libffi/configure.ac ;; avr32*-*-*) -@@ -191,6 +195,7 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xA +@@ -195,6 +199,7 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xA AM_CONDITIONAL(IA64, test x$TARGET = xIA64) AM_CONDITIONAL(M32R, test x$TARGET = xM32R) AM_CONDITIONAL(M68K, test x$TARGET = xM68K) @@ -1127,7 +5775,7 @@ Index: libffi/configure.ac AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC) AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX) AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN) -@@ -420,21 +425,25 @@ AC_ARG_ENABLE(purify-safety, +@@ -414,21 +419,25 @@ AC_ARG_ENABLE(purify-safety, AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.]) fi) @@ -1167,7 +5815,7 @@ Index: libffi/configure.ac if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" -@@ -450,6 +459,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR +@@ -444,6 +453,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h) @@ -9218,3 +13866,21 @@ Index: libffi/testsuite/lib/libffi.exp } set_ld_library_path_env_vars +Index: libffi/m4/asmcfi.m4 +=================================================================== +--- /dev/null ++++ libffi/m4/asmcfi.m4 +@@ -0,0 +1,13 @@ ++AC_DEFUN([GCC_AS_CFI_PSEUDO_OP], ++[AC_CACHE_CHECK([assembler .cfi pseudo-op support], ++ gcc_cv_as_cfi_pseudo_op, [ ++ gcc_cv_as_cfi_pseudo_op=unknown ++ AC_TRY_COMPILE([asm (".cfi_startproc\n\t.cfi_endproc");],, ++ [gcc_cv_as_cfi_pseudo_op=yes], ++ [gcc_cv_as_cfi_pseudo_op=no]) ++ ]) ++ if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then ++ AC_DEFINE(HAVE_AS_CFI_PSEUDO_OP, 1, ++ [Define if your assembler supports .cfi_* directives.]) ++ fi ++]) diff --git a/patches/stdcall-x86-closure-fix b/patches/stdcall-x86-closure-fix index a2858ab..0d4904d 100644 --- a/patches/stdcall-x86-closure-fix +++ b/patches/stdcall-x86-closure-fix @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -165,6 +165,14 @@ +@@ -182,6 +182,14 @@ * testsuite/libffi.call/cls_longdouble.c: Likewise. * testsuite/libffi.call/huge_struct.c: Likewise. @@ -43,7 +43,7 @@ Index: libffi/src/x86/ffi.c =================================================================== --- libffi.orig/src/x86/ffi.c +++ libffi/src/x86/ffi.c -@@ -155,12 +155,10 @@ ffi_status ffi_prep_cif_machdep(ffi_cif +@@ -155,12 +155,10 @@ ffi_status ffi_prep_cif_machdep(ffi_cif switch (cif->rtype->type) { case FFI_TYPE_VOID: diff --git a/patches/ungccify b/patches/ungccify index 5b5223b..cfd7eb4 100644 --- a/patches/ungccify +++ b/patches/ungccify @@ -2,7 +2,7 @@ Index: libffi/Makefile.am =================================================================== --- libffi.orig/Makefile.am +++ libffi/Makefile.am -@@ -176,14 +176,11 @@ endif +@@ -179,14 +179,11 @@ endif libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) @@ -22,21 +22,56 @@ Index: libffi/Makefile.in =================================================================== --- libffi.orig/Makefile.in +++ libffi/Makefile.in -@@ -65,8 +65,6 @@ target_triplet = @target@ +@@ -66,8 +66,6 @@ target_triplet = @target@ # Build debug. Define FFI_DEBUG on the commandline so that, when building with # MSVC, it can link against the debug CRT. - @FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG + @FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG -# Build opt. --@FFI_DEBUG_FALSE@am__append_28 = -O2 +-@FFI_DEBUG_FALSE@am__append_29 = -O2 subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ -@@ -492,7 +490,7 @@ nodist_libffi_la_SOURCES = $(am__append_ - $(am__append_24) $(am__append_25) $(am__append_26) +@@ -76,7 +74,17 @@ DIST_COMMON = README $(am__configure_dep + compile config.guess config.sub depcomp install-sh ltmain.sh \ + mdate-sh missing texinfo.tex + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \ ++ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ ++ $(top_srcdir)/m4/ax_check_compiler_flags.m4 \ ++ $(top_srcdir)/m4/ax_compiler_vendor.m4 \ ++ $(top_srcdir)/m4/ax_configure_args.m4 \ ++ $(top_srcdir)/m4/ax_enable_builddir.m4 \ ++ $(top_srcdir)/m4/ax_gcc_archflag.m4 \ ++ $(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +@@ -335,6 +343,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ ++PRTDIAG = @PRTDIAG@ + RANLIB = @RANLIB@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ +@@ -355,6 +364,7 @@ am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ ++ax_enable_builddir_sed = @ax_enable_builddir_sed@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +@@ -493,7 +503,7 @@ nodist_libffi_la_SOURCES = $(am__append_ + $(am__append_27) libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) --AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28) -+AM_CFLAGS = -g $(am__append_27) +-AM_CFLAGS = -Wall -g -fexceptions $(am__append_28) $(am__append_29) ++AM_CFLAGS = -g $(am__append_28) libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) diff --git a/patches/win64-struct-args b/patches/win64-struct-args index cb6105a..5cc6603 100644 --- a/patches/win64-struct-args +++ b/patches/win64-struct-args @@ -51,7 +51,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -202,6 +202,14 @@ +@@ -219,6 +219,14 @@ * fficonfig.h.in: Regenerate. * src/x86/sysv.S (.eh_frame): Use .ascii, .string or error. @@ -70,7 +70,7 @@ Index: libffi/doc/libffi.info =================================================================== --- libffi.orig/doc/libffi.info +++ libffi/doc/libffi.info -@@ -147,7 +147,9 @@ To prepare a call interface object, use +@@ -147,7 +147,9 @@ To prepare a call interface object, use AVALUES is a vector of `void *' pointers that point to the memory locations holding the argument values for a call. If CIF declares that the function has no arguments (i.e., NARGS was 0), then diff --git a/patches/win64-underscore b/patches/win64-underscore index 2b33172..c74fd38 100644 --- a/patches/win64-underscore +++ b/patches/win64-underscore @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -98,6 +98,13 @@ +@@ -115,6 +115,13 @@ (.eh_frame): Use FDE_ENCODING. (.LASFDE1, .LASFDE2, LASFDE3): Simplify with FDE_ENCODE. @@ -20,7 +20,7 @@ Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac +++ libffi/configure.ac -@@ -321,6 +321,13 @@ if test x$TARGET = xX86 || test x$TARGET +@@ -315,6 +315,13 @@ if test x$TARGET = xX86 || test x$TARGET fi fi @@ -70,7 +70,7 @@ Index: libffi/src/x86/win64.S # copy register arguments onto stack test $1,%r11 jne .Lfirst_is_float -@@ -287,7 +295,7 @@ _ffi_closure_win64: +@@ -287,7 +295,7 @@ _ffi_closure_win64: mov %rax, %rcx # context is first parameter mov %rsp, %rdx # stack is second parameter add $48, %rdx # point to start of arguments @@ -79,7 +79,7 @@ Index: libffi/src/x86/win64.S callq *%rax # call the real closure function add $40, %rsp movq %rax, %xmm0 # If the closure returned a float, -@@ -296,8 +304,8 @@ _ffi_closure_win64: +@@ -296,8 +304,8 @@ _ffi_closure_win64: .ffi_closure_win64_end: .balign 16 @@ -94,9 +94,9 @@ Index: libffi/aclocal.m4 =================================================================== --- libffi.orig/aclocal.m4 +++ libffi/aclocal.m4 -@@ -19,6 +19,817 @@ You have another version of autoconf. I - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -8450,6 +8450,817 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_L + m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) + m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) +# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- +# @@ -924,10 +924,11 @@ Index: libffi/configure HAVE_LONG_DOUBLE ALLOCA PA64_HPUX_FALSE -@@ -13226,6 +13227,61 @@ $as_echo "#define HAVE_AS_STRING_PSEUDO_ +@@ -13197,6 +13198,61 @@ $as_echo "#define HAVE_AS_STRING_PSEUDO_ + fi fi - ++ +if test x$TARGET = xX86_WIN64; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ prefix in compiled symbols" >&5 +$as_echo_n "checking for _ prefix in compiled symbols... " >&6; } @@ -982,7 +983,6 @@ Index: libffi/configure + + fi +fi -+ + case "$target" in *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*) - diff --git a/patches/x86_pcrel_test b/patches/x86_pcrel_test index b7d3e98..77ebefa 100644 --- a/patches/x86_pcrel_test +++ b/patches/x86_pcrel_test @@ -2,7 +2,7 @@ Index: libffi/ChangeLog =================================================================== --- libffi.orig/ChangeLog +++ libffi/ChangeLog -@@ -40,6 +40,11 @@ +@@ -57,6 +57,11 @@ uintptr_t first. * testsuite/libffi.call/cls_pointer_stack.c (main): Likewise. @@ -18,7 +18,7 @@ Index: libffi/configure =================================================================== --- libffi.orig/configure +++ libffi/configure -@@ -13141,10 +13141,10 @@ if ${libffi_cv_as_x86_pcrel+:} false; th +@@ -13113,10 +13113,10 @@ if ${libffi_cv_as_x86_pcrel+:} false; th $as_echo_n "(cached) " >&6 else @@ -36,7 +36,7 @@ Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac +++ libffi/configure.ac -@@ -283,10 +283,10 @@ fi +@@ -277,10 +277,10 @@ fi if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then AC_CACHE_CHECK([assembler supports pc related relocs], libffi_cv_as_x86_pcrel, [ diff --git a/src/arm/ffi.c b/src/arm/ffi.c index b2e7667..0fb6754 100644 --- a/src/arm/ffi.c +++ b/src/arm/ffi.c @@ -340,6 +340,8 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, /* How to make a trampoline. */ +extern unsigned int ffi_arm_trampoline[3]; + #if FFI_EXEC_TRAMPOLINE_TABLE #include <mach/mach.h> @@ -559,9 +561,7 @@ ffi_closure_free (void *ptr) unsigned int __fun = (unsigned int)(FUN); \ unsigned int __ctx = (unsigned int)(CTX); \ unsigned char *insns = (unsigned char *)(CTX); \ - *(unsigned int*) &__tramp[0] = 0xe92d000f; /* stmfd sp!, {r0-r3} */ \ - *(unsigned int*) &__tramp[4] = 0xe59f0000; /* ldr r0, [pc] */ \ - *(unsigned int*) &__tramp[8] = 0xe59ff000; /* ldr pc, [pc] */ \ + memcpy (__tramp, ffi_arm_trampoline, sizeof ffi_arm_trampoline); \ *(unsigned int*) &__tramp[12] = __ctx; \ *(unsigned int*) &__tramp[16] = __fun; \ __clear_cache((&__tramp[0]), (&__tramp[19])); /* Clear data mapping. */ \ diff --git a/src/arm/sysv.S b/src/arm/sysv.S index 14a7f03..60e2ae3 100644 --- a/src/arm/sysv.S +++ b/src/arm/sysv.S @@ -492,6 +492,11 @@ ARM_FUNC_START ffi_closure_VFP UNWIND .fnend .size CNAME(ffi_closure_VFP),.ffi_closure_VFP_end-CNAME(ffi_closure_VFP) +ENTRY(ffi_arm_trampoline) + stmfd sp!, {r0-r3} + ldr r0, [pc] + ldr pc, [pc] + #if defined __ELF__ && defined __linux__ .section .note.GNU-stack,"",%progbits #endif diff --git a/src/powerpc/darwin_closure.S b/src/powerpc/darwin_closure.S index db20cf6..3f6790f 100644 --- a/src/powerpc/darwin_closure.S +++ b/src/powerpc/darwin_closure.S @@ -534,7 +534,7 @@ L_ffi_closure_helper_DARWIN$stub: .lazy_symbol_pointer L_ffi_closure_helper_DARWIN$lazy_ptr: .indirect_symbol _ffi_closure_helper_DARWIN - .long dyld_stub_binding_helper + .g_long dyld_stub_binding_helper #if defined(__ppc64__) .section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32 @@ -553,7 +553,8 @@ L_darwin64_struct_ret_by_value_p$stub: .lazy_symbol_pointer L_darwin64_struct_ret_by_value_p$lazy_ptr: .indirect_symbol _darwin64_struct_ret_by_value_p - .long dyld_stub_binding_helper + .g_long dyld_stub_binding_helper + .section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32 .align 5 L_darwin64_pass_struct_floats$stub: @@ -570,6 +571,6 @@ L_darwin64_pass_struct_floats$stub: .lazy_symbol_pointer L_darwin64_pass_struct_floats$lazy_ptr: .indirect_symbol _darwin64_pass_struct_floats - .long dyld_stub_binding_helper + .g_long dyld_stub_binding_helper # endif #endif diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 53de9c0..496d5bf 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -37,7 +37,8 @@ target_triplet = @target@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ + $(top_srcdir)/m4/ax_cc_maxopt.m4 \ $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ $(top_srcdir)/m4/ax_check_compiler_flags.m4 \ $(top_srcdir)/m4/ax_compiler_vendor.m4 \ |