Make this compile on powerpc again.

4 files changed, 52 insertions, 60 deletions

diff --git a/devel/mit-pthreads/distinfo b/devel/mit-pthreads/distinfo
index 636caa82c0c..5210e6ee878 100644
--- a/devel/mit-pthreads/distinfo
+++ b/devel/mit-pthreads/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/26 16:25:47 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/03/25 16:08:32 briggs Exp $
 
 SHA1 (pthreads-1_60_beta6.tar.gz) = 238e410f372dd1615c0e82ec9c6ff47699c558ee
 Size (pthreads-1_60_beta6.tar.gz) = 382562 bytes
@@ -60,5 +60,5 @@ SHA1 (patch-cd) = 3111636fcbce7797b77cca2f88eca012aefbce8a
 SHA1 (patch-ce) = eadbbf7253b0062d572ab385e557bfa75af48286
 SHA1 (patch-cf) = 29a315c5b13b35dffaf2ff4aed31352d62b965a1
 SHA1 (patch-cg) = ee24b07059ec88469aa88331e01c69e27592053d
-SHA1 (patch-ch) = 6ad9a2b076fdefb75cbfd27bf304aedcad65d2a9
+SHA1 (patch-ch) = 7d53f7f625366c64a4db7ffcb71e28e633231c61
 SHA1 (patch-ci) = bcb19cf571bfdf7b3c7e8eaa128bb0cf79254c04
diff --git a/devel/mit-pthreads/patches/patch-ch b/devel/mit-pthreads/patches/patch-ch
index 9d91c02f76f..acb1c3035a5 100644
--- a/devel/mit-pthreads/patches/patch-ch
+++ b/devel/mit-pthreads/patches/patch-ch
@@ -1,15 +1,11 @@
-$NetBSD: patch-ch,v 1.2 2001/01/10 03:19:27 briggs Exp $
+$NetBSD: patch-ch,v 1.3 2002/03/25 16:08:32 briggs Exp $
 
 --- /dev/null	Wed Dec 31 19:00:00 1969
 +++ machdep/syscall-powerpc-netbsd.S	Tue Jan  9 10:42:07 2001
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,181 @@
 +#include <machine/asm.h>
 +#define COMPAT_43
 +#include <sys/syscall.h>
-+#ifndef __CONCAT
-+#include <sys/cdefs.h>
-+#endif
-+#define        CONCAT          __CONCAT
 +
 +#undef SYSCALL
 +
@@ -31,20 +27,20 @@ $NetBSD: patch-ch,v 1.2 2001/01/10 03:19:27 briggs Exp $
 +   SYSCALL invocation.  */
 +
 +ENTRY(machdep_cerror)
-+	mflr    0		# Save LR in 0
-+	stwu	1,-16(1)	# allocate new stack frame
-+	stw	0,20(1)		# Stash 0 in stack
-+	stw	31,8(1)		# Stash 31 in stack (since it's callee-saved
-+	mr	31,3		# and we stash return there)
++	mflr    0		/* Save LR in 0 */
++	stwu	1,-16(1)	/* allocate new stack frame */
++	stw	0,20(1)		/* Stash 0 in stack */
++	stw	31,8(1)		/* Stash 31 in stack (since it's callee-saved */
++	mr	31,3		/* and we stash return there) */
 +	bl	PIC_PLT(_C_LABEL(__errno))
-+	stw	31,0(3)		# *errno() = err
-+	lwz	0,20(1)		# Restore LR from stack to 0
-+	neg	3,31		# return -errno to 3
-+	lwz	31,8(1)		# Restore 31 from stack
++	stw	31,0(3)		/* *errno() = err */
++	lwz	0,20(1)		/* Restore LR from stack to 0 */
++	neg	3,31		/* return -errno to 3 */
++	lwz	31,8(1)		/* Restore 31 from stack */
 +	mtlr	0
-+	la	1,16(1)		# Restore stack frame
-+	li	4,-1		# Put -1 in r4 for those syscalls that return
-+	blr			# two values
++	la	1,16(1)		/* Restore stack frame */
++	li	4,-1		/* Put -1 in r4 for those syscalls that ret */
++	blr			/* two values */
 +
 +/* The fork system call is special...  */
 +ENTRY(machdep_sys_fork)
@@ -60,10 +56,10 @@ $NetBSD: patch-ch,v 1.2 2001/01/10 03:19:27 briggs Exp $
 +	li	0,SYS_pipe
 +	sc
 +	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-+	stw	3,0(5)		# Success, store fds
++	stw	3,0(5)		/* Success, store fds */
 +	stw	4,4(5)
 +	li	3,0
-+	blr			# And return 0
++	blr			/* And return 0 */
 +
 +#ifndef SYS___sigsuspend14
 +/* The sigsuspend system call is special... */
@@ -77,20 +73,20 @@ $NetBSD: patch-ch,v 1.2 2001/01/10 03:19:27 briggs Exp $
 +#ifndef SYS___sigprocmask14
 +/* The sigprocmask system call is special... */
 +ENTRY(machdep_sys_sigprocmask)
-+	or.	4,4,4		# Set == NULL ?
-+	li	6,1		# how = SIG_BLOCK
++	or.	4,4,4		/* Set == NULL ? */
++	li	6,1		/* how = SIG_BLOCK */
 +	beq	Ldoit
-+	lwz	4,0(4)		# if not, replace it in r4 with #set
++	lwz	4,0(4)		/* if not, replace it in r4 with #set */
 +	mr	6,3
-+Ldoit:	mr	3,6		# ... using sigprocmask(SIG_BLOCK)
++Ldoit:	mr	3,6		/* ... using sigprocmask(SIG_BLOCK) */
 +	li	0,SYS_compat_13_sigprocmask13
 +	sc
 +	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-+	or.	5,5,5		# Check to see if oset requested
-+	beq	Ldone		# if oset != NULL
-+	stw	3,0(5)		#   *oset = oldmask
++	or.	5,5,5		/* Check to see if oset requested */
++	beq	Ldone		/* if oset != NULL */
++	stw	3,0(5)		/*   *oset = oldmask */
 +Ldone:
-+	li	3,0		# return 0
++	li	3,0		/* return 0 */
 +	blr
 +#endif /* SYS_sigprocmask14 */
 +
diff --git a/devel/unproven-pthreads/distinfo b/devel/unproven-pthreads/distinfo
index 714b2f68360..3114851e68a 100644
--- a/devel/unproven-pthreads/distinfo
+++ b/devel/unproven-pthreads/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:48 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/03/25 16:08:31 briggs Exp $
 
 SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
 Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
@@ -15,7 +15,7 @@ SHA1 (patch-aj) = df3ccf1075c95e60fda2bdf6cb89c434ed146a01
 SHA1 (patch-ak) = dc19aee047f29396725b3c5ceeb168a6e294ad96
 SHA1 (patch-al) = 10d9c8354e8d032d3494505ea75b2cdb583295c0
 SHA1 (patch-am) = 72d33545b9705292261159ed1de4c9068475aeeb
-SHA1 (patch-an) = 6ad9a2b076fdefb75cbfd27bf304aedcad65d2a9
+SHA1 (patch-an) = 7d53f7f625366c64a4db7ffcb71e28e633231c61
 SHA1 (patch-ao) = bcb19cf571bfdf7b3c7e8eaa128bb0cf79254c04
 SHA1 (patch-ap) = 9a1292ec8301fc38384198b3dc626f8faf85fd41
 SHA1 (patch-aq) = 1f3b6745ca3ac6b13e3575c230f0f7e5f7b9ec2f
diff --git a/devel/unproven-pthreads/patches/patch-an b/devel/unproven-pthreads/patches/patch-an
index 81686a650f1..8c9c9f3c524 100644
--- a/devel/unproven-pthreads/patches/patch-an
+++ b/devel/unproven-pthreads/patches/patch-an
@@ -1,15 +1,11 @@
-$NetBSD: patch-an,v 1.2 2001/01/10 03:18:17 briggs Exp $
+$NetBSD: patch-an,v 1.3 2002/03/25 16:08:31 briggs Exp $
 
 --- /dev/null	Wed Dec 31 19:00:00 1969
 +++ machdep/syscall-powerpc-netbsd.S	Tue Jan  9 10:42:07 2001
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,181 @@
 +#include <machine/asm.h>
 +#define COMPAT_43
 +#include <sys/syscall.h>
-+#ifndef __CONCAT
-+#include <sys/cdefs.h>
-+#endif
-+#define        CONCAT          __CONCAT
 +
 +#undef SYSCALL
 +
@@ -31,20 +27,20 @@ $NetBSD: patch-an,v 1.2 2001/01/10 03:18:17 briggs Exp $
 +   SYSCALL invocation.  */
 +
 +ENTRY(machdep_cerror)
-+	mflr    0		# Save LR in 0
-+	stwu	1,-16(1)	# allocate new stack frame
-+	stw	0,20(1)		# Stash 0 in stack
-+	stw	31,8(1)		# Stash 31 in stack (since it's callee-saved
-+	mr	31,3		# and we stash return there)
++	mflr    0		/* Save LR in 0 */
++	stwu	1,-16(1)	/* allocate new stack frame */
++	stw	0,20(1)		/* Stash 0 in stack */
++	stw	31,8(1)		/* Stash 31 in stack (since it's callee-saved */
++	mr	31,3		/* and we stash return there) */
 +	bl	PIC_PLT(_C_LABEL(__errno))
-+	stw	31,0(3)		# *errno() = err
-+	lwz	0,20(1)		# Restore LR from stack to 0
-+	neg	3,31		# return -errno to 3
-+	lwz	31,8(1)		# Restore 31 from stack
++	stw	31,0(3)		/* *errno() = err */
++	lwz	0,20(1)		/* Restore LR from stack to 0 */
++	neg	3,31		/* return -errno to 3 */
++	lwz	31,8(1)		/* Restore 31 from stack */
 +	mtlr	0
-+	la	1,16(1)		# Restore stack frame
-+	li	4,-1		# Put -1 in r4 for those syscalls that return
-+	blr			# two values
++	la	1,16(1)		/* Restore stack frame */
++	li	4,-1		/* Put -1 in r4 for those syscalls that ret */
++	blr			/* two values */
 +
 +/* The fork system call is special...  */
 +ENTRY(machdep_sys_fork)
@@ -60,10 +56,10 @@ $NetBSD: patch-an,v 1.2 2001/01/10 03:18:17 briggs Exp $
 +	li	0,SYS_pipe
 +	sc
 +	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-+	stw	3,0(5)		# Success, store fds
++	stw	3,0(5)		/* Success, store fds */
 +	stw	4,4(5)
 +	li	3,0
-+	blr			# And return 0
++	blr			/* And return 0 */
 +
 +#ifndef SYS___sigsuspend14
 +/* The sigsuspend system call is special... */
@@ -77,20 +73,20 @@ $NetBSD: patch-an,v 1.2 2001/01/10 03:18:17 briggs Exp $
 +#ifndef SYS___sigprocmask14
 +/* The sigprocmask system call is special... */
 +ENTRY(machdep_sys_sigprocmask)
-+	or.	4,4,4		# Set == NULL ?
-+	li	6,1		# how = SIG_BLOCK
++	or.	4,4,4		/* Set == NULL ? */
++	li	6,1		/* how = SIG_BLOCK */
 +	beq	Ldoit
-+	lwz	4,0(4)		# if not, replace it in r4 with #set
++	lwz	4,0(4)		/* if not, replace it in r4 with #set */
 +	mr	6,3
-+Ldoit:	mr	3,6		# ... using sigprocmask(SIG_BLOCK)
++Ldoit:	mr	3,6		/* ... using sigprocmask(SIG_BLOCK) */
 +	li	0,SYS_compat_13_sigprocmask13
 +	sc
 +	bso	PIC_PLT(_C_LABEL(machdep_cerror))
-+	or.	5,5,5		# Check to see if oset requested
-+	beq	Ldone		# if oset != NULL
-+	stw	3,0(5)		#   *oset = oldmask
++	or.	5,5,5		/* Check to see if oset requested */
++	beq	Ldone		/* if oset != NULL */
++	stw	3,0(5)		/*   *oset = oldmask */
 +Ldone:
-+	li	3,0		# return 0
++	li	3,0		/* return 0 */
 +	blr
 +#endif /* SYS_sigprocmask14 */
 +