Index: Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libpthread/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile	17 Jul 2003 23:02:29 -0000	1.47
+++ Makefile	2 Sep 2003 17:08:16 -0000
@@ -39,9 +39,3 @@
 .include "${.CURDIR}/thread/Makefile.inc"
 
 .include <bsd.lib.mk>
-
-# Can't put thr_support.c in SRCS but want it in .depend.
-${DEPENDFILE}: thr_support.c
-
-# LIBC_PIC is defined only after <bsd.lib.mk> is included.
-thr_libc.So: ${LIBC_PIC}
Index: support/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/lib/libpthread/support/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- support/Makefile.inc	8 Aug 2003 03:41:13 -0000	1.5
+++ support/Makefile.inc	2 Sep 2003 16:42:32 -0000
@@ -1,9 +1,37 @@
 # $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.5 2003/08/08 03:41:13 kan Exp $
 
-.PATH: ${.CURDIR}/support
+.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
+
+CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+
+SYSCALLS= clock_gettime \
+	kse_create \
+	kse_exit \
+	kse_release \
+	kse_thr_interrupt \
+	kse_wakeup \
+	sigaction \
+	sigprocmask \
+	sigtimedwait \
+	write
+
+SYSCALL_SRC=   ${SYSCALLS:S/$/.S/}
+SYSCALL_OBJ=   ${SYSCALLS:S/$/.So/}
+
+${SYSCALL_SRC}:
+	printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' > ${.TARGET}
+
+LIBC_OBJS= sigsetops.So \
+	bcopy.So \
+	bzero.So \
+	memcpy.So \
+	memset.So \
+	strcpy.So \
+	strlen.So
 
 SOBJS+=	thr_libc.So
-CLEANFILES+= thr_support.So
+CLEANFILES+= ${SYSCALL_SRC} ${SYSCALL_OBJ} ${LIBC_OBJS}
+
+thr_libc.So: ${SYSCALL_OBJ} ${LIBC_OBJS}
+	${CC} -fPIC -nostdlib -o ${.TARGET} -r ${.ALLSRC}
 
-thr_libc.So: thr_support.So
-	${CC} -nostdlib -o ${.TARGET} -r thr_support.So -lc_pic