9 files changed, 35 insertions, 12 deletions

diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index c25ccf4f6d2a9..497179e886b56 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -30,8 +30,9 @@ CFLAGS+=-D_PTHREADS_INVARIANTS -Wall
 AINC=	-I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread
 PRECIOUSLIB=	yes
 
-.include "${.CURDIR}/thread/Makefile.inc"
-.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 .include "${.CURDIR}/support/Makefile.inc"
+.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/thread/Makefile.inc"
 
 .include <bsd.lib.mk>
diff --git a/lib/libkse/arch/i386/Makefile.inc b/lib/libkse/arch/i386/Makefile.inc
new file mode 100644
index 0000000000000..98e32eb13e347
--- /dev/null
+++ b/lib/libkse/arch/i386/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+
+SRCS+=	ksd.c thr_enter_uts.S thr_getcontext.S thr_switch.S
diff --git a/lib/libkse/arch/ia64/Makefile.inc b/lib/libkse/arch/ia64/Makefile.inc
new file mode 100644
index 0000000000000..b3aafbd34c62b
--- /dev/null
+++ b/lib/libkse/arch/ia64/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+
+SRCS+=	ksd.c thr_enter_uts.S thr_switch.S
diff --git a/lib/libkse/sys/Makefile.inc b/lib/libkse/sys/Makefile.inc
index ac659e82bf2f8..fb4a108856953 100644
--- a/lib/libkse/sys/Makefile.inc
+++ b/lib/libkse/sys/Makefile.inc
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
-SRCS+=	thr_error.c _atomic_lock.S ksd.c thr_enter_uts.S thr_getcontext.S \
-	thr_switch.S lock.c
+.PATH:	 ${.CURDIR}/sys
 
+SRCS+=	lock.c thr_error.c
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index c25ccf4f6d2a9..497179e886b56 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -30,8 +30,9 @@ CFLAGS+=-D_PTHREADS_INVARIANTS -Wall
 AINC=	-I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread
 PRECIOUSLIB=	yes
 
-.include "${.CURDIR}/thread/Makefile.inc"
-.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 .include "${.CURDIR}/support/Makefile.inc"
+.include "${.CURDIR}/sys/Makefile.inc"
+.include "${.CURDIR}/thread/Makefile.inc"
 
 .include <bsd.lib.mk>
diff --git a/lib/libpthread/arch/alpha/Makefile.inc b/lib/libpthread/arch/alpha/Makefile.inc
new file mode 100644
index 0000000000000..98e32eb13e347
--- /dev/null
+++ b/lib/libpthread/arch/alpha/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+
+SRCS+=	ksd.c thr_enter_uts.S thr_getcontext.S thr_switch.S
diff --git a/lib/libpthread/arch/i386/Makefile.inc b/lib/libpthread/arch/i386/Makefile.inc
new file mode 100644
index 0000000000000..98e32eb13e347
--- /dev/null
+++ b/lib/libpthread/arch/i386/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+
+SRCS+=	ksd.c thr_enter_uts.S thr_getcontext.S thr_switch.S
diff --git a/lib/libpthread/arch/ia64/Makefile.inc b/lib/libpthread/arch/ia64/Makefile.inc
new file mode 100644
index 0000000000000..b3aafbd34c62b
--- /dev/null
+++ b/lib/libpthread/arch/ia64/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
+
+SRCS+=	ksd.c thr_enter_uts.S thr_switch.S
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index ac659e82bf2f8..fb4a108856953 100644
--- a/lib/libpthread/sys/Makefile.inc
+++ b/lib/libpthread/sys/Makefile.inc
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.PATH:	 ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
-
-SRCS+=	thr_error.c _atomic_lock.S ksd.c thr_enter_uts.S thr_getcontext.S \
-	thr_switch.S lock.c
+.PATH:	 ${.CURDIR}/sys
 
+SRCS+=	lock.c thr_error.c