diff options
| author | briggs <briggs@pkgsrc.org> | 2002-03-25 16:08:31 +0000 |
|---|---|---|
| committer | briggs <briggs@pkgsrc.org> | 2002-03-25 16:08:31 +0000 |
| commit | 1a3a1a25079590912c41b0453b6bfa6bb616c809 (patch) | |
| tree | b98164e91b1acdbae9010426b37687cba6dd03b1 /devel/mit-pthreads | |
| parent | 6e199eb33b2e07c2c75e48569a715a3980c712a4 (diff) | |
| download | pkgsrc-1a3a1a25079590912c41b0453b6bfa6bb616c809.tar.gz | |
Make this compile on powerpc again.
Diffstat (limited to 'devel/mit-pthreads')
| -rw-r--r-- | devel/mit-pthreads/distinfo | 4 | ||||
| -rw-r--r-- | devel/mit-pthreads/patches/patch-ch | 52 |
2 files changed, 26 insertions, 30 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 */ + |