diff options
| -rw-r--r-- | devel/unproven-pthreads/Makefile | 5 | ||||
| -rw-r--r-- | devel/unproven-pthreads/files/patch-sum | 10 | ||||
| -rw-r--r-- | devel/unproven-pthreads/patches/patch-aj | 14 | ||||
| -rw-r--r-- | devel/unproven-pthreads/patches/patch-ak | 16 | ||||
| -rw-r--r-- | devel/unproven-pthreads/patches/patch-at | 16 | ||||
| -rw-r--r-- | devel/unproven-pthreads/patches/patch-au | 52 | ||||
| -rw-r--r-- | devel/unproven-pthreads/patches/patch-av | 70 |
7 files changed, 164 insertions, 19 deletions
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile index a2bb9f34fa6..efa9a3a96f4 100644 --- a/devel/unproven-pthreads/Makefile +++ b/devel/unproven-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/03/23 15:57:45 agc Exp $ +# $NetBSD: Makefile,v 1.23 2001/04/12 15:53:30 skrll Exp $ # DISTNAME= unproven-pthreads-0.17 @@ -9,9 +9,8 @@ MASTER_SITES= ftp://ftp.flame.org/pub/netbsd/ MAINTAINER= explorer@netbsd.org COMMENT= (MIT) POSIX threads library, hacked by Michael Graff -#ONLY_FOR_PLATFORM= NetBSD-*-sparc ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ - NetBSD-*-m68k NetBSD-*-powerpc + NetBSD-*-m68k NetBSD-*-powerpc NetBSD-*-sparc CONFLICTS+= mit-pthreads-* HAS_CONFIGURE= yes diff --git a/devel/unproven-pthreads/files/patch-sum b/devel/unproven-pthreads/files/patch-sum index 9167a618bd0..5e49712356b 100644 --- a/devel/unproven-pthreads/files/patch-sum +++ b/devel/unproven-pthreads/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.9 2001/04/12 07:53:17 skrll Exp $ +$NetBSD: patch-sum,v 1.10 2001/04/12 15:53:30 skrll Exp $ SHA1 (patch-aa) = 21955c9af0fd80b6bd939631d79db7225a392ea1 SHA1 (patch-ab) = 870977a372b34eecc44f8e32449e8a2e008b35a1 @@ -9,8 +9,8 @@ SHA1 (patch-af) = cd5dea4351505f7183a3223c8849622e531608b7 SHA1 (patch-ag) = fa046412dd222dc014768a448a5bd28c639d4aab SHA1 (patch-ah) = 123bce3c1730283a847cf0ee65039c73c40b7523 SHA1 (patch-ai) = dd76c34072a56b2145077aad03f6de49cdf64a8c -SHA1 (patch-aj) = 919431ce292c309116991cd02ac183379f1b5305 -SHA1 (patch-ak) = 6fc79597a694204d7266b46a50b39d25c81af2de +SHA1 (patch-aj) = df3ccf1075c95e60fda2bdf6cb89c434ed146a01 +SHA1 (patch-ak) = dc19aee047f29396725b3c5ceeb168a6e294ad96 SHA1 (patch-al) = 10d9c8354e8d032d3494505ea75b2cdb583295c0 SHA1 (patch-am) = 72d33545b9705292261159ed1de4c9068475aeeb SHA1 (patch-an) = 6ad9a2b076fdefb75cbfd27bf304aedcad65d2a9 @@ -19,4 +19,6 @@ SHA1 (patch-ap) = 9a1292ec8301fc38384198b3dc626f8faf85fd41 SHA1 (patch-aq) = 1f3b6745ca3ac6b13e3575c230f0f7e5f7b9ec2f SHA1 (patch-ar) = 52b983df27904a21fcac75646aeddebe446c7a8c SHA1 (patch-as) = e016c3028b44d4ee80b4696bb738b5c6c751cf5b -SHA1 (patch-at) = 0697a2f8adb4226a74bafc0c6a6ec5b6559db466 +SHA1 (patch-at) = 2a3bffff656bf916a3e399874e8f1fc41219ddc5 +SHA1 (patch-au) = b6f05cd5f1e212170fcdbf4a22f36666ba417929 +SHA1 (patch-av) = a8186fe8c13f76382566bbdc7232bf7052053e36 diff --git a/devel/unproven-pthreads/patches/patch-aj b/devel/unproven-pthreads/patches/patch-aj index 2c30b16f340..118aa21c634 100644 --- a/devel/unproven-pthreads/patches/patch-aj +++ b/devel/unproven-pthreads/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2001/01/09 16:14:20 briggs Exp $ +$NetBSD: patch-aj,v 1.2 2001/04/12 15:53:31 skrll Exp $ ---- config/configure.orig Mon Jan 8 17:43:59 2001 -+++ config/configure Mon Jan 8 23:15:28 2001 -@@ -1161,6 +1161,11 @@ +--- config/configure.orig Thu Apr 12 09:04:07 2001 ++++ config/configure +@@ -1161,7 +1161,17 @@ except="fork lseek ftruncate pipe fstat" available_syscalls="sigsuspend sigaction sigprocmask" ;; @@ -12,5 +12,11 @@ $NetBSD: patch-aj,v 1.1 2001/01/09 16:14:20 briggs Exp $ + available_syscalls="sigprocmask sigaction sigsuspend" + ;; sparc-*-netbsd1.4*) ++ name=sparc-netbsd-1.3 ++ except="fork lseek ftruncate pipe fstat" ++ available_syscalls="sigprocmask sigaction sigsuspend" ++ ;; ++ sparc-*-netbsd1.5*) name=sparc-netbsd-1.3 except="fork lseek ftruncate pipe fstat" + available_syscalls="sigprocmask sigaction sigsuspend" diff --git a/devel/unproven-pthreads/patches/patch-ak b/devel/unproven-pthreads/patches/patch-ak index 7311805f4ae..9710fb316ba 100644 --- a/devel/unproven-pthreads/patches/patch-ak +++ b/devel/unproven-pthreads/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1 2001/01/09 16:14:21 briggs Exp $ +$NetBSD: patch-ak,v 1.2 2001/04/12 15:53:31 skrll Exp $ ---- config/configure.in.orig Mon Jan 8 17:43:57 2001 -+++ config/configure.in Mon Jan 8 23:15:34 2001 -@@ -97,6 +97,13 @@ +--- config/configure.in.orig Thu Apr 12 08:59:55 2001 ++++ config/configure.in +@@ -97,7 +97,21 @@ ;; changequote([,])dnl changequote(,)dnl @@ -14,5 +14,13 @@ $NetBSD: patch-ak,v 1.1 2001/01/09 16:14:21 briggs Exp $ +changequote([,])dnl +changequote(,)dnl sparc-*-netbsd1.4*) ++ name=sparc-netbsd-1.3 ++ except="fork lseek ftruncate pipe fstat" ++ available_syscalls="sigprocmask sigaction sigsuspend" ++ ;; ++changequote([,])dnl ++changequote(,)dnl ++ sparc-*-netbsd1.5*) name=sparc-netbsd-1.3 except="fork lseek ftruncate pipe fstat" + available_syscalls="sigprocmask sigaction sigsuspend" diff --git a/devel/unproven-pthreads/patches/patch-at b/devel/unproven-pthreads/patches/patch-at index 18c90238c0a..562e06e2d08 100644 --- a/devel/unproven-pthreads/patches/patch-at +++ b/devel/unproven-pthreads/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2001/04/12 07:53:18 skrll Exp $ +$NetBSD: patch-at,v 1.2 2001/04/12 15:53:31 skrll Exp $ ---- machdep/syscall-template-sparc-netbsd-1.3.S.orig Thu Apr 12 08:33:16 2001 +--- machdep/syscall-template-sparc-netbsd-1.3.S.orig Sat Nov 6 23:33:03 1999 +++ machdep/syscall-template-sparc-netbsd-1.3.S -@@ -4,6 +4,7 @@ +@@ -4,19 +4,25 @@ * */ @@ -10,7 +10,15 @@ $NetBSD: patch-at,v 1.1 2001/04/12 07:53:18 skrll Exp $ #include <sys/syscall.h> #ifdef SYS___sigsuspend14 -@@ -14,9 +15,9 @@ + #define SYS_sigsuspend SYS___sigsuspend14 + #endif ++ ++#ifdef SYS___sigaction14 ++#define SYS_sigaction SYS___sigaction14 ++#endif ++ + #ifdef SYS___sigprocmask14 + #define SYS_sigprocmask SYS___sigprocmask14 #endif #define SYSCALL(x) \ diff --git a/devel/unproven-pthreads/patches/patch-au b/devel/unproven-pthreads/patches/patch-au new file mode 100644 index 00000000000..a6f4b2ead85 --- /dev/null +++ b/devel/unproven-pthreads/patches/patch-au @@ -0,0 +1,52 @@ +$NetBSD: patch-au,v 1.1 2001/04/12 15:53:31 skrll Exp $ + +--- machdep/engine-sparc-netbsd-1.3.c.orig Fri Dec 10 18:40:41 1999 ++++ machdep/engine-sparc-netbsd-1.3.c +@@ -124,8 +124,6 @@ + */ + void * __machdep_stack_alloc(size_t size) + { +- void * stack; +- + return(malloc(size)); + } + +@@ -133,7 +131,7 @@ + * __machdep_pthread_create() + */ + void __machdep_pthread_create(struct machdep_pthread *machdep_pthread, +- void *(* start_routine)(), void *start_argument, ++ void *(* start_routine)(void *), void *start_argument, + long stack_size, long nsec, long flags) + { + machdep_pthread->start_routine = start_routine; +@@ -164,20 +162,10 @@ + } + + /* ========================================================================== +- * machdep_sys_getdirentries() +- * +- * Always use getdents in place of getdirentries if possible --proven +- */ +-int machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) +-{ +- return(machdep_sys_getdents(fd, buf, len)); +-} +- +-/* ========================================================================== + * machdep_sys_wait3() + */ + int +-machdep_sys_wait3(int * b, int c, int * d) ++machdep_sys_wait3(int * b, int c, struct rusage * d) + { + return(machdep_sys_wait4(0, b, c, d)); + } +@@ -234,6 +222,7 @@ + /* ========================================================================== + * machdep_sys_getdtablesize() + */ ++int + machdep_sys_getdtablesize() + { + return(sysconf(_SC_OPEN_MAX)); diff --git a/devel/unproven-pthreads/patches/patch-av b/devel/unproven-pthreads/patches/patch-av new file mode 100644 index 00000000000..9d965444534 --- /dev/null +++ b/devel/unproven-pthreads/patches/patch-av @@ -0,0 +1,70 @@ +$NetBSD: patch-av,v 1.1 2001/04/12 15:53:31 skrll Exp $ + +--- machdep/engine-sparc-netbsd-1.3.h.orig Thu Apr 12 09:31:32 2001 ++++ machdep/engine-sparc-netbsd-1.3.h +@@ -10,7 +10,12 @@ + #include <sys/time.h> + #include <sys/cdefs.h> + #include <sys/signal.h> /* for _NSIG */ ++#include <sys/syscall.h> + ++#include <stdlib.h> ++#include <fcntl.h> ++ ++#include <pthread/sysfunc.h> + /* + * The first machine dependent functions are the SEMAPHORES + * needing the test and set instruction. +@@ -65,7 +70,7 @@ + * For initial thread only. + */ + #define MACHDEP_PTHREAD_INIT \ +-{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } ++{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, { 0 } } + + /* + * Minimum stack size +@@ -76,7 +81,7 @@ + * Some fd flag defines that are necessary to distinguish between posix + * behavior and bsd4.3 behavior. + */ +-#define __FD_NONBLOCK (O_NONBLOCK | O_NDELAY) ++#define __FD_NONBLOCK O_NONBLOCK + + /* + * New functions +@@ -90,7 +95,7 @@ + #define __machdep_stack_set(x, y) (x)->machdep_stack = y + #define __machdep_stack_repl(x, y) \ + { \ +- if (stack = __machdep_stack_get(x)) { \ ++ if ((stack = __machdep_stack_get(x))) { \ + __machdep_stack_free(stack); \ + } \ + __machdep_stack_set(x, y); \ +@@ -100,6 +105,25 @@ + void __machdep_stack_free(void *); + + int machdep_save_state(void); ++ ++int machdep_sys_getdtablesize(void); ++ ++void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread); ++void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread); ++void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread); ++void machdep_pthread_start(void); ++void __machdep_stack_free(void * stack); ++void * __machdep_stack_alloc(size_t size); ++int machdep_sys_creat(char * path, int mode); ++pid_t machdep_sys_wait3(int * b, int c, struct rusage * d); ++pid_t machdep_sys_waitpid(int a, int * b, int c); ++int machdep_sys_getdtablesize(void); ++ ++ ++static inline int machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) ++{ ++ return(machdep_sys_getdents(fd, buf, len)); ++} + + #endif + |