From 8dcb18f71b1917713d4743ab10968c527acdc62e Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sun, 19 Jan 2020 21:25:33 -0500
Subject: libthread: rm FreeBSD 4 code

Pretty sure FreeBSD 4 is gone now. :-)
---
 src/libthread/mkfile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libthread/mkfile')

diff --git a/src/libthread/mkfile b/src/libthread/mkfile
index f621ac60..31c4c7e5 100644
--- a/src/libthread/mkfile
+++ b/src/libthread/mkfile
@@ -16,7 +16,6 @@ OFILES=\
 <$PLAN9/src/mksyslib
 
 HFILES=thread.h threadimpl.h
-FreeBSD.$O: BSD.c
 NetBSD.$O: Linux.c
 
 tprimes: test/tprimes.$O
-- 
cgit v1.2.3


From 8d82ccefd2b4b058e20ae0a7e3d9ef9b6b8cf8c3 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sun, 19 Jan 2020 21:03:56 -0500
Subject: libthread: remove Linux 2.4 code

Linux.c was for Linux 2.4 and is no longer used directly,
only indirectly because NetBSD.c was a 1-line file #including Linux.c.
So mv Linux.c NetBSD.c.

Also rm Linux-*-asm.s which was for Linux 2.4 as well.
---
 src/libthread/mkfile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libthread/mkfile')

diff --git a/src/libthread/mkfile b/src/libthread/mkfile
index 31c4c7e5..a083fd01 100644
--- a/src/libthread/mkfile
+++ b/src/libthread/mkfile
@@ -16,7 +16,6 @@ OFILES=\
 <$PLAN9/src/mksyslib
 
 HFILES=thread.h threadimpl.h
-NetBSD.$O: Linux.c
 
 tprimes: test/tprimes.$O
 	9l -o $target test/$target.$O
-- 
cgit v1.2.3


From 41b3e8b9893a8561af7e85ca98444bc284b4013d Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sun, 19 Jan 2020 22:39:22 -0500
Subject: libthread: use consistent stack calculation code in makecontext

Also reduce duplication: makecontext is per-arch not per-os-arch.

May fix #353.
---
 src/libthread/mkfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libthread/mkfile')

diff --git a/src/libthread/mkfile b/src/libthread/mkfile
index a083fd01..45b78039 100644
--- a/src/libthread/mkfile
+++ b/src/libthread/mkfile
@@ -37,8 +37,8 @@ OpenBSD-%-asm.$O:	OpenBSD-%-asm.S
 Linux-sparc64-context.$O: Linux-sparc64-context.S
 	$CC -m64 -mcpu=v9 $CFLAGS Linux-sparc64-context.S
 
-Linux-sparc64-swapcontext.$O: Linux-sparc64-swapcontext.c
-	$CC -m64 -mcpu=v9 $CFLAGS Linux-sparc64-swapcontext.c
+sparc64-ucontext.$O: sparc64-ucontext.c
+	$CC -m64 -mcpu=v9 $CFLAGS sparc64-ucontext.c
 
 test:V: tprimes tspawn
 	primes 1 10007 >p1.txt
-- 
cgit v1.2.3


From f6c9f7b14c9dce53fff6020200b28c4e25621e87 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sun, 19 Jan 2020 23:04:03 -0500
Subject: libthread: fix test deps, cleanup in mkfile

---
 src/libthread/mkfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/libthread/mkfile')

diff --git a/src/libthread/mkfile b/src/libthread/mkfile
index 45b78039..8a77a316 100644
--- a/src/libthread/mkfile
+++ b/src/libthread/mkfile
@@ -24,6 +24,8 @@ tspawn: test/tspawn.$O
 tspawnloop: test/tspawnloop.$O
 	9l -o $target test/$target.$O
 
+tprimes tspawn tspawnloop: $PLAN9/lib/$LIB
+
 %.$O: %.c
 	$CC -o $target $CFLAGS -I. $stem.c
 
@@ -50,4 +52,5 @@ test:V: tprimes tspawn
 	echo tspawn should take 3 seconds, not 6
 	$PLAN9/bin/time ./tspawn sleep 3 >/dev/null
 
-CLEANFILES=p1.txt p2.txt tp1.txt tp2.txt test/*.$O
+CLEANFILES=p1.txt p2.txt tp1.txt tp2.txt test/*.$O tprimes tspawn
+
-- 
cgit v1.2.3