Merge remote-tracking branch 'upstream/master'

1 files changed, 16 insertions, 29 deletions

diff --git a/src/libthread/sysofiles.sh b/src/libthread/sysofiles.sh
index 9eeea606..20811cdf 100644
--- a/src/libthread/sysofiles.sh
+++ b/src/libthread/sysofiles.sh
@@ -2,40 +2,27 @@
 
 test -f $PLAN9/config && . $PLAN9/config
 
-tag="$OBJTYPE-$SYSNAME-${SYSVERSION:-`uname -r`}-${CC9:-cc}"
-case "$tag" in
-*-Linux-2.[0-5]*)
-	# will have to fix this for linux power pc
-	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
+case "$SYSNAME" in
+NetBSD)
+	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o stkmalloc.o
 	;;
-*-FreeBSD-[0-4].*)
-	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
-	;;
-*-NetBSD-*)
-	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
-	;;
-*-Darwin-10.[5-6].* | *-Darwin-[89].*)
-	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME-${OBJTYPE}.o pthread.o
-	;;
-*-OpenBSD-*)
-	echo ${SYSNAME}-${OBJTYPE}-asm.o ${SYSNAME}-${OBJTYPE}.o pthread.o
+OpenBSD)
+	echo pthread.o stkmmap.o
 	;;
 *)
-	echo pthread.o
+	echo pthread.o stkmalloc.o
 esac
 
-case "$OBJTYPE-$SYSNAME" in
-sparc64-Linux)
-	# Debian glibc doesn't supply swapcontext, makecontext
-	# so we supply our own copy from the latest glibc.
-	echo Linux-sparc64-context.o Linux-sparc64-swapcontext.o
-	;;
-arm-Linux)
-	# ARM doesn't supply them either.
-	echo Linux-arm-context.o Linux-arm-swapcontext.o
-	;;
-x86_64-Darwin)
-	echo Darwin-x86_64-asm.o Darwin-x86_64-swapcontext.o
+# Various libc don't supply swapcontext, makecontext, so we do.
+case "$SYSNAME-$OBJTYPE" in
+Darwin-x86_64 | Linux-arm | Linux-sparc64 | NetBSD-arm | OpenBSD-386 | OpenBSD-power | OpenBSD-x86_64)
+	echo $OBJTYPE-ucontext.o
 	;;
 esac
 
+# A few libc don't supply setcontext, getcontext, so we do.
+case "$SYSNAME-$OBJTYPE" in
+Darwin-x86_64 | Linux-arm | Linux-sparc64 | OpenBSD-386 | OpenBSD-power | OpenBSD-x86_64)
+	echo $SYSNAME-$OBJTYPE-asm.o
+	;;
+esac