libffi failure during bootstrap

[Nathanael Nerode]

I'm getting this when bootstrapping GCC mainline on i686-pc-linux-gnu:

make[3]: Entering directory 
`/home/neroden/gnu/build/i686-pc-linux-gnu/libffi'
/bin/sh ./libtool --mode=link /home/neroden/gnu/build/gcc/xgcc 
-B/home/neroden/gnu/build/gcc/ 
-B/home/neroden/gnu/inst/i686-pc-linux-gnu/bin/ 
-B/home/neroden/gnu/inst/i686-pc-linux-gnu/lib/ -isystem 
/home/neroden/gnu/inst/i686-pc-linux-gnu/include -isystem 
/home/neroden/gnu/inst/i686-pc-linux-gnu/sys-include 
-L/home/neroden/gnu/build/ld -fexceptions -O2 -g -O2  -o ffitest 
-shared-libgcc ffitest.lo libffi.la
/home/neroden/gnu/build/gcc/xgcc -B/home/neroden/gnu/build/gcc/ 
-B/home/neroden/gnu/inst/i686-pc-linux-gnu/bin/ 
-B/home/neroden/gnu/inst/i686-pc-linux-gnu/lib/ -isystem 
/home/neroden/gnu/inst/i686-pc-linux-gnu/include -isystem 
/home/neroden/gnu/inst/i686-pc-linux-gnu/sys-include -fexceptions -O2 -g 
-O2 -o .libs/ffitest -shared-libgcc .libs/ffitest.o  
-L/home/neroden/gnu/build/ld ./.libs/libffi.so -Wl,--rpath 
-Wl,/home/neroden/gnu/inst/lib
./.libs/libffi.so: undefined reference to `FFI_TYPE_DOUBLE'
./.libs/libffi.so: undefined reference to `FFI_TYPE_SINT64'
./.libs/libffi.so: undefined reference to `FFI_TYPE_LONGDOUBLE'
./.libs/libffi.so: undefined reference to `FFI_TYPE_INT'
./.libs/libffi.so: undefined reference to `FFI_TYPE_FLOAT'
collect2: ld returned 1 exit status
make[3]: *** [ffitest] Error 1

Any ideas?  Everything else is working so I'm guessing this really is a 
libffi issue...

--Nathanael