On Thu, Dec 27, 2012 at 10:19:57AM -0500, Jack Howarth wrote: > On Thu, Dec 27, 2012 at 04:06:47PM +0100, Andreas Schwab wrote: > > Jack Howarth <howa...@bromo.med.uc.edu> writes: > > > > > Did you run make check in libffi on this merge? These changes > > > appear to have broken the dejagnu testing in libffi... > > > > The problem is the wrong definition of load_gcc_lib. > > > > @@ -16,7 +16,7 @@ > > > > proc load_gcc_lib { filename } { > > global srcdir > > - load_file $srcdir/../../gcc/testsuite/lib/$filename > > + load_file $srcdir/lib/$filename > > } > > > > load_lib dg.exp > > > > Andreas. > > Andreas, > What do you get for the testsuite results with that change? On > x86_64-apple-darwin12, every single test seems to fail the > test for excess errors at -m32 (but not -m64) when using... > > make -k check RUNTESTFLAGS="--target_board=unix'{-m32,-m64}'" > > === libffi Summary for unix/-m32 === > > # of unexpected failures 663 > # of unresolved testcases 663 > # of unsupported tests 55 > > These show up at -m32 as... > > Executing on host: /sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/gcc/xgcc > -B/sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/gcc/ > ../../../../gcc-4.8-20121226/libffi/testsuite/libffi.call/closure_fn0.c -O0 > -W -Wall > -I/sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/x86_64-apple-darwin12.2.0/libffi/testsuite/../include > -I../../../../gcc-4.8-20121226/libffi/testsuite/../include > -I/sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/x86_64-apple-darwin12.2.0/libffi/testsuite/../include/.. > > -L/sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/x86_64-apple-darwin12.2.0/libffi/testsuite/../.libs > -Wl,-allow_stack_execute -shared-libgcc -lffi -lm -m32 -o > ./closure_fn0.exe (timeout = 300) > ld: warning: ignoring file > /sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/x86_64-apple-darwin12.2.0/libffi/.libs/libffi.dylib, > file was built for unsupported file format ( 0xcf 0xfa 0xed 0xfe 0x 7 0x 0 > 0x 0 0x 1 0x 3 0x 0 0x 0 0x 0 0x 6 0x 0 0x 0 0x 0 ) which is not the > architecture being linked (i386): > /sw/src/fink.build/gcc48-4.8.0-1000/darwin_objdir/x86_64-apple-darwin12.2.0/libffi/.libs/libffi.dylib^M > Undefined symbols for architecture i386:^M > "_ffi_closure_alloc", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_prep_cif", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_prep_closure_loc", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_type_double", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_type_float", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_type_sint16", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_type_sint32", referenced from:^M > _main in ccIwL8dt.o^M > "_ffi_type_uint64", referenced from:^M > _main in ccIwL8dt.o^M > ld: symbol(s) not found for architecture i386^M > collect2: error: ld returned 1 exit status^M > > So it appears that the merge also broke the multilib testing of libffi. > Jack > >
The m4's included in the Makefile.am of the libffi testsuite is wildly different (and misses multi.m4 completely).... @@ -37,22 +54,32 @@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ - $(top_srcdir)/../config/lead-dot.m4 \ - $(top_srcdir)/../config/multi.m4 \ - $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.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_compile_flag.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) -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/fficonfig.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DEJATOOL = $(PACKAGE) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) > > > > -- > > Andreas Schwab, sch...@linux-m68k.org > > GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 > > "And now for something completely different."