diff options
| author | kristerw <kristerw@pkgsrc.org> | 2004-06-01 21:39:19 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2004-06-01 21:39:19 +0000 |
| commit | 7e363ebe74b4376e9a87699c3686e3c01b5972c0 (patch) | |
| tree | a28b0237dfc160c4322231bf96eb020de62ac415 /devel/unproven-pthreads | |
| parent | 8c35eb81174901b24f27e729aa65dc7081f535a3 (diff) | |
| download | pkgsrc-7e363ebe74b4376e9a87699c3686e3c01b5972c0.tar.gz | |
Remove obsolete packages, per discussion on tech-pkg.
Diffstat (limited to 'devel/unproven-pthreads')
33 files changed, 0 insertions, 2781 deletions
diff --git a/devel/unproven-pthreads/DESCR b/devel/unproven-pthreads/DESCR deleted file mode 100644 index b6f13d82232..00000000000 --- a/devel/unproven-pthreads/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This is Chris Provenzano's MIT Pthreads library, hacked on by Michael Graff. - -Pthreads stands for POSIX threads and is based on the POSIX 1003.1c 1995 -thread standard. This standard passed international Standards Organization -(ISO) Committee Document (CD) balloting in February 1995 and got the -IEEE Standards Board approval in June 1995. diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile deleted file mode 100644 index 949d601e232..00000000000 --- a/devel/unproven-pthreads/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: Makefile,v 1.41 2004/04/25 06:02:54 snj Exp $ -# - -DISTNAME= unproven-pthreads-0.17 -PKGREVISION= 4 -CATEGORIES= devel -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-*-alpha NetBSD-*-arm NetBSD-*-arm32 \ - NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-powerpc \ - NetBSD-*-sparc -CONFLICTS+= mit-pthreads-[0-9]* - -USE_BUILDLINK3= yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${PREFIX}/pthreads -MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} USETOOLS=no - -# Remove environment variables with special meaning from the shell -# environment before executing ${MAKE_PROGRAM} in the do-configure, -# do-build and do-install targets. -# -CLEAN_ENV_CMD+= unset MAKEOBJDIR MAKEOBJDIRPREFIX || ${TRUE} ; - -post-extract: - @${RM} ${WRKSRC}/include/pthread/unistd.h - -do-build: - @${CLEAN_ENV_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/pthreads - -do-install: - @${CLEAN_ENV_CMD}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} - -post-install: - @${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a - @${FIND} ${PREFIX}/pthreads/include -name '*.orig' -print | ${XARGS} ${RM} - @${FIND} ${PREFIX}/pthreads/include -type f -print | ${XARGS} ${CHMOD} 644 - @${FIND} ${PREFIX}/pthreads/include -type d -print | ${XARGS} ${CHMOD} 755 - @${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/pthreads/include - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/unproven-pthreads/PLIST b/devel/unproven-pthreads/PLIST deleted file mode 100644 index ca9c62f3d04..00000000000 --- a/devel/unproven-pthreads/PLIST +++ /dev/null @@ -1,34 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:27:15 zuntum Exp $ -pthreads/bin/pgcc -pthreads/bin/pg++ -pthreads/lib/libpthread.a -pthreads/lib/libpthread.so -pthreads/lib/libpthread.so.1 -pthreads/lib/libpthread.so.1.60 -pthreads/include/Makefile.inc -pthreads/include/pthread.h -pthreads/include/sched.h -pthreads/include/pthread/cleanup.h -pthreads/include/pthread/cond.h -pthreads/include/pthread/debug_out.h -pthreads/include/pthread/fd.h -pthreads/include/pthread/fd_pipe.h -pthreads/include/pthread/kernel.h -pthreads/include/pthread/kthread.h -pthreads/include/pthread/mutex.h -pthreads/include/pthread/prio_queue.h -pthreads/include/pthread/pthread_attr.h -pthreads/include/pthread/pthread_once.h -pthreads/include/pthread/queue.h -pthreads/include/pthread/sleep.h -pthreads/include/pthread/specific.h -pthreads/include/pthread/state.def -pthreads/include/pthread/sysfunc.h -pthreads/include/pthread/util.h -pthreads/include/pthread/version.h -pthreads/include/pthread/machdep.h -@dirrm pthreads/lib -@dirrm pthreads/bin -@dirrm pthreads/include/pthread -@dirrm pthreads/include -@dirrm pthreads diff --git a/devel/unproven-pthreads/buildlink2.mk b/devel/unproven-pthreads/buildlink2.mk deleted file mode 100644 index 9c3fef4bc40..00000000000 --- a/devel/unproven-pthreads/buildlink2.mk +++ /dev/null @@ -1,31 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.6 2002/10/09 10:32:54 jlam Exp $ - -.if !defined(UNPROVEN_PTHREADS_BUILDLINK2_MK) -UNPROVEN_PTHREADS_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= unproven-pthreads -BUILDLINK_DEPENDS.unproven-pthreads?= unproven-pthreads>=0.17 -BUILDLINK_PKGSRCDIR.unproven-pthreads?= ../../devel/unproven-pthreads - -EVAL_PREFIX+= BUILDLINK_PREFIX.unproven-pthreads=unproven-pthreads -BUILDLINK_PREFIX.unproven-pthreads_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.unproven-pthreads= pthreads/include/*.h -BUILDLINK_FILES.unproven-pthreads+= pthreads/include/*/*.h -BUILDLINK_FILES.unproven-pthreads+= pthreads/lib/libpthread.* - -BUILDLINK_CPPFLAGS.unproven-pthreads= \ - -I${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/include -BUILDLINK_LDFLAGS.unproven-pthreads= \ - -L${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/lib - -PGCC= ${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pgcc -PGXX= ${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pg++ - -BUILDLINK_ENV+= CC="${PGCC}" -BUILDLINK_ENV+= CXX="${PGXX}" - -BUILDLINK_TARGETS+= unproven-pthreads-buildlink - -unproven-pthreads-buildlink: _BUILDLINK_USE - -.endif # UNPROVEN_PTHREADS_BUILDLINK2_MK diff --git a/devel/unproven-pthreads/buildlink3.mk b/devel/unproven-pthreads/buildlink3.mk deleted file mode 100644 index 851ea76b478..00000000000 --- a/devel/unproven-pthreads/buildlink3.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/03/06 23:46:06 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -UNPROVEN_PTHREADS_BUILDLINK3_MK:= ${UNPROVEN_PTHREADS_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= unproven-pthreads -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nunproven-pthreads} -BUILDLINK_PACKAGES+= unproven-pthreads - -.if !empty(UNPROVEN_PTHREADS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.unproven-pthreads+= unproven-pthreads>=0.17 -BUILDLINK_PKGSRCDIR.unproven-pthreads?= ../../devel/unproven-pthreads -.endif # UNPROVEN_PTHREADS_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/unproven-pthreads/distinfo b/devel/unproven-pthreads/distinfo deleted file mode 100644 index 72a10930e2b..00000000000 --- a/devel/unproven-pthreads/distinfo +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: distinfo,v 1.9 2003/02/15 00:06:03 salo Exp $ - -SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d -Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes -SHA1 (patch-aa) = 21955c9af0fd80b6bd939631d79db7225a392ea1 -SHA1 (patch-ab) = 870977a372b34eecc44f8e32449e8a2e008b35a1 -SHA1 (patch-ac) = 255e314d9a396aff6de402eba097a7e4fe36a7ff -SHA1 (patch-ad) = 7821707f34ca6c187ad3ed088b161ff8be249d62 -SHA1 (patch-ae) = 8bf343cd261c3cf25a30f44ffc0b0d0d09bba588 -SHA1 (patch-af) = 00201dc26961a0ac5c87c02755ec6227dcab3458 -SHA1 (patch-ag) = fa046412dd222dc014768a448a5bd28c639d4aab -SHA1 (patch-ah) = 123bce3c1730283a847cf0ee65039c73c40b7523 -SHA1 (patch-ai) = dd76c34072a56b2145077aad03f6de49cdf64a8c -SHA1 (patch-al) = 10d9c8354e8d032d3494505ea75b2cdb583295c0 -SHA1 (patch-am) = 72d33545b9705292261159ed1de4c9068475aeeb -SHA1 (patch-an) = 7d53f7f625366c64a4db7ffcb71e28e633231c61 -SHA1 (patch-ao) = bcb19cf571bfdf7b3c7e8eaa128bb0cf79254c04 -SHA1 (patch-ap) = 9a1292ec8301fc38384198b3dc626f8faf85fd41 -SHA1 (patch-aq) = b1e412bd3481b2e9f1d8169de58d881874cda646 -SHA1 (patch-ar) = 52b983df27904a21fcac75646aeddebe446c7a8c -SHA1 (patch-as) = e016c3028b44d4ee80b4696bb738b5c6c751cf5b -SHA1 (patch-at) = 2a3bffff656bf916a3e399874e8f1fc41219ddc5 -SHA1 (patch-au) = b6f05cd5f1e212170fcdbf4a22f36666ba417929 -SHA1 (patch-av) = a8186fe8c13f76382566bbdc7232bf7052053e36 -SHA1 (patch-aw) = 8c79c79412210c99429fd4a5460cbb0c15b24e49 -SHA1 (patch-ax) = 0c4e0a52da6b49565d69fa520e0bf8b53ab7ca61 -SHA1 (patch-ay) = af52315c2fd7c83c6328b94c90097e9ec94a5d9b -SHA1 (patch-az) = b8782fa7e591ee522859bc3e7c1093ff575fd0e6 -SHA1 (patch-ba) = 8ca93fac990ffd1a7deb8202c5eb17670faeaca7 -SHA1 (patch-bb) = d5c85e249099d11fc8ea14a49a98481e514a4634 -SHA1 (patch-bc) = f169b50bb61a8537fb18368759a0e01836f4ecba diff --git a/devel/unproven-pthreads/patches/patch-aa b/devel/unproven-pthreads/patches/patch-aa deleted file mode 100644 index 7d1f06803e3..00000000000 --- a/devel/unproven-pthreads/patches/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2000/09/11 02:02:40 wiz Exp $ - ---- scripts/pgcc.sh.orig Sun Nov 7 00:34:00 1999 -+++ scripts/pgcc.sh -@@ -30,4 +30,4 @@ - - # Include the -L option in any case, just in case the user provided the - # names of some libraries we've built threaded versions of. --eval exec COMPILER '"$@"' $include_dir $lib_dir $ldrun $libs -+eval exec COMPILER $lib_dir $ldrun '"$@"' $include_dir $libs diff --git a/devel/unproven-pthreads/patches/patch-ab b/devel/unproven-pthreads/patches/patch-ab deleted file mode 100644 index 75f44c55e30..00000000000 --- a/devel/unproven-pthreads/patches/patch-ab +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2000/11/29 17:08:08 agc Exp $ - -Patch from Tom Thai (without this patch, mysql will result in a wrong -date for "select now()") - ---- gen/ctime.c 2000/11/29 16:21:13 1.1 -+++ gen/ctime.c 2000/11/29 16:23:14 -@@ -129,7 +129,7 @@ - ** Prototypes for static functions. - */ - --static long detzcode __P((const char *)); -+static int detzcode __P((const char *)); - static const char * getnum __P((const char *, int *, int, int)); - static const char * getsecs __P((const char *, long *)); - static const char * getoffset __P((const char *, long *)); -@@ -175,9 +175,9 @@ - time_t altzone = 0; - #endif /* defined ALTZONE */ - --static long detzcode(const char * codep) -+static int detzcode(const char * codep) - { -- long result; -+ int result; - int i; - - result = 0; diff --git a/devel/unproven-pthreads/patches/patch-ac b/devel/unproven-pthreads/patches/patch-ac deleted file mode 100644 index f6d8baa6c1e..00000000000 --- a/devel/unproven-pthreads/patches/patch-ac +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:43 jlam Exp $ - ---- config/configure.in.orig Mon Jul 10 14:03:06 2000 -+++ config/configure.in -@@ -83,7 +83,7 @@ - - case $host in - changequote(,)dnl -- alpha-*-netbsd1.4*) -+ alpha-*-netbsd1.5*) - name=alpha-netbsd-1.3 - except="fork lseek ftruncate pipe fstat" - available_syscalls="sigsuspend sigaction sigprocmask" -@@ -97,6 +97,13 @@ - ;; - changequote([,])dnl - changequote(,)dnl -+ powerpc-*-netbsd1.*) -+ name=powerpc-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigprocmask sigaction sigsuspend" -+ ;; -+changequote([,])dnl -+changequote(,)dnl - sparc-*-netbsd1.4*) - name=sparc-netbsd-1.3 - except="fork lseek ftruncate pipe fstat" -@@ -104,6 +111,13 @@ - ;; - changequote([,])dnl - changequote(,)dnl -+ sparc-*-netbsd1.5*) -+ name=sparc-netbsd-1.3 -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigprocmask sigaction sigsuspend" -+ ;; -+changequote([,])dnl -+changequote(,)dnl - i386-*-netbsd1.4*) - # CFLAGS="$CFLAGS -Werror" - name=i386-netbsd-1.3 -@@ -112,7 +126,7 @@ - ;; - changequote([,])dnl - changequote(,)dnl -- i386-*-netbsd1.5*) -+ i386-*-netbsd1.5*|i386-*-netbsdelf*) - # CFLAGS="$CFLAGS -Werror" - name=i386-netbsd-1.3 - except="fork lseek ftruncate pipe fstat" -@@ -121,6 +135,20 @@ - changequote([,])dnl - changequote(,)dnl - m68*-*-netbsd1.4*) -+ name=m68000-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigaction sigprocmask" -+ ;; -+changequote([,])dnl -+changequote(,)dnl -+ m68*-*-netbsd1.5*) -+ name=m68000-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigaction sigprocmask" -+ ;; -+changequote([,])dnl -+changequote(,)dnl -+ m68*-*-netbsd1.6*) - name=m68000-netbsd - except="fork lseek ftruncate pipe fstat" - available_syscalls="sigsuspend sigaction sigprocmask" diff --git a/devel/unproven-pthreads/patches/patch-ad b/devel/unproven-pthreads/patches/patch-ad deleted file mode 100644 index 510923c5689..00000000000 --- a/devel/unproven-pthreads/patches/patch-ad +++ /dev/null @@ -1,220 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2000/12/28 03:56:53 wiz Exp $ - ---- machdep/engine-alpha-netbsd-1.3.h.orig Fri Nov 12 16:02:40 1999 -+++ machdep/engine-alpha-netbsd-1.3.h -@@ -10,7 +10,15 @@ - #include <setjmp.h> - #include <sys/time.h> - #include <sys/cdefs.h> --#include <sys/signal.h> /* for _NSIG */ -+#include <sys/signal.h> /* for _NSIG */ -+#include <sys/syscall.h> -+ -+#include <unistd.h> -+#include <setjmp.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. -@@ -21,20 +29,20 @@ - #define SEMAPHORE_SET 1 - - #if 0 --#define SEMAPHORE_TEST_AND_SET(lock) \ --({ int *_sem_lock = (lock), locked, old; \ -- asm ("mb" : : : "memory"); \ -- do { asm ("ldl_l %0,%1" : "=r" (old) : "m" (*_sem_lock)); \ -- /* ?? if (old != SEMAPHORE_CLEAR) break; */ \ -- asm ("stl_c %0,%1" : "=r" (locked), "=m" (*_sem_lock) \ -- : "0" (SEMAPHORE_SET)); \ -- } while (!locked); \ -- asm ("mb" : : : "memory"); \ -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ int *_sem_lock = (lock), locked, old; \ -+ asm ("mb" : : : "memory"); \ -+ do { asm ("ldl_l %0,%1" : "=r" (old) : "m" (*_sem_lock)); \ -+ /* ?? if (old != SEMAPHORE_CLEAR) break; */ \ -+ asm ("stl_c %0,%1" : "=r" (locked), "=m" (*_sem_lock) \ -+ : "0" (SEMAPHORE_SET)); \ -+ } while (!locked); \ -+ asm ("mb" : : : "memory"); \ - old == SEMAPHORE_CLEAR; }) - - #define SEMAPHORE_RESET(lock) \ --({ int *_sem_lock = (lock); \ -- *_sem_lock = SEMAPHORE_CLEAR; \ -+({ int *_sem_lock = (lock); \ -+ *_sem_lock = SEMAPHORE_CLEAR; \ - asm ("mb" : : : "memory"); }) - #endif - -@@ -46,19 +54,19 @@ - /* - * sigset_t macros - */ --#define SIG_ANY(sig) (sig) --#define SIGMAX (_NSIG-1) -+#define SIG_ANY(sig) (sig) -+#define SIGMAX (_NSIG-1) - - /* - * New Strutures - */ - struct machdep_pthread { -- void *(*start_routine)(void *); -- void *start_argument; -- void *machdep_stack; -- struct itimerval machdep_timer; -- unsigned long machdep_istate[11]; -- unsigned long machdep_fstate[9]; -+ void *(*start_routine)(void *); -+ void *start_argument; -+ void *machdep_stack; -+ struct itimerval machdep_timer; -+ unsigned long machdep_istate[11]; -+ unsigned long machdep_fstate[9]; - }; - - /* -@@ -66,18 +74,18 @@ - * For initial thread only. - */ - #define MACHDEP_PTHREAD_INIT \ -- { NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } -+ { NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, { 0 }, { 0 } } - - /* - * Minimum stack size - */ --#define PTHREAD_STACK_MIN 2048 -+#define PTHREAD_STACK_MIN 2048 - - /* - * Some fd flag defines that are necessary to distinguish between posix - * behavior and bsd4.3 behavior. - */ --#define __FD_NONBLOCK O_NONBLOCK -+#define __FD_NONBLOCK O_NONBLOCK - - /* - * New functions -@@ -91,21 +99,112 @@ - #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); \ - } - --void * __machdep_stack_alloc(size_t); --void __machdep_stack_free(void *); -- - int machdep_save_state(void); -+int safe_store (int *loc, int nw); - - int __machdep_save_int_state(unsigned long *); - void __machdep_restore_int_state(unsigned long *); - void __machdep_save_fp_state(unsigned long *); - void __machdep_restore_fp_state(unsigned long *); -+ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread); -+void machdep_pthread_start(void); -+ -+/* ========================================================================== -+ * __machdep_stack_free() -+ */ -+inline static -+void __machdep_stack_free(void * stack) -+{ -+ free(stack); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_alloc() -+ */ -+inline static -+void * __machdep_stack_alloc(size_t size) -+{ -+ return(malloc(size)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+static inline int -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_wait3() -+ */ -+static inline int -+machdep_sys_wait3(int * b, int c, struct rusage *d) -+{ -+ return(machdep_sys_wait4(0, b, c, d)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_waitpid() -+ */ -+static inline int -+machdep_sys_waitpid(int a, int * b, int c) -+{ -+ return(machdep_sys_wait4(a, b, c, NULL)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+static inline int -+machdep_sys_getdtablesize(void) -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+static inline -+off_t machdep_sys_lseek(int fd, off_t offset, int whence) -+{ -+ return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -+} -+ -+static inline -+int machdep_sys_ftruncate( int fd, off_t length) -+{ -+ quad_t q; -+ int rv; -+ -+ q = __syscall((quad_t)SYS_ftruncate, fd,0, length); -+ if( /* LINTED constant */ sizeof( quad_t ) == sizeof( register_t ) || -+ /* LINTED constant */ BYTE_ORDER == LITTLE_ENDIAN ) -+ rv = (int)q; -+ else -+ rv = (int)((u_quad_t)q >> 32); -+ -+ return rv; -+} -+ -+ -+/* ========================================================================== -+ * machdep_sys_getdirentries() -+ */ -+static inline int -+machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} -+ - - #endif - diff --git a/devel/unproven-pthreads/patches/patch-ae b/devel/unproven-pthreads/patches/patch-ae deleted file mode 100644 index 155e1449158..00000000000 --- a/devel/unproven-pthreads/patches/patch-ae +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2000/12/28 03:56:53 wiz Exp $ - ---- machdep/syscall-template-alpha-netbsd-1.3.S.orig Sat Nov 6 18:33:03 1999 -+++ machdep/syscall-template-alpha-netbsd-1.3.S -@@ -1,11 +1,16 @@ - #include <machine/asm.h> - #define COMPAT_43 - #include <sys/syscall.h> --#define CHMK() call_pal 0x83 -+#define CHMK() call_pal 0x83 - - #ifdef SYS___sigsuspend14 - #define SYS_sigsuspend SYS___sigsuspend14 - #endif -+ -+#ifdef SYS___sigaction14 -+#define SYS_sigaction SYS___sigaction14 -+#endif -+ - #ifdef SYS___sigprocmask14 - #define SYS_sigprocmask SYS___sigprocmask14 - #endif -@@ -14,11 +19,11 @@ - - /* Kernel syscall interface: - Input: -- v0 - system call number -- a* - arguments, as in C -+ v0 - system call number -+ a* - arguments, as in C - Output: -- a3 - zero iff successful -- v0 - errno value on failure, else result -+ a3 - zero iff successful -+ v0 - errno value on failure, else result - - This macro is similar to SYSCALL in asm.h, but not completely. - There's room for optimization, if we assume this will continue to -@@ -26,28 +31,28 @@ - - This macro expansions does not include the return instruction. - If there's no other work to be done, use something like: -- SYSCALL(foo) ; ret -+ SYSCALL(foo) ; ret - If there is other work to do (in fork, maybe?), do it after the - SYSCALL invocation. */ - - #define SYSCALL(x) \ -- .align 4 ;\ -- .globl machdep_sys_##x ;\ -- .ent machdep_sys_##x, 0 ;\ --machdep_sys_##x: ;\ -- .frame sp,0,ra ;\ -- ldiq v0, SYS_##x ;\ -- CHMK() ;\ -- beq a3, Lsys_noerr_##x ;\ -- br gp, Lsys_err_##x ;\ --Lsys_err_##x: ;\ -- /* Load gp so we can find cerror to jump to. */;\ -- ldgp gp, 0(gp) ;\ -- jmp zero, machdep_cerror ;\ -+ .align 4 ;\ -+ .globl machdep_sys_##x ;\ -+ .ent machdep_sys_##x, 0 ;\ -+machdep_sys_##x: ;\ -+ .frame sp,0,ra ;\ -+ ldiq v0, SYS_##x ;\ -+ CHMK() ;\ -+ beq a3, Lsys_noerr_##x ;\ -+ br gp, Lsys_err_##x ;\ -+Lsys_err_##x: ;\ -+ /* Load gp so we can find cerror to jump to. */;\ -+ ldgp gp, 0(gp) ;\ -+ jmp zero, machdep_cerror ;\ - Lsys_noerr_##x: - --#define SIMPLE_SYSCALL(x) SYSCALL(x) ; ret ; .end machdep_sys_##x -+#define SIMPLE_SYSCALL(x) SYSCALL(x) ; ret ; .end machdep_sys_##x - --#define XSYSCALL(x) SIMPLE_SYSCALL(x) -+#define XSYSCALL(x) SIMPLE_SYSCALL(x) - - XSYSCALL(SYSCALL_NAME) diff --git a/devel/unproven-pthreads/patches/patch-af b/devel/unproven-pthreads/patches/patch-af deleted file mode 100644 index be173215a81..00000000000 --- a/devel/unproven-pthreads/patches/patch-af +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-af,v 1.5 2003/02/15 00:06:05 salo Exp $ - ---- config/configure.orig Mon Jul 10 21:03:06 2000 -+++ config/configure Sat Feb 15 00:10:29 2003 -@@ -1151,7 +1151,7 @@ - name=$host_cpu-$host_os - - case $host in -- alpha-*-netbsd1.4*) -+ alpha-*-netbsd1.5*) - name=alpha-netbsd-1.3 - except="fork lseek ftruncate pipe fstat" - available_syscalls="sigsuspend sigaction sigprocmask" -@@ -1161,18 +1161,28 @@ - except="fork lseek ftruncate pipe fstat" - available_syscalls="sigsuspend sigaction sigprocmask" - ;; -+ powerpc-*-netbsd1.*) -+ name=powerpc-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ 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" -+ ;; - i386-*-netbsd1.4*) - # CFLAGS="$CFLAGS -Werror" - name=i386-netbsd-1.3 - except="fork lseek ftruncate pipe fstat" - available_syscalls="sigsuspend sigaction sigprocmask" - ;; -- i386-*-netbsd1.5*) -+ i386-*-netbsd1.5*|i386-*-netbsdelf*) - # CFLAGS="$CFLAGS -Werror" - name=i386-netbsd-1.3 - except="fork lseek ftruncate pipe fstat" -@@ -1183,6 +1193,16 @@ - except="fork lseek ftruncate pipe fstat" - available_syscalls="sigsuspend sigaction sigprocmask" - ;; -+ m68*-*-netbsd1.5*) -+ name=m68000-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigaction sigprocmask" -+ ;; -+ m68*-*-netbsd1.6*) -+ name=m68000-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigaction sigprocmask" -+ ;; - *) - { echo "configure: error: System type $host not recognized or not supported. - See $srcdir/configure.in for supported systems." 1>&2; exit 1; } -@@ -2026,7 +2046,7 @@ - set $ac_dests; ac_dest=$1; shift; ac_dests=$* - set $ac_sources; ac_source=$1; shift; ac_sources=$* - -- echo "linking $srcdir/$ac_source to $ac_dest" -+ echo "copying $srcdir/$ac_source to $ac_dest" - - if test ! -r $srcdir/$ac_source; then - { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; } -@@ -2052,10 +2072,10 @@ - esac - - # Make a symlink if possible; otherwise try a hard link. -- if ln -s $ac_rel_source $ac_dest 2>/dev/null || -- ln $srcdir/$ac_source $ac_dest; then : -+ if cp $ac_rel_source $ac_dest 2>/dev/null || -+ cp -f $srcdir/$ac_source $ac_dest; then : - else -- { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } -+ { echo "configure: error: can not copy $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; } - fi - done - EOF diff --git a/devel/unproven-pthreads/patches/patch-ag b/devel/unproven-pthreads/patches/patch-ag deleted file mode 100644 index e9444c993b1..00000000000 --- a/devel/unproven-pthreads/patches/patch-ag +++ /dev/null @@ -1,258 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/12/28 03:56:54 wiz Exp $ - ---- machdep/engine-alpha-netbsd-1.3.c.orig Fri Dec 10 13:40:41 1999 -+++ machdep/engine-alpha-netbsd-1.3.c -@@ -3,17 +3,17 @@ - * - * Description : Machine dependent functions for NetBSD/Alpha 1.1(+) - * -- * 1.00 93/08/04 proven -+ * 1.00 93/08/04 proven - * -Started coding this file. - * -- * 95/04/22 cgd -- * -Modified to make it go with NetBSD/Alpha -+ * 95/04/22 cgd -+ * -Modified to make it go with NetBSD/Alpha - */ - - #ifndef lint - static const char rcsid[] = "engine-alpha-osf1.c,v 1.4.4.1 1995/12/13 05:41:37 proven Exp"; - #endif -- -+ - #include <pthread.h> - #include <sys/types.h> - #include <sys/socket.h> -@@ -23,77 +23,24 @@ - #include <stdio.h> - - /* ========================================================================== -- * machdep_save_state() -- */ --int machdep_save_state(void) --{ -- return __machdep_save_int_state(pthread_run->machdep_data.machdep_istate); --} -- --void machdep_restore_state(void) --{ -- __machdep_restore_int_state(pthread_run->machdep_data.machdep_istate); --} -- --void machdep_save_float_state (void) --{ -- __machdep_save_fp_state(pthread_run->machdep_data.machdep_fstate); --} -- --void machdep_restore_float_state (void) --{ -- __machdep_restore_fp_state(pthread_run->machdep_data.machdep_fstate); --} -- --/* ========================================================================== -- * machdep_set_thread_timer() -- */ --void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) --{ -- if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -- PANIC("setitimer failed"); -- } --} -- --/* ========================================================================== -- * machdep_unset_thread_timer() -- */ --void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) --{ -- struct itimerval zeroval = { { 0, 0 }, { 0, 0} }; -- -- if (setitimer(ITIMER_VIRTUAL, &zeroval, NULL)) { -- PANIC("setitimer failed"); -- } --} -- --/* ========================================================================== -- * machdep_pthread_cleanup() -- */ --void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) --{ -- return(machdep_pthread->machdep_stack); --} -- --/* ========================================================================== - * machdep_pthread_start() - */ - void machdep_pthread_start(void) - { -- context_switch_done(); -- pthread_sched_resume (); -+ context_switch_done(); -+ pthread_sched_resume (); - -- /* XXXMLG -- * This is EXTREMELY bogus, but it seems that this function is called -- * with the pthread kernel locked. If this happens, __errno() will -- * return the wrong address until after the first context switch. -- * -- * Clearly there is a leak of pthread_kernel somewhere, but until -- * it is found, we force a context switch here, just before calling -- * the thread start routine. When we return from pthread_yield -- * the kernel will be unlocked. -- */ -- pthread_yield(); -+ /* XXXMLG -+ * This is EXTREMELY bogus, but it seems that this function is called -+ * with the pthread kernel locked. If this happens, __errno() will -+ * return the wrong address until after the first context switch. -+ * -+ * Clearly there is a leak of pthread_kernel somewhere, but until -+ * it is found, we force a context switch here, just before calling -+ * the thread start routine. When we return from pthread_yield -+ * the kernel will be unlocked. -+ */ -+ pthread_yield(); - - /* Run current threads start routine with argument */ - pthread_exit(pthread_run->machdep_data.start_routine -@@ -104,28 +51,10 @@ - } - - /* ========================================================================== -- * __machdep_stack_free() -- */ --void __machdep_stack_free(void * stack) --{ -- free(stack); --} -- --/* ========================================================================== -- * __machdep_stack_alloc() -- */ --void * __machdep_stack_alloc(size_t size) --{ -- void * stack; -- -- return(malloc(size)); --} -- --/* ========================================================================== - * __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; -@@ -151,66 +80,68 @@ - } - } - --int safe_store (loc, new) -- int *loc; -- int new; -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) - { -- int locked, old; -- asm ("mb" : : : "memory"); -- do { -- asm ("ldl_l %0,%1" : "=r" (old) : "m" (*loc)); -- asm ("stl_c %0,%1" : "=r" (locked), "=m" (*loc) : "0" (new)); -- } while (!locked); -- asm ("mb" : : : "memory"); -- return old; -+ return __machdep_save_int_state(pthread_run->machdep_data.machdep_istate); - } - --/* ========================================================================== -- * machdep_sys_creat() -- */ --machdep_sys_creat(char * path, int mode) --{ -- return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); --} -+void machdep_restore_state(void) -+{ -+ __machdep_restore_int_state(pthread_run->machdep_data.machdep_istate); -+} - --/* ========================================================================== -- * machdep_sys_wait3() -- */ --machdep_sys_wait3(int * b, int c, int * d) --{ -- return(machdep_sys_wait4(0, b, c, d)); --} -- --/* ========================================================================== -- * machdep_sys_waitpid() -- */ --machdep_sys_waitpid(int a, int * b, int c) -+void machdep_save_float_state (struct pthread *pthread) -+{ -+ __machdep_save_fp_state(pthread->machdep_data.machdep_fstate); -+} -+ -+void machdep_restore_float_state (void) - { -- return(machdep_sys_wait4(a, b, c, NULL)); -+ __machdep_restore_fp_state(pthread_run->machdep_data.machdep_fstate); - } - - /* ========================================================================== -- * machdep_sys_getdtablesize() -+ * machdep_set_thread_timer() - */ --machdep_sys_getdtablesize() -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) - { -- return(sysconf(_SC_OPEN_MAX)); -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC("setitimer failed"); -+ } - } - - /* ========================================================================== -- * machdep_sys_lseek() -+ * machdep_unset_thread_timer() - */ --off_t machdep_sys_lseek(int fd, off_t offset, int whence) -+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) - { -- extern off_t __syscall(); -+ struct itimerval zeroval = { { 0, 0 }, { 0, 0} }; - -- return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -+ if (setitimer(ITIMER_VIRTUAL, &zeroval, NULL)) { -+ PANIC("setitimer failed"); -+ } - } - - /* ========================================================================== -- * machdep_sys_getdirentries() -+ * machdep_pthread_cleanup() - */ --machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) - { -- return(machdep_sys_getdents(fd, buf, len)); --} -+ return(machdep_pthread->machdep_stack); -+} -+ -+int safe_store (int *loc, int new) -+{ -+ int locked, old; -+ asm ("mb" : : : "memory"); -+ do { -+ asm ("ldl_l %0,%1" : "=r" (old) : "m" (*loc)); -+ asm ("stl_c %0,%1" : "=r" (locked), "=m" (*loc) : "0" (new)); -+ } while (!locked); -+ asm ("mb" : : : "memory"); -+ return old; -+} -+ diff --git a/devel/unproven-pthreads/patches/patch-ah b/devel/unproven-pthreads/patches/patch-ah deleted file mode 100644 index a49d453ab1f..00000000000 --- a/devel/unproven-pthreads/patches/patch-ah +++ /dev/null @@ -1,403 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/12/28 03:56:54 wiz Exp $ - ---- machdep/syscall-alpha-netbsd-1.3.S.orig Sat Nov 6 18:33:03 1999 -+++ machdep/syscall-alpha-netbsd-1.3.S -@@ -1,21 +1,21 @@ - #include <machine/asm.h> --#define CHMK() call_pal 0x83 -+#define CHMK() call_pal 0x83 - #define COMPAT_43 - #include <sys/syscall.h> - #ifndef __CONCAT - #include <sys/cdefs.h> - #endif --#define CONCAT __CONCAT -+#define CONCAT __CONCAT - - #undef SYSCALL - - /* Kernel syscall interface: - Input: -- v0 - system call number -- a* - arguments, as in C -+ v0 - system call number -+ a* - arguments, as in C - Output: -- a3 - zero iff successful -- v0 - errno value on failure, else result -+ a3 - zero iff successful -+ v0 - errno value on failure, else result - - This macro is similar to SYSCALL in asm.h, but not completely. - There's room for optimization, if we assume this will continue to -@@ -23,206 +23,206 @@ - - This macro expansions does not include the return instruction. - If there's no other work to be done, use something like: -- SYSCALL(foo) ; ret -+ SYSCALL(foo) ; ret - If there is other work to do (in fork, maybe?), do it after the - SYSCALL invocation. */ - - #define SYSCALL(x) \ -- .align 4 ;\ -- .globl CONCAT(machdep_sys_,x) ;\ -- .ent CONCAT(machdep_sys_,x), 0 ;\ --CONCAT(machdep_sys_,x): ;\ -- .frame sp,0,ra ;\ -- ldiq v0, CONCAT(SYS_,x) ;\ -- CHMK() ;\ -- beq a3, CONCAT(Lsys_noerr_,x) ;\ -- br gp, CONCAT(Lsys_err_,x) ;\ --CONCAT(Lsys_err_,x): ;\ -- /* Load gp so we can find cerror to jump to. */;\ -- ldgp gp, 0(gp) ;\ -- jmp zero, machdep_cerror ;\ -+ .align 4 ;\ -+ .globl CONCAT(machdep_sys_,x) ;\ -+ .ent CONCAT(machdep_sys_,x), 0 ;\ -+CONCAT(machdep_sys_,x): ;\ -+ .frame sp,0,ra ;\ -+ ldiq v0, CONCAT(SYS_,x) ;\ -+ CHMK() ;\ -+ beq a3, CONCAT(Lsys_noerr_,x) ;\ -+ br gp, CONCAT(Lsys_err_,x) ;\ -+CONCAT(Lsys_err_,x): ;\ -+ /* Load gp so we can find cerror to jump to. */;\ -+ ldgp gp, 0(gp) ;\ -+ jmp zero, machdep_cerror ;\ - CONCAT(Lsys_noerr_,x): - --#define XSYSCALL(x) SYSCALL(x) ; RET ; .end CONCAT(machdep_sys_,x) -+#define XSYSCALL(x) SYSCALL(x) ; RET ; .end CONCAT(machdep_sys_,x) - -- .globl machdep_cerror -+ .globl machdep_cerror - machdep_cerror: -- br t0, Lmachdep_cerror_setgp -+ br t0, Lmachdep_cerror_setgp - Lmachdep_cerror_setgp: -- ldgp gp, 0(t0) -- stl v0, errno -+ ldgp gp, 0(t0) -+ stl v0, errno - #if 0 -- ldiq v0, -1 -+ ldiq v0, -1 - #else -- subq zero, v0, v0 -+ subq zero, v0, v0 - #endif -- RET -+ RET - - /* The fork system call is special... */ - SYSCALL(fork) -- cmovne a4, 0, v0 -- RET -- .end machdep_sys_fork -+ cmovne a4, 0, v0 -+ RET -+ .end machdep_sys_fork - - /* The pipe system call is special... */ - SYSCALL(pipe) -- stl v0, 0(a0) -- stl a4, 4(a0) -- mov zero, v0 -- RET -- .end machdep_sys_pipe -+ stl v0, 0(a0) -+ stl a4, 4(a0) -+ mov zero, v0 -+ RET -+ .end machdep_sys_pipe - - #ifndef SYS___sigsuspend14 - /* The sigsuspend system call is special... */ -- .align 4 -- .globl machdep_sys_sigsuspend -- .ent machdep_sys_sigsuspend, 0 -+ .align 4 -+ .globl machdep_sys_sigsuspend -+ .ent machdep_sys_sigsuspend, 0 - machdep_sys_sigsuspend: -- ldl a0, 0(a0) /* pass *mask instead of mask */ -- ldiq v0, SYS_sigsuspend -- CHMK() -- mov zero, v0 /* shouldn't need; just in case... */ -- RET -- .end machdep_sys_sigsuspend -+ ldl a0, 0(a0) /* pass *mask instead of mask */ -+ ldiq v0, SYS_sigsuspend -+ CHMK() -+ mov zero, v0 /* shouldn't need; just in case... */ -+ RET -+ .end machdep_sys_sigsuspend - #endif /* SYS_sigsuspend14 */ - - #ifndef SYS___sigprocmask14 - /* The sigprocmask system call is special... */ -- .align 4 -- .globl machdep_sys_sigprocmask -- .ent machdep_sys_sigprocmask, 0 -+ .align 4 -+ .globl machdep_sys_sigprocmask -+ .ent machdep_sys_sigprocmask, 0 - machdep_sys_sigprocmask: -- mov a2, a5 /* safe */ -- cmoveq a1, 1, a0 /* if set == NULL, how = SIG_BLOCK */ -- beq a1, Ldoit /* and set = 0, and do it. */ -- ldl a1, 0(a1) /* load the set from *set */ --Ldoit: ldiq v0, SYS_sigprocmask -- CHMK() -- beq a5, Lret /* if they don't want old mask, done */ -- stl v0, 0(a5) /* otherwise, give it to them. */ --Lret: mov zero, v0 -- RET -- .end machdep_sys_sigprocmask -+ mov a2, a5 /* safe */ -+ cmoveq a1, 1, a0 /* if set == NULL, how = SIG_BLOCK */ -+ beq a1, Ldoit /* and set = 0, and do it. */ -+ ldl a1, 0(a1) /* load the set from *set */ -+Ldoit: ldiq v0, SYS_sigprocmask -+ CHMK() -+ beq a5, Lret /* if they don't want old mask, done */ -+ stl v0, 0(a5) /* otherwise, give it to them. */ -+Lret: mov zero, v0 -+ RET -+ .end machdep_sys_sigprocmask - #endif /* SYS_sigprocmask14 */ - - /* More stuff ... */ -- .align 4 -- .global __machdep_save_int_state -- .ent __machdep_save_int_state, 0 -+ .align 4 -+ .global __machdep_save_int_state -+ .ent __machdep_save_int_state, 0 - __machdep_save_int_state: -- .frame sp, 16, ra -- ldgp gp, 0(t12) -- lda sp, -16(sp) -- stq ra, 0(sp) -- -- /* save integer registers */ -- stq ra, ( 0 * 8)(a0) /* return address */ -- stq s0, ( 1 * 8)(a0) /* callee-saved registers */ -- stq s1, ( 2 * 8)(a0) -- stq s2, ( 3 * 8)(a0) -- stq s3, ( 4 * 8)(a0) -- stq s4, ( 5 * 8)(a0) -- stq s5, ( 6 * 8)(a0) -- stq s6, ( 7 * 8)(a0) -- stq sp, ( 9 * 8)(a0) -- stq ra, ( 8 * 8)(a0) /* RA on return */ -- stq pv, (10 * 8)(a0) /* and PV; we restore it */ -- -- mov zero, v0 -- lda sp, 16(sp) -- RET -- .end __machdep_save_int_state -- -- .align 4 -- .global __machdep_restore_int_state -- .ent __machdep_restore_int_state, 0 -+ .frame sp, 16, ra -+ ldgp gp, 0(t12) -+ lda sp, -16(sp) -+ stq ra, 0(sp) -+ -+ /* save integer registers */ -+ stq ra, ( 0 * 8)(a0) /* return address */ -+ stq s0, ( 1 * 8)(a0) /* callee-saved registers */ -+ stq s1, ( 2 * 8)(a0) -+ stq s2, ( 3 * 8)(a0) -+ stq s3, ( 4 * 8)(a0) -+ stq s4, ( 5 * 8)(a0) -+ stq s5, ( 6 * 8)(a0) -+ stq s6, ( 7 * 8)(a0) -+ stq sp, ( 9 * 8)(a0) -+ stq ra, ( 8 * 8)(a0) /* RA on return */ -+ stq pv, (10 * 8)(a0) /* and PV; we restore it */ -+ -+ mov zero, v0 -+ lda sp, 16(sp) -+ RET -+ .end __machdep_save_int_state -+ -+ .align 4 -+ .global __machdep_restore_int_state -+ .ent __machdep_restore_int_state, 0 - __machdep_restore_int_state: -- .frame sp, 16, ra -- ldgp gp, 0(t12) -- lda sp, -16(sp) -- stq ra, 0(sp) -- -- /* restore integer registers */ -- ldq t0, ( 0 * 8)(a0) /* return address */ -- ldq s0, ( 1 * 8)(a0) /* callee-saved registers */ -- ldq s1, ( 2 * 8)(a0) -- ldq s2, ( 3 * 8)(a0) -- ldq s3, ( 4 * 8)(a0) -- ldq s4, ( 5 * 8)(a0) -- ldq s5, ( 6 * 8)(a0) -- ldq s6, ( 7 * 8)(a0) -- ldq ra, ( 8 * 8)(a0) /* RA after return */ -- ldq sp, ( 9 * 8)(a0) -- ldq pv, (10 * 8)(a0) /* and PV; we restore it */ -- -- ldiq v0, 1 -- ret zero,(t0),1 -- .end __machdep_restore_int_state -- -- .align 4 -- .global __machdep_save_fp_state -- .ent __machdep_save_fp_state, 0 -+ .frame sp, 16, ra -+ ldgp gp, 0(t12) -+ lda sp, -16(sp) -+ stq ra, 0(sp) -+ -+ /* restore integer registers */ -+ ldq t0, ( 0 * 8)(a0) /* return address */ -+ ldq s0, ( 1 * 8)(a0) /* callee-saved registers */ -+ ldq s1, ( 2 * 8)(a0) -+ ldq s2, ( 3 * 8)(a0) -+ ldq s3, ( 4 * 8)(a0) -+ ldq s4, ( 5 * 8)(a0) -+ ldq s5, ( 6 * 8)(a0) -+ ldq s6, ( 7 * 8)(a0) -+ ldq ra, ( 8 * 8)(a0) /* RA after return */ -+ ldq sp, ( 9 * 8)(a0) -+ ldq pv, (10 * 8)(a0) /* and PV; we restore it */ -+ -+ ldiq v0, 1 -+ ret zero,(t0),1 -+ .end __machdep_restore_int_state -+ -+ .align 4 -+ .global __machdep_save_fp_state -+ .ent __machdep_save_fp_state, 0 - __machdep_save_fp_state: -- .frame sp, 16, ra -- ldgp gp, 0(t12) -- lda sp, -16(sp) -- stq ra, 0(sp) -- -- /* save FP registers */ -- stt fs0, (0 * 8)(a0) /* callee-saved registers */ -- stt fs1, (1 * 8)(a0) -- stt fs2, (2 * 8)(a0) -- stt fs3, (3 * 8)(a0) -- stt fs4, (4 * 8)(a0) -- stt fs5, (5 * 8)(a0) -- stt fs6, (6 * 8)(a0) -- stt fs7, (7 * 8)(a0) -- mf_fpcr ft0 /* and FP control reg */ -- stt ft0, (8 * 8)(a0) -- -- lda sp, 16(sp) -- RET -- .end __machdep_save_fp_state -- -- .align 4 -- .global __machdep_restore_fp_state -- .ent __machdep_restore_fp_state, 0 -+ .frame sp, 16, ra -+ ldgp gp, 0(t12) -+ lda sp, -16(sp) -+ stq ra, 0(sp) -+ -+ /* save FP registers */ -+ stt fs0, (0 * 8)(a0) /* callee-saved registers */ -+ stt fs1, (1 * 8)(a0) -+ stt fs2, (2 * 8)(a0) -+ stt fs3, (3 * 8)(a0) -+ stt fs4, (4 * 8)(a0) -+ stt fs5, (5 * 8)(a0) -+ stt fs6, (6 * 8)(a0) -+ stt fs7, (7 * 8)(a0) -+ mf_fpcr ft0 /* and FP control reg */ -+ stt ft0, (8 * 8)(a0) -+ -+ lda sp, 16(sp) -+ RET -+ .end __machdep_save_fp_state -+ -+ .align 4 -+ .global __machdep_restore_fp_state -+ .ent __machdep_restore_fp_state, 0 - __machdep_restore_fp_state: -- .frame sp, 16, ra -- ldgp gp, 0(t12) -- lda sp, -16(sp) -- stq ra, 0(sp) -- -- /* restore FP registers */ -- ldt fs0, (0 * 8)(a0) /* callee-saved registers */ -- ldt fs1, (1 * 8)(a0) -- ldt fs2, (2 * 8)(a0) -- ldt fs3, (3 * 8)(a0) -- ldt fs4, (4 * 8)(a0) -- ldt fs5, (5 * 8)(a0) -- ldt fs6, (6 * 8)(a0) -- ldt fs7, (7 * 8)(a0) -- ldt ft0, (8 * 8)(a0) -- mt_fpcr ft0 /* and FP control reg */ -- -- lda sp, 16(sp) -- RET -- .end __machdep_restore_fp_state -+ .frame sp, 16, ra -+ ldgp gp, 0(t12) -+ lda sp, -16(sp) -+ stq ra, 0(sp) -+ -+ /* restore FP registers */ -+ ldt fs0, (0 * 8)(a0) /* callee-saved registers */ -+ ldt fs1, (1 * 8)(a0) -+ ldt fs2, (2 * 8)(a0) -+ ldt fs3, (3 * 8)(a0) -+ ldt fs4, (4 * 8)(a0) -+ ldt fs5, (5 * 8)(a0) -+ ldt fs6, (6 * 8)(a0) -+ ldt fs7, (7 * 8)(a0) -+ ldt ft0, (8 * 8)(a0) -+ mt_fpcr ft0 /* and FP control reg */ -+ -+ lda sp, 16(sp) -+ RET -+ .end __machdep_restore_fp_state - - /* For fstat() we actually syscall fstat13. */ -- .align 4 -- .globl machdep_sys_fstat -- .ent machdep_sys_fstat, 0 -+ .align 4 -+ .globl machdep_sys_fstat -+ .ent machdep_sys_fstat, 0 - machdep_sys_fstat: -- .frame sp,0,ra -- ldiq v0, SYS___fstat13 -- CHMK() -- beq a3, Lsys_noerr_fstat -- br gp, Lsys_err_fstat -+ .frame sp,0,ra -+ ldiq v0, SYS___fstat13 -+ CHMK() -+ beq a3, Lsys_noerr_fstat -+ br gp, Lsys_err_fstat - Lsys_err_fstat: -- /* Load gp so we can find cerror to jump to. */ -- ldgp gp, 0(gp) -- jmp zero, machdep_cerror -+ /* Load gp so we can find cerror to jump to. */ -+ ldgp gp, 0(gp) -+ jmp zero, machdep_cerror - Lsys_noerr_fstat: -- RET -- .end machdep_sys_fstat -+ RET -+ .end machdep_sys_fstat diff --git a/devel/unproven-pthreads/patches/patch-ai b/devel/unproven-pthreads/patches/patch-ai deleted file mode 100644 index e8c18792397..00000000000 --- a/devel/unproven-pthreads/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2001/01/09 16:14:20 briggs Exp $ - ---- config/config.guess.orig Sat Nov 6 18:32:27 1999 -+++ config/config.guess Mon Jan 8 23:02:15 2001 -@@ -292,7 +292,8 @@ - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:NetBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ UNAME_PROCESSOR=`uname -p 2>/dev/null` || UNAME_PROCESSOR=$UNAME_MACHINE -+ echo ${UNAME_PROCESSOR}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` diff --git a/devel/unproven-pthreads/patches/patch-al b/devel/unproven-pthreads/patches/patch-al deleted file mode 100644 index 47cb7dec07c..00000000000 --- a/devel/unproven-pthreads/patches/patch-al +++ /dev/null @@ -1,140 +0,0 @@ -$NetBSD: patch-al,v 1.1 2001/01/09 16:14:21 briggs Exp $ - ---- /dev/null Wed Dec 31 19:00:00 1969 -+++ machdep/engine-powerpc-netbsd.c Tue Jan 9 10:43:05 2001 -@@ -0,0 +1,135 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Description : Machine dependent functions for NetBSD/PowerPC (1.5+) -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * 2001/01/10 briggs -+ * -Modified to make it go with NetBSD/PowerPC -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "engine-alpha-osf1.c,v 1.4.4.1 1995/12/13 05:41:37 proven Exp"; -+#endif -+ -+#include <pthread.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/syscall.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <stdio.h> -+ -+/* ========================================================================== -+ * machdep_pthread_start() -+ */ -+void machdep_pthread_start(void) -+{ -+ context_switch_done(); -+ pthread_sched_resume (); -+ -+ /* XXXMLG -+ * This is EXTREMELY bogus, but it seems that this function is called -+ * with the pthread kernel locked. If this happens, __errno() will -+ * return the wrong address until after the first context switch. -+ * -+ * Clearly there is a leak of pthread_kernel somewhere, but until -+ * it is found, we force a context switch here, just before calling -+ * the thread start routine. When we return from pthread_yield -+ * the kernel will be unlocked. -+ */ -+ pthread_yield(); -+ -+ /* Run current threads start routine with argument */ -+ pthread_exit(pthread_run->machdep_data.start_routine -+ (pthread_run->machdep_data.start_argument)); -+ -+ /* should never reach here */ -+ PANIC("setitimer failed"); -+} -+ -+/* ========================================================================== -+ * __machdep_pthread_create() -+ */ -+void __machdep_pthread_create(struct machdep_pthread *machdep_pthread, -+ void *(* start_routine)(void *), void *start_argument, -+ long stack_size, long nsec, long flags) -+{ -+ machdep_pthread->start_routine = start_routine; -+ machdep_pthread->start_argument = start_argument; -+ -+ machdep_pthread->machdep_timer.it_value.tv_sec = 0; -+ machdep_pthread->machdep_timer.it_interval.tv_sec = 0; -+ machdep_pthread->machdep_timer.it_interval.tv_usec = 0; -+ machdep_pthread->machdep_timer.it_value.tv_usec = nsec / 1000; -+ -+ /* Set up new stack frame so that it looks like it returned from a -+ longjmp() to the beginning of machdep_pthread_start(). */ -+ /* state is sigmask, then r8-r31 where r11 is the LR -+ * So, istate[3] is r10, which is the SP -+ * So, istate[4] is r11, which is the LR -+ * So, istate[5] is r12, which is the CR -+ */ -+ machdep_pthread->machdep_istate[4] = (long)machdep_pthread_start; -+ machdep_pthread->machdep_istate[5] = 0; -+ -+ /* PowerPC stack starts high and builds down, and needs to be 16-byte -+ aligned. */ -+ machdep_pthread->machdep_istate[3] = -+ ((long) machdep_pthread->machdep_stack + stack_size) & ~0xf; -+} -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ return( _setjmp(pthread_run->machdep_data.machdep_istate) ); -+} -+ -+void machdep_restore_state(void) -+{ -+ _longjmp(pthread_run->machdep_data.machdep_istate, 1); -+} -+ -+void machdep_save_float_state (struct pthread *pthread) -+{ -+ __machdep_save_fp_state(pthread->machdep_data.machdep_fstate); -+} -+ -+void machdep_restore_float_state (void) -+{ -+ __machdep_restore_fp_state(pthread_run->machdep_data.machdep_fstate); -+} -+ -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC("setitimer failed"); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_unset_thread_timer() -+ */ -+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ struct itimerval zeroval = { { 0, 0 }, { 0, 0} }; -+ -+ if (setitimer(ITIMER_VIRTUAL, &zeroval, NULL)) { -+ PANIC("setitimer failed"); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_pthread_cleanup() -+ */ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) -+{ -+ return(machdep_pthread->machdep_stack); -+} diff --git a/devel/unproven-pthreads/patches/patch-am b/devel/unproven-pthreads/patches/patch-am deleted file mode 100644 index c1fe579e1a4..00000000000 --- a/devel/unproven-pthreads/patches/patch-am +++ /dev/null @@ -1,211 +0,0 @@ -$NetBSD: patch-am,v 1.1 2001/01/09 16:14:21 briggs Exp $ - ---- /dev/null Wed Dec 31 19:00:00 1969 -+++ machdep/engine-powerpc-netbsd.h Tue Jan 9 02:42:26 2001 -@@ -0,0 +1,206 @@ -+/* ==== machdep.h ============================================================ -+ * Copyright (c) 1994 Chris Provenzano (proven@athena.mit.edu) and -+ * Ken Raeburn (raeburn@mit.edu). -+ * -+ * engine-alpha-osf1.h,v 1.4.4.1 1995/12/13 05:41:42 proven Exp -+ * -+ */ -+ -+#include <unistd.h> -+#include <setjmp.h> -+#include <sys/time.h> -+#include <sys/cdefs.h> -+#include <sys/signal.h> /* for _NSIG */ -+#include <sys/syscall.h> -+ -+#include <unistd.h> -+#include <setjmp.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. -+ */ -+#define SEMAPHORE_CLEAR 0 -+#define SEMAPHORE_SET 0xffff -+ -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+ volatile long t1, temp = SEMAPHORE_SET; \ -+ __asm__ volatile( \ -+ "1: lwarx %0,0,%1; \ -+ cmpwi %0, 0; \ -+ bne 2f; \ -+ stwcx. %2,0,%1; \ -+ bne- 1b; \ -+ 2: " \ -+ :"=r" (t1) \ -+ :"m" (lock), "r" (temp)); \ -+ t1; \ -+}) -+ -+#define SEMAPHORE_RESET(lock) *lock = SEMAPHORE_CLEAR -+ -+/* -+ * New types -+ */ -+typedef int semaphore; -+ -+/* -+ * sigset_t macros -+ */ -+#define SIG_ANY(sig) (sig) -+#define SIGMAX (_NSIG-1) -+ -+/* -+ * New Strutures -+ */ -+struct machdep_pthread { -+ void *(*start_routine)(void *); -+ void *start_argument; -+ void *machdep_stack; -+ struct itimerval machdep_timer; -+ jmp_buf machdep_istate; -+ unsigned long machdep_fstate[66]; -+ /* 64-bit fp regs 0-31 + fpscr */ -+ /* We pretend the fpscr is 64 bits */ -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+ { NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, { 0 }, { 0 } } -+ -+/* -+ * Minimum stack size -+ */ -+#define PTHREAD_STACK_MIN 2048 -+ -+/* -+ * Some fd flag defines that are necessary to distinguish between posix -+ * behavior and bsd4.3 behavior. -+ */ -+#define __FD_NONBLOCK O_NONBLOCK -+ -+/* -+ * New functions -+ */ -+ -+__BEGIN_DECLS -+ -+#if defined(PTHREAD_KERNEL) -+ -+#define __machdep_stack_get(x) (x)->machdep_stack -+#define __machdep_stack_set(x, y) (x)->machdep_stack = y -+#define __machdep_stack_repl(x, y) \ -+{ \ -+ if ((stack = __machdep_stack_get(x))) { \ -+ __machdep_stack_free(stack); \ -+ } \ -+ __machdep_stack_set(x, y); \ -+} -+ -+int machdep_save_state(void); -+ -+void __machdep_save_fp_state(unsigned long *); -+void __machdep_restore_fp_state(unsigned long *); -+ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread); -+void machdep_pthread_start(void); -+ -+/* ========================================================================== -+ * __machdep_stack_free() -+ */ -+inline static -+void __machdep_stack_free(void * stack) -+{ -+ free(stack); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_alloc() -+ */ -+inline static -+void * __machdep_stack_alloc(size_t size) -+{ -+ return(malloc(size)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+static inline int -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_wait3() -+ */ -+static inline int -+machdep_sys_wait3(int * b, int c, struct rusage *d) -+{ -+ return(machdep_sys_wait4(0, b, c, d)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_waitpid() -+ */ -+static inline int -+machdep_sys_waitpid(int a, int * b, int c) -+{ -+ return(machdep_sys_wait4(a, b, c, NULL)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+static inline int -+machdep_sys_getdtablesize(void) -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+static inline -+off_t machdep_sys_lseek(int fd, off_t offset, int whence) -+{ -+ return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -+} -+ -+static inline -+int machdep_sys_ftruncate( int fd, off_t length) -+{ -+ quad_t q; -+ int rv; -+ -+ q = __syscall((quad_t)SYS_ftruncate, fd,0, length); -+ if( /* LINTED constant */ sizeof( quad_t ) == sizeof( register_t ) || -+ /* LINTED constant */ BYTE_ORDER == LITTLE_ENDIAN ) -+ rv = (int)q; -+ else -+ rv = (int)((u_quad_t)q >> 32); -+ -+ return rv; -+} -+ -+ -+/* ========================================================================== -+ * machdep_sys_getdirentries() -+ */ -+static inline int -+machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} -+#endif -+ -+__END_DECLS diff --git a/devel/unproven-pthreads/patches/patch-an b/devel/unproven-pthreads/patches/patch-an deleted file mode 100644 index 8c9c9f3c524..00000000000 --- a/devel/unproven-pthreads/patches/patch-an +++ /dev/null @@ -1,186 +0,0 @@ -$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,181 @@ -+#include <machine/asm.h> -+#define COMPAT_43 -+#include <sys/syscall.h> -+ -+#undef SYSCALL -+ -+/* Kernel syscall interface: -+ Input: -+ 0 - system call number -+ 3-8 - arguments, as in C -+ Output: -+ so - (summary overflow) clear iff successful -+ -+ This macro is similar to SYSCALL in asm.h, but not completely. -+ There's room for optimization, if we assume this will continue to -+ be assembled as one file. -+ -+ This macro expansions does not include the return instruction. -+ If there's no other work to be done, use something like: -+ SYSCALL(foo) ; ret -+ If there is other work to do (in fork, maybe?), do it after the -+ 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) */ -+ 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 */ -+ mtlr 0 -+ 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) -+ li 0, SYS_fork -+ sc -+ bso PIC_PLT(_C_LABEL(machdep_cerror)) -+ addi 4,4,-1 -+ blr -+ -+/* The pipe system call is special... */ -+ENTRY(machdep_sys_pipe) -+ mr 5,3 -+ li 0,SYS_pipe -+ sc -+ bso PIC_PLT(_C_LABEL(machdep_cerror)) -+ stw 3,0(5) /* Success, store fds */ -+ stw 4,4(5) -+ li 3,0 -+ blr /* And return 0 */ -+ -+#ifndef SYS___sigsuspend14 -+/* The sigsuspend system call is special... */ -+ENTRY(machdep_sys_sigsuspend) -+ lwz 3,0(3) -+ li 0,SYS_compat_13_sigsuspend13 -+ sc -+ b PIC_PLT(_C_LABEL(machdep_cerror)) -+#endif /* SYS_sigsuspend14 */ -+ -+#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 */ -+ beq Ldoit -+ lwz 4,0(4) /* if not, replace it in r4 with #set */ -+ mr 6,3 -+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 */ -+Ldone: -+ li 3,0 /* return 0 */ -+ blr -+#endif /* SYS_sigprocmask14 */ -+ -+/* More stuff ... */ -+ -+/* For fstat() we actually syscall fstat13. */ -+ENTRY(machdep_sys_fstat) -+ li 0, SYS___fstat13 -+ sc -+ bnslr -+ b PIC_PLT(_C_LABEL(machdep_cerror)) -+ -+/* Do we need to save the entire floating point state? I think so... */ -+ENTRY(__machdep_save_fp_state) -+ stwu 1,-8(1) -+ stw 3,4(1) -+ stfd 0,0(3) -+ stfdu 1,8(3) -+ stfdu 2,8(3) -+ stfdu 3,8(3) -+ stfdu 4,8(3) -+ stfdu 5,8(3) -+ stfdu 6,8(3) -+ stfdu 7,8(3) -+ stfdu 8,8(3) -+ stfdu 9,8(3) -+ stfdu 10,8(3) -+ stfdu 11,8(3) -+ stfdu 12,8(3) -+ stfdu 13,8(3) -+ stfdu 14,8(3) -+ stfdu 15,8(3) -+ stfdu 16,8(3) -+ stfdu 17,8(3) -+ stfdu 18,8(3) -+ stfdu 19,8(3) -+ stfdu 20,8(3) -+ stfdu 21,8(3) -+ stfdu 22,8(3) -+ stfdu 23,8(3) -+ stfdu 24,8(3) -+ stfdu 25,8(3) -+ stfdu 26,8(3) -+ stfdu 27,8(3) -+ stfdu 28,8(3) -+ stfdu 29,8(3) -+ stfdu 30,8(3) -+ stfdu 31,8(3) -+ mffs 0 -+ stfdu 0,8(3) -+ lwz 3,4(1) -+ lwz 1,0(1) -+ blr -+ -+ENTRY(__machdep_restore_fp_state) -+ stwu 1,-12(1) -+ stw 3,4(1) -+ stw 4,8(1) -+ mr 4,3 -+ lfdu 1,8(3) -+ lfdu 2,8(3) -+ lfdu 3,8(3) -+ lfdu 4,8(3) -+ lfdu 5,8(3) -+ lfdu 6,8(3) -+ lfdu 7,8(3) -+ lfdu 8,8(3) -+ lfdu 9,8(3) -+ lfdu 10,8(3) -+ lfdu 11,8(3) -+ lfdu 12,8(3) -+ lfdu 13,8(3) -+ lfdu 14,8(3) -+ lfdu 15,8(3) -+ lfdu 16,8(3) -+ lfdu 17,8(3) -+ lfdu 18,8(3) -+ lfdu 19,8(3) -+ lfdu 20,8(3) -+ lfdu 21,8(3) -+ lfdu 22,8(3) -+ lfdu 23,8(3) -+ lfdu 24,8(3) -+ lfdu 25,8(3) -+ lfdu 26,8(3) -+ lfdu 27,8(3) -+ lfdu 28,8(3) -+ lfdu 29,8(3) -+ lfdu 30,8(3) -+ lfdu 31,8(3) -+ lfdu 0,8(3) -+ mtfsf 127,0 -+ lfd 0,0(4) -+ lwz 3,4(1) -+ lwz 4,8(1) -+ lwz 1,0(1) -+ blr diff --git a/devel/unproven-pthreads/patches/patch-ao b/devel/unproven-pthreads/patches/patch-ao deleted file mode 100644 index cc58ed16c2a..00000000000 --- a/devel/unproven-pthreads/patches/patch-ao +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2001/01/09 16:14:22 briggs Exp $ - ---- /dev/null Wed Dec 31 19:00:00 1969 -+++ machdep/syscall-template-powerpc-netbsd.S Tue Jan 9 00:01:33 2001 -@@ -0,0 +1,45 @@ -+#include <machine/asm.h> -+#define COMPAT_43 -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+ -+#ifdef SYS___sigaction14 -+#define SYS_sigaction SYS___sigaction14 -+#endif -+ -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#undef SYSCALL -+ -+/* Kernel syscall interface: -+ Input: -+ 0 - system call number -+ 3-8 - arguments, as in C -+ Output: -+ so - (summary overflow) clear iff successful -+ -+ This macro is similar to SYSCALL in asm.h, but not completely. -+ There's room for optimization, if we assume this will continue to -+ be assembled as one file. -+ -+ This macro expansions does not include the return instruction. -+ If there's no other work to be done, use something like: -+ SYSCALL(foo) ; ret -+ If there is other work to do (in fork, maybe?), do it after the -+ SYSCALL invocation. */ -+ -+#define SYSCALL(x) \ -+ ENTRY(machdep_sys_ ## x) \ -+ li 0, SYS_ ## x ; \ -+ sc ; \ -+ bnslr ; \ -+ b PIC_PLT(_C_LABEL(machdep_cerror)) -+ -+#define XSYSCALL(x) SYSCALL(x) ; blr -+ -+ XSYSCALL(SYSCALL_NAME) diff --git a/devel/unproven-pthreads/patches/patch-ap b/devel/unproven-pthreads/patches/patch-ap deleted file mode 100644 index e4bb4e5a555..00000000000 --- a/devel/unproven-pthreads/patches/patch-ap +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2001/03/23 15:57:46 agc Exp $ - -Patch from Wofgang Solfrank: - -The changes to unproven-pthreads fix a problem with fstat not using -the pthreads filedescriptors, but the native ones (the code for this -was already there (slightly buggy), but it wasn't used for some -unknown reason). In addition, the handling of select is improved, as -the original code may wake up not all threads waiting for some event. - ---- pthreads/Makefile.inc.orig Mon Jul 10 19:23:27 2000 -+++ pthreads/Makefile.inc Fri Mar 23 15:43:59 2001 -@@ -9,6 +9,7 @@ - process.c wait.c errno.c schedparam.c _exit.c prio_queue.c \ - pthread_init.c init.cc sig.c info.c mutexattr.c select.c wrapper.c \ - dump_state.c pthread_kill.c condattr.c -+SRCS+= stat.c - - .if $(HAVE_SYSCALL_TEMPLATE) == yes - OBJS+= syscalls.o diff --git a/devel/unproven-pthreads/patches/patch-aq b/devel/unproven-pthreads/patches/patch-aq deleted file mode 100644 index 93f81617016..00000000000 --- a/devel/unproven-pthreads/patches/patch-aq +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2002/04/13 12:53:42 fredb Exp $ - ---- pthreads/stat.c.orig Sat Nov 6 17:30:50 1999 -+++ pthreads/stat.c -@@ -44,6 +44,8 @@ - - struct stat; - -+int fstat(int, struct stat *); -+ - /* ========================================================================== - * fstat() - * -@@ -54,7 +56,7 @@ - int ret; - - if ((ret = fd_lock(fd, FD_READ, NULL)) == OK) { -- if ((ret = machdep_sys_fstat(fd_table[fd]->fd.i, buf)) < OK) { -+ if ((ret = machdep_sys_fstat(fd_table[fd]->fd, buf)) < OK) { - SET_ERRNO(-ret); - ret = NOTOK; - } -@@ -63,6 +65,7 @@ - return(ret); - } - -+#ifdef __notdef__ /* Not neccessary (for now) */ - /* ========================================================================== - * stat() - */ -@@ -92,4 +95,4 @@ - return(ret); - - } -- -+#endif diff --git a/devel/unproven-pthreads/patches/patch-ar b/devel/unproven-pthreads/patches/patch-ar deleted file mode 100644 index 59f42065d53..00000000000 --- a/devel/unproven-pthreads/patches/patch-ar +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2001/03/23 15:57:46 agc Exp $ - -Patch from Wofgang Solfrank: - -The changes to unproven-pthreads fix a problem with fstat not using -the pthreads filedescriptors, but the native ones (the code for this -was already there (slightly buggy), but it wasn't used for some -unknown reason). In addition, the handling of select is improved, as -the original code may wake up not all threads waiting for some event. - ---- pthreads/fd_kern.c.orig Mon Jul 10 19:23:28 2000 -+++ pthreads/fd_kern.c Fri Mar 23 15:43:59 2001 -@@ -173,23 +173,26 @@ - ; i++) { - int count_dec = 0; - -- if ((FD_ISSET(i, &pthread->data.select_data->exceptfds) && -- ! FD_ISSET(i, &fd_set_except))) { -- FD_CLR(i, &pthread->data.select_data->exceptfds); -- } else { -- count_dec++; -- } -- if ((FD_ISSET(i, &pthread->data.select_data->writefds) && -- ! FD_ISSET(i, &fd_set_write))) { -- FD_CLR(i, &pthread->data.select_data->writefds); -- } else { -- count_dec++; -- } -- if ((FD_ISSET(i, &pthread->data.select_data->readfds) && -- ! FD_ISSET(i, &fd_set_read))) { -- FD_CLR(i, &pthread->data.select_data->readfds); -- } else { -- count_dec++; -+ if (FD_ISSET(i, &pthread->data.select_data->exceptfds)) { -+ if (!FD_ISSET(i, &fd_set_except)) { -+ FD_CLR(i, &pthread->data.select_data->exceptfds); -+ } else { -+ count_dec++; -+ } -+ } -+ if (FD_ISSET(i, &pthread->data.select_data->writefds)) { -+ if (!FD_ISSET(i, &fd_set_write)) { -+ FD_CLR(i, &pthread->data.select_data->writefds); -+ } else { -+ count_dec++; -+ } -+ } -+ if (FD_ISSET(i, &pthread->data.select_data->readfds)) { -+ if (!FD_ISSET(i, &fd_set_read)) { -+ FD_CLR(i, &pthread->data.select_data->readfds); -+ } else { -+ count_dec++; -+ } - } - if (count_dec) { - found_one++; -@@ -312,23 +315,26 @@ - for (i = 0; i < pthread->data.select_data->nfds; i++) { - int count_dec = 0; - -- if ((FD_ISSET(i, &pthread->data.select_data->exceptfds) && -- ! FD_ISSET(i, &fd_set_except))) { -- FD_CLR(i, &pthread->data.select_data->exceptfds); -- } else { -- count_dec++; -- } -- if ((FD_ISSET(i, &pthread->data.select_data->writefds) && -- ! FD_ISSET(i, &fd_set_write))) { -- FD_CLR(i, &pthread->data.select_data->writefds); -- } else { -- count_dec++; -- } -- if ((FD_ISSET(i, &pthread->data.select_data->readfds) && -- ! FD_ISSET(i, &fd_set_read))) { -- FD_CLR(i, &pthread->data.select_data->readfds); -- } else { -- count_dec++; -+ if (FD_ISSET(i, &pthread->data.select_data->exceptfds)) { -+ if (!FD_ISSET(i, &fd_set_except)) { -+ FD_CLR(i, &pthread->data.select_data->exceptfds); -+ } else { -+ count_dec++; -+ } -+ } -+ if (FD_ISSET(i, &pthread->data.select_data->writefds)) { -+ if (!FD_ISSET(i, &fd_set_write)) { -+ FD_CLR(i, &pthread->data.select_data->writefds); -+ } else { -+ count_dec++; -+ } -+ } -+ if (FD_ISSET(i, &pthread->data.select_data->readfds)) { -+ if (!FD_ISSET(i, &fd_set_read)) { -+ FD_CLR(i, &pthread->data.select_data->readfds); -+ } else { -+ count_dec++; -+ } - } - if (count_dec) { - found_one++; diff --git a/devel/unproven-pthreads/patches/patch-as b/devel/unproven-pthreads/patches/patch-as deleted file mode 100644 index 26c1e4b8a80..00000000000 --- a/devel/unproven-pthreads/patches/patch-as +++ /dev/null @@ -1,109 +0,0 @@ -$NetBSD: patch-as,v 1.1 2001/04/12 07:53:18 skrll Exp $ - ---- machdep/syscall-sparc-netbsd-1.3.S.orig Thu Apr 12 08:33:16 2001 -+++ machdep/syscall-sparc-netbsd-1.3.S -@@ -10,10 +10,11 @@ - #endif - -+#include <machine/asm.h> - #include <sys/syscall.h> - - #define SYSCALL(x) \ -- .globl _machdep_sys_##x; \ -+ .globl _C_LABEL(machdep_sys_##x); \ - \ --_machdep_sys_##x:; \ -+_C_LABEL(machdep_sys_##x):; \ - \ - mov SYS_##x, %g1; \ -@@ -44,7 +45,7 @@ - * machdep_sys_pipe() - */ -- .globl _machdep_sys_pipe -+ .globl _C_LABEL(machdep_sys_pipe) - --_machdep_sys_pipe: -+_C_LABEL(machdep_sys_pipe): - mov %o0, %o2 - mov SYS_pipe, %g1 -@@ -60,7 +61,7 @@ - * machdep_sys_fork() - */ -- .globl _machdep_sys_fork; -+ .globl _C_LABEL(machdep_sys_fork); - --_machdep_sys_fork:; -+_C_LABEL(machdep_sys_fork):; - - mov SYS_fork, %g1; -@@ -76,7 +77,7 @@ - * machdep_sys_sigprocmask() - */ -- .globl _machdep_sys_sigprocmask; -+ .globl _C_LABEL(machdep_sys_sigprocmask); - --_machdep_sys_sigprocmask:; -+_C_LABEL(machdep_sys_sigprocmask):; - - ld [%o1], %o1; -@@ -93,7 +94,7 @@ - * machdep_sys_sigsuspend() - */ -- .globl _machdep_sys_sigsuspend; -+ .globl _C_LABEL(machdep_sys_sigsuspend); - --_machdep_sys_sigsuspend:; -+_C_LABEL(machdep_sys_sigsuspend):; - - ld [%o0], %o0; -@@ -109,7 +110,7 @@ - * machdep_sys_fstat() - */ -- .globl _machdep_sys_fstat; -+ .globl _C_LABEL(machdep_sys_fstat); - --_machdep_sys_fstat:; -+_C_LABEL(machdep_sys_fstat):; - - mov SYS___fstat13, %g1; -@@ -123,5 +124,5 @@ - * machdep_sys___syscall() - */ --_machdep_sys___syscall:; -+_C_LABEL(machdep_sys___syscall):; - - mov SYS___syscall, %g1; -@@ -135,7 +136,7 @@ - * machdep_sys_lseek() - */ -- .global _machdep_sys_lseek -+ .global _C_LABEL(machdep_sys_lseek) - --_machdep_sys_lseek: -+_C_LABEL(machdep_sys_lseek): - save %sp,-112,%sp - mov %i1,%o4 -@@ -145,5 +146,5 @@ - mov SYS_lseek,%o1 - mov %i0,%o2 -- call _machdep_sys___syscall,0 -+ call _C_LABEL(machdep_sys___syscall),0 - mov 0,%o3 - mov %o0,%i0 -@@ -155,7 +156,7 @@ - * machdep_sys_ftruncate() - */ -- .global _machdep_sys_ftruncate -+ .global _C_LABEL(machdep_sys_ftruncate) - --_machdep_sys_ftruncate: -+_C_LABEL(machdep_sys_ftruncate): - save %sp,-104,%sp - mov %i1,%o4 -@@ -164,5 +165,5 @@ - mov SYS_ftruncate,%o1 - mov %i0,%o2 -- call _machdep_sys___syscall,0 -+ call _C_LABEL(machdep_sys___syscall),0 - mov 0,%o3 - mov %o0,%o1 diff --git a/devel/unproven-pthreads/patches/patch-at b/devel/unproven-pthreads/patches/patch-at deleted file mode 100644 index 562e06e2d08..00000000000 --- a/devel/unproven-pthreads/patches/patch-at +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-at,v 1.2 2001/04/12 15:53:31 skrll Exp $ - ---- 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,19 +4,25 @@ - * - */ - -+#include <machine/asm.h> - #include <sys/syscall.h> - - #ifdef SYS___sigsuspend14 - #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) \ -- .globl _machdep_sys_##x; \ -+ .globl _C_LABEL(machdep_sys_##x); \ - \ --_machdep_sys_##x:; \ -+_C_LABEL(machdep_sys_##x):; \ - \ - mov SYS_##x, %g1; \ - ta 0; \ diff --git a/devel/unproven-pthreads/patches/patch-au b/devel/unproven-pthreads/patches/patch-au deleted file mode 100644 index a6f4b2ead85..00000000000 --- a/devel/unproven-pthreads/patches/patch-au +++ /dev/null @@ -1,52 +0,0 @@ -$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 deleted file mode 100644 index 9d965444534..00000000000 --- a/devel/unproven-pthreads/patches/patch-av +++ /dev/null @@ -1,70 +0,0 @@ -$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 - diff --git a/devel/unproven-pthreads/patches/patch-aw b/devel/unproven-pthreads/patches/patch-aw deleted file mode 100644 index 9513aac45f3..00000000000 --- a/devel/unproven-pthreads/patches/patch-aw +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2001/04/12 16:10:33 skrll Exp $ - ---- pthreads/process.c.orig Mon Jul 10 19:23:28 2000 -+++ pthreads/process.c -@@ -45,2 +45,4 @@ - -+#include "config.h" -+ - #ifndef lint diff --git a/devel/unproven-pthreads/patches/patch-ax b/devel/unproven-pthreads/patches/patch-ax deleted file mode 100644 index 7037601842c..00000000000 --- a/devel/unproven-pthreads/patches/patch-ax +++ /dev/null @@ -1,148 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2002/04/13 12:53:42 fredb Exp $ - ---- machdep/engine-m68000-netbsd.c.orig Fri Dec 10 12:40:41 1999 -+++ machdep/engine-m68000-netbsd.c -@@ -46,7 +46,6 @@ - #endif - --#include "pthread.h" -+#include <pthread.h> - #include <sys/syscall.h> --#include <sys/stat.h> - - /* ========================================================================== -@@ -67,5 +66,5 @@ - - /* ========================================================================== -- * machdep_save_state() -+ * machdep_save_float_state() - */ - void machdep_save_float_state(struct pthread * pthread) -@@ -73,6 +72,6 @@ - char * fdata = pthread->machdep_data.machdep_fstate; - -- __asm__ ( "fmovem fp0-fp7,%0"::"m" (*fdata) ); -- __asm__ ( "fmovem fpcr/fpsr/fpi,%0"::"m" (fdata[80]) ); -+ __asm__ ( "fmovem %%fp0-%%fp7,%0"::"m" (*fdata) ); -+ __asm__ ( "fmovem %%fpcr/%%fpsr/%%fpi,%0"::"m" (fdata[80]) ); - } - -@@ -84,17 +83,6 @@ - char * fdata = pthread_run->machdep_data.machdep_fstate; - -- __asm__ ( "fmovem %0,fp0-fp7"::"m" (*fdata) ); -- __asm__ ( "fmovem %0,fpcr/fpsr/fpi"::"m" (fdata[80]) ); -- --} -- --/* ========================================================================== -- * machdep_set_thread_timer() -- */ --void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) --{ -- if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -- PANIC("setitimer failed"); -- } -+ __asm__ ( "fmovem %0,%%fp0-%%fp7"::"m" (*fdata) ); -+ __asm__ ( "fmovem %0,%%fpcr/%%fpsr/%%fpi"::"m" (fdata[80]) ); - } - -@@ -112,30 +100,4 @@ - - /* ========================================================================== -- * __machdep_stack_free() -- */ --void __machdep_stack_free(void * stack) --{ -- free(stack); --} -- --/* ========================================================================== -- * __machdep_stack_alloc() -- */ --void * __machdep_stack_alloc(size_t size) --{ -- void * stack; -- -- return((void*)malloc(size)); --} -- --/* ========================================================================== -- * machdep_pthread_cleanup() -- */ --void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) --{ -- return(machdep_pthread->machdep_stack); --} -- --/* ========================================================================== - * machdep_pthread_start() - */ -@@ -172,5 +134,5 @@ - */ - 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) - { -@@ -207,38 +169,4 @@ - - /* ========================================================================== -- * machdep_sys_wait3() -- */ --machdep_sys_wait3(int * b, int c, int * d) --{ -- return(machdep_sys_wait4(0, b, c, d)); --} -- --/* ========================================================================== -- * machdep_sys_waitpid() -- */ --machdep_sys_waitpid(int a, int * b, int c) --{ -- return(machdep_sys_wait4(a, b, c, NULL)); --} -- --/* ========================================================================== -- * machdep_sys_getdtablesize() -- */ --machdep_sys_getdtablesize() --{ -- return(sysconf(_SC_OPEN_MAX)); --} -- --/* ========================================================================== -- * machdep_sys_getdirentries() -- */ --machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) --{ -- return(machdep_sys_getdents(fd, buf, len)); --} -- --extern off_t __syscall(); -- --/* ========================================================================== - * machdep_sys_lseek() - */ -@@ -248,5 +176,8 @@ - } - --int machdep_sys_ftruncate( int fd, off_t length) -+/* ========================================================================== -+ * machdep_sys_ftruncate() -+ */ -+int machdep_sys_ftruncate(int fd, off_t length) - { - quad_t q; -@@ -263,6 +194,9 @@ - } - --int machdep_sys_fstat( int f, struct stat* st ) -+/* ========================================================================== -+ * machdep_sys_fstat() -+ */ -+int machdep_sys_fstat(int f, struct stat* st) - { -- return __fstat13(f,st); -+ return(__syscall((quad_t)SYS___fstat13, f, st)); - } diff --git a/devel/unproven-pthreads/patches/patch-ay b/devel/unproven-pthreads/patches/patch-ay deleted file mode 100644 index 9300504b618..00000000000 --- a/devel/unproven-pthreads/patches/patch-ay +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2002/04/13 12:53:42 fredb Exp $ - ---- machdep/syscall-m68000-netbsd.S.orig Sat Nov 6 17:33:04 1999 -+++ machdep/syscall-m68000-netbsd.S Thu Apr 11 11:47:10 2002 -@@ -10,10 +10,10 @@ - #ifdef __STDC__ - #define IMM # - #define SYSCALL(x) .even; ENTRY(machdep_sys_ ## x); \ -- movl IMM SYS_ ## x,d0; trap IMM 0; jcs err; rts -+ movl IMM SYS_ ## x,%d0; trap IMM 0; jcs err; rts - #else /* !__STDC__ */ - #define SYSCALL(x) .even; ENTRY(machdep_sys_/**/x); \ -- movl #SYS_/**/x,d0; trap #0; jcs err; rts -+ movl #SYS_/**/x,%d0; trap #0; jcs err; rts - #endif /* !__STDC__ */ - - /* -@@ -29,7 +29,7 @@ - */ - - err: -- negl d0 -+ negl %d0 - rts - - /* ========================================================================== -@@ -37,47 +37,47 @@ - */ - .even - ENTRY(machdep_sys_pipe); -- movl #SYS_pipe,d0 -+ movl #SYS_pipe,%d0 - trap #0 - jcs err -- movl sp@(4),a0 -- movl d0,a0@+ -- movl d1,a0@ -- clrl d0 -+ movl %sp@(4),%a0 -+ movl %d0,%a0@+ -+ movl %d1,%a0@ -+ clrl %d0 - rts - - #ifndef SYS___sigsuspend14 - .even - ENTRY(machdep_sys_sigsuspend) -- movl sp@(4),a0 -- movl a0@,sp@(4) -- movl #SYS_sigsuspend,d0 -+ movl %sp@(4),%a0 -+ movl %a0@,%sp@(4) -+ movl #SYS_sigsuspend,%d0 - trap #0 - jcs err -- clrl d0 -+ clrl %d0 - rts - #endif - - #ifndef SYS___sigprocmask14 - .even - ENTRY(machdep_sys_sigprocmask) -- tstl sp@(8) -+ tstl %sp@(8) - jne gotptr --/* movl #0,sp@(8) /* null mask pointer; block empty set */ -- movl #1,sp@(4) -+/* movl #0,%sp@(8) /* null mask pointer; block empty set */ -+ movl #1,%sp@(4) - jra doit - gotptr: -- movl sp@(8),a0 -- movl a0@,sp@(8) -+ movl %sp@(8),%a0 -+ movl %a0@,%sp@(8) - doit: -- movl #SYS_sigprocmask,d0 -+ movl #SYS_sigprocmask,%d0 - trap #0 - jcs err -- tstl sp@(12) -+ tstl %sp@(12) - jeq out -- movl sp@(12),a0 -- movl d0,a0@ -+ movl %sp@(12),%a0 -+ movl %d0,%a0@ - out: -- clrl d0 -+ clrl %d0 - rts - #endif diff --git a/devel/unproven-pthreads/patches/patch-az b/devel/unproven-pthreads/patches/patch-az deleted file mode 100644 index a57d2fc455f..00000000000 --- a/devel/unproven-pthreads/patches/patch-az +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-az,v 1.1 2002/04/13 12:53:42 fredb Exp $ - ---- machdep/syscall-template-m68000-netbsd.S.orig Sat Nov 6 17:33:04 1999 -+++ machdep/syscall-template-m68000-netbsd.S Thu Apr 11 11:44:35 2002 -@@ -13,13 +13,13 @@ - #define IMM # - #define SYSCALL(x) .even; \ - ENTRY(machdep_sys_ ## x); \ -- movl IMM SYS_ ## x,d0; \ -+ movl IMM SYS_ ## x,%d0; \ - trap IMM 0; \ - jcs err; \ - rts - #else /* !__STDC__ */ - #define SYSCALL(x) .even; ENTRY(machdep_sys_/**/x); \ -- movl #SYS_/**/x,d0; trap #0; jcs err; rts -+ movl #SYS_/**/x,%d0; trap #0; jcs err; rts - #endif /* !__STDC__ */ - - /* -@@ -35,7 +35,7 @@ - */ - - err: -- negl d0 -+ negl %d0 - rts - - #define XSYSCALL(NAME) SYSCALL(NAME) diff --git a/devel/unproven-pthreads/patches/patch-ba b/devel/unproven-pthreads/patches/patch-ba deleted file mode 100644 index 45c3cc7da65..00000000000 --- a/devel/unproven-pthreads/patches/patch-ba +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2002/04/13 12:53:43 fredb Exp $ - ---- include/pthread/kernel.h.orig Mon Jul 10 13:23:15 2000 -+++ include/pthread/kernel.h -@@ -93,14 +93,14 @@ - int fd_check_entry(unsigned int); - int fd_allocate(void); - -+struct fd_table_entry *fd_free(int); -+ - void fd_basic_unlock(int, int); - void fd_basic_basic_unlock(struct fd_table_entry *, int); - int fd_basic_lock(unsigned int, int, pthread_mutex_t *, struct timespec *); - - int fd_lock(unsigned int, int, struct timespec *); - void fd_unlock(int, int); -- --struct fd_table_entry *fd_free(int); - - ssize_t read_timedwait(int, void *, size_t, struct timespec *); - int readv_timedwait(int, const struct iovec *, int, struct timespec *); diff --git a/devel/unproven-pthreads/patches/patch-bb b/devel/unproven-pthreads/patches/patch-bb deleted file mode 100644 index 599e29171e7..00000000000 --- a/devel/unproven-pthreads/patches/patch-bb +++ /dev/null @@ -1,119 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2002/04/13 12:53:43 fredb Exp $ - ---- machdep/engine-m68000-netbsd.h.orig Fri Nov 12 15:02:41 1999 -+++ machdep/engine-m68000-netbsd.h -@@ -10,7 +10,13 @@ - - #include <unistd.h> - #include <setjmp.h> -+#include <stdlib.h> - #include <sys/time.h> -+#include <sys/types.h> -+#include <sys/wait.h> -+#include <sys/resource.h> -+ -+#include <pthread/sysfunc.h> - - /* - * The first machine dependent functions are the SEMAPHORES -@@ -70,7 +76,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 }, { 0 } } - - /* - * New functions -@@ -90,17 +96,86 @@ - #ifndef __machdep_stack_repl - #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); \ - } - #endif - --void * __machdep_stack_alloc(size_t); --void __machdep_stack_free(void *); -- --int machdep_save_state(void); -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+static inline -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC("setitimer failed"); -+ } -+} -+ -+/* ========================================================================== -+ * __machdep_stack_alloc() -+ */ -+static inline -+void * __machdep_stack_alloc(size_t size) -+{ -+ return((void*)malloc(size)); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_free() -+ */ -+static inline -+void __machdep_stack_free(void * stack) -+{ -+ free(stack); -+} -+ -+/* ========================================================================== -+ * machdep_pthread_cleanup() -+ */ -+static inline -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) -+{ -+ return(machdep_pthread->machdep_stack); -+} -+ -+/* ========================================================================== -+ * machdep_sys_wait3() -+ */ -+static inline -+int machdep_sys_wait3(int * b, int c, struct rusage * d) -+{ -+ return(machdep_sys_wait4(0, b, c, d)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_waitpid() -+ */ -+static inline -+int machdep_sys_waitpid(int a, int * b, int c) -+{ -+ return(machdep_sys_wait4(a, b, c, NULL)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+static inline -+int machdep_sys_getdtablesize(void) -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdirentries() -+ */ -+static inline -+int machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} - - #endif - diff --git a/devel/unproven-pthreads/patches/patch-bc b/devel/unproven-pthreads/patches/patch-bc deleted file mode 100644 index a346a029cda..00000000000 --- a/devel/unproven-pthreads/patches/patch-bc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bc,v 1.2 2002/08/25 19:22:43 jlam Exp $ - ---- include/pthread.h.orig Mon Jul 10 19:23:14 2000 -+++ include/pthread.h -@@ -71,11 +71,10 @@ - abort(); - } - --#include "pthread/machdep.h" -- - #endif - - #include <pthread/version.h> -+#include <pthread/machdep.h> - #include <pthread/cleanup.h> - #include <pthread/kernel.h> - #include <pthread/prio_queue.h> |