a couple of issues with libthr

[Kip Macy]

I'm running -CURRENT as of yesterday.

The function thr_set_name is only defined in libc.so.7, so as far as I
can tell the only way to get java to work on current with libthr is by
mapping libc.so.6 to libc.so.7. The function thr_set_name is only used
by libthr, so libthr seems like a *much* smarter place to put it.

When compiling openoffice.org I get the following failure:
rm -f ../../../unxfbsdi.pro/lib/check_libmozabdrv2.so
mv ../../../unxfbsdi.pro/lib/libmozabdrv2.so
../../../unxfbsdi.pro/lib/check_libmozabdrv2.so
/usr/home/kmacy/freebsd/usr/ports/editors/openoffice.org-2.0-devel/work/solenv/bin/checkdll.sh
-L../../../unxfbsdi.pro/lib -L../lib
-L/usr/home/kmacy/freebsd/usr/ports/editors/openoffice.org-2.0-devel/work/solenv/unxfbsdi/lib
-L/usr/home/kmacy/freebsd/usr/ports/editors/openoffice.org-2.0-devel/work/solver/680/unxfbsdi.pro/lib
-L/usr/home/kmacy/freebsd/usr/ports/editors/openoffice.org-2.0-devel/work/solenv/unxfbsdi/lib
-L/usr/local/diablo-jdk1.5.0/lib
-L/usr/local/diablo-jdk1.5.0/jre/lib/i386
-L/usr/local/diablo-jdk1.5.0/jre/lib/i386/client
-L/usr/local/diablo-jdk1.5.0/jre/lib/i386/native_threads
-L/usr/X11R6/lib ../../../unxfbsdi.pro/lib/check_libmozabdrv2.so
Checking DLL ../../../unxfbsdi.pro/lib/check_libmozabdrv2.so ...Fatal
error 'Spinlock called when not threaded.' at line 75 in file
/usr/home/kmacy/freebsd/usr/src/lib/libthr/thread/thr_spinlock.c
(errno = 2)
Abort trap (core dumped)
dmake:  Error code 1, while making '../../../unxfbsdi.pro/lib/libmozabdrv2.so'

Any suggestions?