diff options
Diffstat (limited to 'devel')
100 files changed, 1 insertions, 7837 deletions
diff --git a/devel/Makefile b/devel/Makefile index 3cff18e27dc..1f77b17e48a 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.498 2004/06/01 19:35:22 shannonjr Exp $ +# $NetBSD: Makefile,v 1.499 2004/06/01 21:39:19 kristerw Exp $ # COMMENT= Development utilities @@ -59,7 +59,6 @@ SUBDIR+= cervisia2 SUBDIR+= cfitsio SUBDIR+= cgdb SUBDIR+= check -SUBDIR+= chkpt SUBDIR+= chmlib SUBDIR+= cmake SUBDIR+= cmdline @@ -234,7 +233,6 @@ SUBDIR+= ltsa SUBDIR+= lwp SUBDIR+= m4 SUBDIR+= maketool -SUBDIR+= mit-pthreads SUBDIR+= mk-files SUBDIR+= mph SUBDIR+= mrproject @@ -470,7 +468,6 @@ SUBDIR+= tvision SUBDIR+= ucl SUBDIR+= uml SUBDIR+= unidiff -SUBDIR+= unproven-pthreads SUBDIR+= w32api SUBDIR+= xdelta SUBDIR+= xxgdb diff --git a/devel/chkpt/DESCR b/devel/chkpt/DESCR deleted file mode 100644 index 9f536985864..00000000000 --- a/devel/chkpt/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -Chkpt provides a simple interface (C and Fortran) to user-level -checkpointing. ``Checkpointing'' describes the action to periodically -save process information on permanent storage (on hard disk, -typically). After a system failure a process may be continued from -the saved state, from the checkpoint. diff --git a/devel/chkpt/Makefile b/devel/chkpt/Makefile deleted file mode 100644 index 6cccaaba462..00000000000 --- a/devel/chkpt/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: Makefile,v 1.9 2003/07/17 21:29:53 grant Exp $ - -DISTNAME= chkpt-1.7.1 -CATEGORIES= devel -MASTER_SITES= ftp://gutemine.geo.uni-koeln.de/pub/chkpt/ \ - ftp://ftp.Uni-Koeln.DE/misc/ - -MAINTAINER= wennmach@NetBSD.org -#HOMEPAGE= -COMMENT= User-level checkpointing library - -ONLY_FOR_PLATFORM= NetBSD-1.4*-* NetBSD-1.5-* NetBSD-1.5.*-* - -HAS_CONFIGURE= yes -CONFIGURE_ENV+= PREFIX="${PREFIX}" - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/chkpt/PLIST b/devel/chkpt/PLIST deleted file mode 100644 index 78c21bb3dcc..00000000000 --- a/devel/chkpt/PLIST +++ /dev/null @@ -1,13 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:46 zuntum Exp $ -bin/ccc -bin/cf77 -lib/libcc.a -man/man1/ccc.1 -man/man1/cf77.1 -man/man3/chkpt.3 -man/man3/chkpt_init.3 -man/man3/chkpt_timer.3 -man/man3/chkpt_exit.3 -include/chkpt.h -share/examples/chkpt/example.c -share/examples/chkpt/example.f diff --git a/devel/chkpt/distinfo b/devel/chkpt/distinfo deleted file mode 100644 index 9cd0826ff0f..00000000000 --- a/devel/chkpt/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.3 2002/08/04 21:09:24 jdolecek Exp $ - -SHA1 (chkpt-1.7.1.tar.gz) = 5d0b441415e6473e9ada5d9c8f0aef52beaa4196 -Size (chkpt-1.7.1.tar.gz) = 44954 bytes -SHA1 (patch-aa) = 1b9a9bd40701950c64d06ff3b2710668930ef979 -SHA1 (patch-ab) = daaf4763ee951e5a366e0e94ba3362806e239f8d -SHA1 (patch-ac) = 91ab70a614d011360c23608a969d5b2c9200075f diff --git a/devel/chkpt/patches/patch-aa b/devel/chkpt/patches/patch-aa deleted file mode 100644 index 7102036230e..00000000000 --- a/devel/chkpt/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/06/07 22:07:29 bad Exp $ - ---- defaults/customize.csh.orig Thu Jun 3 12:20:09 1999 -+++ defaults/customize.csh Thu Jun 3 12:21:33 1999 -@@ -1,7 +1,7 @@ --set PREFIX = /usr/local -+#set PREFIX = /usr/local - set BINDIR = $PREFIX/bin - set LIBDIR = $PREFIX/lib - set MANDIR = $PREFIX/man - set INCDIR = $PREFIX/include - set EXADIR = $PREFIX/share/examples/chkpt --set DIAGS = "-DEBUG -DIAGNOSTIC" -+set DIAGS = "-DIAGNOSTIC" diff --git a/devel/chkpt/patches/patch-ab b/devel/chkpt/patches/patch-ab deleted file mode 100644 index c42902148b9..00000000000 --- a/devel/chkpt/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2000/07/28 07:20:05 itohy Exp $ - ---- include/addresses.h.orig Fri Jun 11 15:58:36 1999 -+++ include/addresses.h Wed Jul 26 11:11:27 2000 -@@ -61,7 +61,7 @@ - #elif defined(__sparc__) - #include <machine/frame.h> - #undef STACK_BASE --#define STACK_BASE - sizeof(struct frame) -+#define STACK_BASE (void *)(alloca(0) - sizeof(struct frame)) - #endif - #endif /* __NetBSD__ */ - diff --git a/devel/chkpt/patches/patch-ac b/devel/chkpt/patches/patch-ac deleted file mode 100644 index d93b97a418b..00000000000 --- a/devel/chkpt/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/08/04 21:09:24 jdolecek Exp $ - ---- include/machine.h.orig Sun Aug 4 23:02:10 2002 -+++ include/machine.h Sun Aug 4 23:03:26 2002 -@@ -53,6 +53,13 @@ - #elif defined(__sparc__) - #define ARCH_SPARC 1 - #endif -+ -+#include <sys/param.h> -+#if __NetBSD_Version__ > 106000000 /* 1.6.* */ -+#include <uvm/uvm_extern.h> -+#include <machine/pte.h> -+#include <machine/pmap.h> -+#endif - #endif /* __NetBSD__ */ - - #if defined(__alpha) && defined(__osf__) diff --git a/devel/mit-pthreads/DESCR b/devel/mit-pthreads/DESCR deleted file mode 100644 index 5fdcdb95800..00000000000 --- a/devel/mit-pthreads/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This is Chris Provenzano's MIT Pthreads library. - -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/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile deleted file mode 100644 index 2ddc197b1b3..00000000000 --- a/devel/mit-pthreads/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# $NetBSD: Makefile,v 1.40 2004/02/14 15:29:15 jlam Exp $ -# - -DISTNAME= pthreads-1_60_beta6 -PKGNAME= mit-pthreads-1.60b6 -CATEGORIES= devel -MASTER_SITES= ftp://sipb.mit.edu/pub/pthreads/ - -MAINTAINER= agc@NetBSD.org -HOMEPAGE= http://www.mit.edu:8001/people/proven/pthreads.html -COMMENT= Chris Provenzano's (MIT) POSIX threads library - -ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32 \ - NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-m68k \ - NetBSD-*-powerpc -CONFLICTS+= unproven-pthreads-[0-9]* - -GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${PREFIX}/pthreads -MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} - -PATCH_FUZZ_FACTOR= # empty - -post-patch: - @${RM} ${WRKSRC}/include/endian.h - @${RM} ${WRKSRC}/include/math.h - -post-configure: - @${ECHO} "#define HAVE_SYSCALL_SIGACTION 1" >> ${WRKSRC}/config.h - @${ECHO} "#define HAVE_SYSCALL_SIGPAUSE 1" >> ${WRKSRC}/config.h - @${ECHO} "#define HAVE_SYSCALL_SIGPROCMASK 1" >> ${WRKSRC}/config.h - @${ECHO} "#define HAVE_SYSCALL_SIGSUSPEND 1" >> ${WRKSRC}/config.h - @${RM} ${WRKSRC}/include/sys/__math.h - -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/pthreads - -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/mit-pthreads/PLIST b/devel/mit-pthreads/PLIST deleted file mode 100644 index 8828d980268..00000000000 --- a/devel/mit-pthreads/PLIST +++ /dev/null @@ -1,71 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:53 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/dirent.h -pthreads/include/errno.h -pthreads/include/netdb.h -pthreads/include/pthread.h -pthreads/include/pwd.h -pthreads/include/resolv.h -pthreads/include/sched.h -pthreads/include/signal.h -pthreads/include/stdio.h -pthreads/include/stdlib.h -pthreads/include/string.h -pthreads/include/syslog.h -pthreads/include/time.h -pthreads/include/timers.h -pthreads/include/tzfile.h -pthreads/include/unistd.h -pthreads/include/arpa/inet.h -pthreads/include/arpa/nameser.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/types.h -pthreads/include/pthread/unistd.h -pthreads/include/pthread/util.h -pthreads/include/pthread/version.h -pthreads/include/pthread/xtypes.h -pthreads/include/pthread/machdep.h -pthreads/include/pthread/posix.h -pthreads/include/pthread/config.h -pthreads/include/pthread/ac-types.h -pthreads/include/pthread/paths.h -pthreads/include/sys/__path.h -pthreads/include/sys/__signal.h -pthreads/include/sys/__stdio.h -pthreads/include/sys/__stdlib.h -pthreads/include/sys/__string.h -pthreads/include/sys/__time.h -pthreads/include/sys/__unistd.h -pthreads/include/sys/compat.h -pthreads/include/sys/dirent.h -pthreads/include/sys/errno.h -pthreads/include/sys/time.h -pthreads/include/sys/timers.h -pthreads/include/sys/wait.h -@dirrm pthreads/lib -@dirrm pthreads/bin -@dirrm pthreads/include/arpa -@dirrm pthreads/include/pthread -@dirrm pthreads/include/sys -@dirrm pthreads/include -@dirrm pthreads diff --git a/devel/mit-pthreads/distinfo b/devel/mit-pthreads/distinfo deleted file mode 100644 index 96c3a4e5181..00000000000 --- a/devel/mit-pthreads/distinfo +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: distinfo,v 1.8 2002/07/18 09:08:27 agc Exp $ - -SHA1 (pthreads-1_60_beta6.tar.gz) = 238e410f372dd1615c0e82ec9c6ff47699c558ee -Size (pthreads-1_60_beta6.tar.gz) = 382562 bytes -SHA1 (patch-aa) = a42d26c40aa404c2658ad782ddf624d684aa5a6c -SHA1 (patch-ab) = 1585e8418b02bd4f50fce7335ddb3f7ee489f69c -SHA1 (patch-ac) = c858ef1547fb3a8c19296ce81820a675fec9763f -SHA1 (patch-ad) = 904daea73ced6622ceaa99f32108fab14faaac5a -SHA1 (patch-ae) = 811b0043ccaa00e7babfe1e07acc447a09606d0b -SHA1 (patch-af) = aec81f8020d85ae15b0a216a89e5f91bb3e6729c -SHA1 (patch-ag) = 00d261c6a95bfb0243bca1c19a494259b46b2d15 -SHA1 (patch-ah) = 74765981190d7cc80e4eba435309925a32fc6122 -SHA1 (patch-ai) = cbee1589c4df9a44b8e28f9483b82463eafbc919 -SHA1 (patch-aj) = ef5f7da2e6e3add9b7b17e1bec3e94fb947a045d -SHA1 (patch-ak) = 0aca619f64c58200120de62c3597737461971e10 -SHA1 (patch-al) = b8bd36bdf63cd64405f097d5d0833ff23627ac70 -SHA1 (patch-am) = a7595558394c8c3726983c1e7ef466f8f6f4c4f3 -SHA1 (patch-an) = 20d987a2592f89bdd5e6390ec9d9d5cef4d3bd44 -SHA1 (patch-ap) = 54fc8b2de8447498a2e1762cf78ce44d74dd47f2 -SHA1 (patch-aq) = c1e78959d933a5e2fbf92954ea1fa3347481ce7c -SHA1 (patch-ar) = e58e84e7c1ec41fd42bcb29596fd4f1ee5122d57 -SHA1 (patch-as) = 7fcadec7050085119a673c0f8f6b0332087902a2 -SHA1 (patch-at) = a2c7af77a6509b2d10e96eefc318c3410e8b4a9d -SHA1 (patch-au) = 987c7f5f9b3a64c257b6adfcd3da839f63c9d56c -SHA1 (patch-av) = a4540066b35026c3bdb741e00d63b4c1883747f8 -SHA1 (patch-aw) = cb1ed9e8f5d0089716200c650b52f88092014b0f -SHA1 (patch-ax) = 83944d22da291b61f033ce41ce34c0b12d274c85 -SHA1 (patch-ay) = 1e2a1d0ffe257e3cd13a3f1fce6e7faf48b01e8d -SHA1 (patch-az) = 0b22e199f54e8ffa56fdef0bbee2f246313e58ba -SHA1 (patch-ba) = 13b4a81c58d6db053ff96f58cfb8a14fd36301c2 -SHA1 (patch-bb) = 418115f96d7aeac865f89a07ac63f8f6018e8fc1 -SHA1 (patch-bc) = d835183a396a3eddbd9834b1ec3b60048616aee5 -SHA1 (patch-bd) = 989ed48b719dd5a52646a9e71799e8dd479797e6 -SHA1 (patch-be) = 708560ba06a1bcc156e63997675ce547b6896957 -SHA1 (patch-bf) = 466e93d3e75510182827d2d884c8985da2216a39 -SHA1 (patch-bg) = 5c57ddf43c3e4bd8b00d1a508ebed0b3de3474e3 -SHA1 (patch-bh) = ba7d5f3815f97f4b173946c1bfd9c85edc6caa2c -SHA1 (patch-bi) = 740529301c92ae897d23bd951d1a1740bbec315f -SHA1 (patch-bj) = 35d6d3559b1349673748e72438e81dbbbbeb4d6f -SHA1 (patch-bk) = 6eab75c41290435bd8a50758eb378d0b561535f9 -SHA1 (patch-bl) = 3045f6d4f6de2ac6f07c30b28526272fadeb2f01 -SHA1 (patch-bm) = c755f5a66625d93f987a537126fc56c56e83926b -SHA1 (patch-bn) = e5cfd2e414847ada16c8934bd093f1582e7c95d7 -SHA1 (patch-bo) = 0f199da4e6f9c2233833b9e4afd5f53d2c4543ca -SHA1 (patch-bp) = 763c83cc222defc4e09a50057b34ad310e17cb85 -SHA1 (patch-bq) = 2c371a32d649f0a1e6279bc6d58c5da79d26b36c -SHA1 (patch-br) = eb0f281bf24ec9286308e7b4c9741993a3e11289 -SHA1 (patch-bs) = 1428348b488e51c03c12f87ae822e4ffbb272183 -SHA1 (patch-bt) = a4d80cc5baaf276133dd06f221b5852a5d11efdb -SHA1 (patch-bw) = a80df1fdbdbf9ccf9f3e24c0541ecaf98679a4f1 -SHA1 (patch-bx) = ffe0815bafd4dac7453759f2713562a5f4bef7a8 -SHA1 (patch-by) = b3863f34209f7df8a23959736c0bc4355e484009 -SHA1 (patch-bz) = 0b9fe777ce5d4ac3c4194ed3b81d4951877c2bda -SHA1 (patch-ca) = 1e83812ceef45c015335c2f023c4e5bae6963113 -SHA1 (patch-cb) = 870977a372b34eecc44f8e32449e8a2e008b35a1 -SHA1 (patch-cf) = 29a315c5b13b35dffaf2ff4aed31352d62b965a1 -SHA1 (patch-cg) = ee24b07059ec88469aa88331e01c69e27592053d -SHA1 (patch-ch) = 7d53f7f625366c64a4db7ffcb71e28e633231c61 -SHA1 (patch-ci) = bcb19cf571bfdf7b3c7e8eaa128bb0cf79254c04 diff --git a/devel/mit-pthreads/patches/patch-aa b/devel/mit-pthreads/patches/patch-aa deleted file mode 100644 index ecd6abc731d..00000000000 --- a/devel/mit-pthreads/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.8 1998/12/28 22:21:59 bad Exp $ - ---- stdlib/strtod.c.orig Mon Sep 25 09:30:57 1995 -+++ stdlib/strtod.c Sun Dec 27 23:39:16 1998 -@@ -93,12 +93,23 @@ - static char *rcsid = "$Id: patch-aa,v 1.8 1998/12/28 22:21:59 bad Exp $"; - #endif /* LIBC_SCCS and not lint */ - -+#ifndef __arm32__ - #include <endian.h> - #if BYTE_ORDER == BIG_ENDIAN - #define IEEE_BIG_ENDIAN 1 - #else - #define IEEE_LITTLE_ENDIAN 1 - #endif -+#endif -+ -+#ifdef __arm32__ -+/* -+ * Although the CPU is little endian the FP has different -+ * byte and word endianness. The byte order is still little endian -+ * but the word order is big endian. -+ */ -+#define IEEE_BIG_ENDIAN -+#endif - - #include <pthread/ac-types.h> - /* -@@ -222,7 +233,7 @@ - * An alternative that might be better on some machines is - * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff) - */ --#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) -+#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(__arm32__) - #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \ - ((unsigned short *)a)[0] = (unsigned short)c, a++) - #else diff --git a/devel/mit-pthreads/patches/patch-ab b/devel/mit-pthreads/patches/patch-ab deleted file mode 100644 index d731d7dbd2b..00000000000 --- a/devel/mit-pthreads/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/08/23 06:22:17 garbled Exp $ ---- stdio/vfprintf.c-orig Wed Oct 18 11:57:52 1995 -+++ stdio/vfprintf.c Sat Apr 18 18:20:10 1998 -@@ -730,7 +730,7 @@ - } else - *sign = '\000'; - /* #if !defined(__alpha__) && !defined(hpux) */ --#ifndef 0 -+#if !0 - digits = __dtoa(value, mode, ndigits, decpt, &dsgn, &rve); - #else - { char *ecvt(double,int,int*,int*); diff --git a/devel/mit-pthreads/patches/patch-ac b/devel/mit-pthreads/patches/patch-ac deleted file mode 100644 index 0dd376d6e1b..00000000000 --- a/devel/mit-pthreads/patches/patch-ac +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/08/23 06:22:17 garbled Exp $ ---- pthreads/process.c.orig Fri Jul 17 06:35:13 1998 -+++ pthreads/process.c Fri Jul 17 06:58:34 1998 -@@ -42,2 +42,4 @@ - -+extern void *alloca(); -+ - #ifndef lint diff --git a/devel/mit-pthreads/patches/patch-ad b/devel/mit-pthreads/patches/patch-ad deleted file mode 100644 index 0f3d5a5cf26..00000000000 --- a/devel/mit-pthreads/patches/patch-ad +++ /dev/null @@ -1,117 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1998/12/28 22:21:59 bad Exp $ - ---- /dev/null Sun Dec 27 17:07:36 1998 -+++ machdep/engine-alpha-netbsd-1.3.h Sun Dec 27 17:21:40 1998 -@@ -0,0 +1,112 @@ -+/* ==== 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 */ -+ -+/* The first machine dependent functions are the SEMAPHORES needing -+ the test and set instruction. -+ -+ On the Alpha, the actual values here are irrelevant; they just have -+ to be different. */ -+#define SEMAPHORE_CLEAR 0 -+#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"); \ -+ old == SEMAPHORE_CLEAR; }) -+ -+#define SEMAPHORE_RESET(lock) \ -+({ int *_sem_lock = (lock); \ -+ *_sem_lock = SEMAPHORE_CLEAR; \ -+ asm ("mb" : : : "memory"); }) -+#endif -+ -+/* -+ * 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; -+ unsigned long machdep_istate[11]; -+ unsigned long machdep_fstate[9]; -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+ { NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 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); \ -+} -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); -+ -+int __machdep_save_int_state __P_((unsigned long *)); -+void __machdep_restore_int_state __P_((unsigned long *)); -+void __machdep_save_fp_state __P_((unsigned long *)); -+void __machdep_restore_fp_state __P_((unsigned long *)); -+ -+#endif -+ -+__END_DECLS diff --git a/devel/mit-pthreads/patches/patch-ae b/devel/mit-pthreads/patches/patch-ae deleted file mode 100644 index 7b519e4e439..00000000000 --- a/devel/mit-pthreads/patches/patch-ae +++ /dev/null @@ -1,209 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1998/12/28 22:22:00 bad Exp $ - ---- /dev/null Sun Dec 27 17:45:54 1998 -+++ machdep/engine-alpha-netbsd-1.3.c Mon Mar 9 11:30:59 1998 -@@ -0,0 +1,204 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Description : Machine dependent functions for NetBSD/Alpha 1.1(+) -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * 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> -+#include <sys/syscall.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#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(); -+ } -+} -+ -+/* ========================================================================== -+ * 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(); -+ } -+} -+ -+/* ========================================================================== -+ * 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 (); -+ -+ /* 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(); -+} -+ -+/* ========================================================================== -+ * __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, -+ 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(). */ -+ machdep_pthread->machdep_istate[8/*ISTATE_RA*/] = 0; -+ machdep_pthread->machdep_istate[0/*ISTATE_PC*/] = (long)machdep_pthread_start; -+ machdep_pthread->machdep_istate[10/*ISTATE_PV*/] = (long)machdep_pthread_start; -+ -+ /* Alpha stack starts high and builds down. */ -+ { -+ long stk_addr = (long) machdep_pthread->machdep_stack; -+ stk_addr += stack_size - 1024; -+ stk_addr &= ~15; -+ machdep_pthread->machdep_istate[9/*ISTATE_SP*/] = stk_addr; -+ } -+} -+ -+int safe_store (loc, new) -+ 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; -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * 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_lseek() -+ */ -+off_t machdep_sys_lseek(int fd, off_t offset, int whence) -+{ -+ extern off_t __syscall(); -+ -+ return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdirentries() -+ */ -+machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} diff --git a/devel/mit-pthreads/patches/patch-af b/devel/mit-pthreads/patches/patch-af deleted file mode 100644 index 632318c8943..00000000000 --- a/devel/mit-pthreads/patches/patch-af +++ /dev/null @@ -1,233 +0,0 @@ -$NetBSD: patch-af,v 1.2 1998/12/28 22:22:00 bad Exp $ - ---- /dev/null Sun Dec 27 17:07:36 1998 -+++ machdep/syscall-alpha-netbsd-1.3.S Sun Dec 27 17:21:40 1998 -@@ -0,0 +1,228 @@ -+#include <machine/asm.h> -+#define CHMK() call_pal 0x83 -+#define COMPAT_43 -+#include <sys/syscall.h> -+#ifndef __CONCAT -+#include <sys/cdefs.h> -+#endif -+#define CONCAT __CONCAT -+ -+#undef SYSCALL -+ -+/* Kernel syscall interface: -+ Input: -+ v0 - system call number -+ a* - arguments, as in C -+ Output: -+ 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 -+ 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) \ -+ .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) -+ -+ .globl machdep_cerror -+machdep_cerror: -+ br t0, Lmachdep_cerror_setgp -+Lmachdep_cerror_setgp: -+ ldgp gp, 0(t0) -+ stl v0, errno -+#if 0 -+ ldiq v0, -1 -+#else -+ subq zero, v0, v0 -+#endif -+ RET -+ -+/* The fork system call is special... */ -+SYSCALL(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 -+ -+#ifndef SYS___sigsuspend14 -+/* The sigsuspend system call is special... */ -+ .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 -+#endif /* SYS_sigsuspend14 */ -+ -+#ifndef SYS___sigprocmask14 -+/* The sigprocmask system call is special... */ -+ .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 -+#endif /* SYS_sigprocmask14 */ -+ -+/* More stuff ... */ -+ .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 -+__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 -+__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 -+__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 -+machdep_sys_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 -+Lsys_noerr_fstat: -+ RET -+ .end machdep_sys_fstat diff --git a/devel/mit-pthreads/patches/patch-ag b/devel/mit-pthreads/patches/patch-ag deleted file mode 100644 index da52e589e5b..00000000000 --- a/devel/mit-pthreads/patches/patch-ag +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1998/12/28 22:22:00 bad Exp $ - ---- /dev/null Sun Dec 27 17:07:36 1998 -+++ machdep/syscall-template-alpha-netbsd-1.3.S Sun Dec 27 17:21:40 1998 -@@ -0,0 +1,53 @@ -+#include <machine/asm.h> -+#define COMPAT_43 -+#include <sys/syscall.h> -+#define CHMK() call_pal 0x83 -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#undef SYSCALL -+ -+/* Kernel syscall interface: -+ Input: -+ v0 - system call number -+ a* - arguments, as in C -+ Output: -+ 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 -+ 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) \ -+ .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 XSYSCALL(x) SIMPLE_SYSCALL(x) -+ -+XSYSCALL(SYSCALL_NAME) diff --git a/devel/mit-pthreads/patches/patch-ah b/devel/mit-pthreads/patches/patch-ah deleted file mode 100644 index 715801bfb7c..00000000000 --- a/devel/mit-pthreads/patches/patch-ah +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ah,v 1.5 1999/05/02 19:46:16 tron Exp $ - ---- config/Makefile.in.orig Fri Mar 22 05:29:54 1996 -+++ config/Makefile.in Sun May 2 21:19:49 1999 -@@ -18,8 +18,8 @@ - - # Standard bsd install rules look for the "install" program, rather than - # using some variable. So, hack things so that that install rule works. --BINGRP != echo " " `groups` " " | sed 's/ [0-9][0-9]* / /g' | awk '{print $$1}' --BINOWN != echo $${USER} -+#BINGRP != echo " " `groups` " " | sed 's/ [0-9][0-9]* / /g' | awk '{print $$1}' -+#BINOWN != echo $${USER} - LIBMODE = 644 # so ranlib can run! - - .include "config.flags" -@@ -29,7 +29,7 @@ - # pathname for srcdir here, and live with it. - srcdir = $(srctop) - --beforeinstall:: install-dirs -+beforeinstall: install-dirs - - .include "${srcdir}/pthreads/Makefile.inc" - .include "${srcdir}/stdlib/Makefile.inc" -@@ -38,6 +38,10 @@ - .include "${srcdir}/gen/Makefile.inc" - .include "${srcdir}/net/Makefile.inc" - .include "${srcdir}/scripts/Makefile.inc" -+ -+.if (${OBJECT_FMT} == "a.out") -+SOBJS+= /usr/lib/c++rt0.o -+.endif - - .include <bsd.lib.mk> - diff --git a/devel/mit-pthreads/patches/patch-ai b/devel/mit-pthreads/patches/patch-ai deleted file mode 100644 index ccf008d1f01..00000000000 --- a/devel/mit-pthreads/patches/patch-ai +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ai,v 1.1 1998/08/23 06:22:18 garbled Exp $ -*** machdep/engine-i386-netbsd-1.0.c 1997/10/13 10:50:59 1.1 ---- machdep/engine-i386-netbsd-1.0.c 1997/10/13 10:53:31 -*************** -*** 42,45 **** ---- 42,47 ---- - #endif - -+ -+ #include "config.h" - #include <sys/types.h> - #include <sys/socket.h> -*************** -*** 217,218 **** ---- 219,229 ---- - } - -+ #if defined(HAVE_SYSCALL_GETDENTS) -+ /* ========================================================================== -+ * machdep_sys_getdirentries() -+ */ -+ int machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+ { -+ return(machdep_sys_getdents(fd, buf, len)); -+ } -+ #endif diff --git a/devel/mit-pthreads/patches/patch-aj b/devel/mit-pthreads/patches/patch-aj deleted file mode 100644 index bfa8477d77c..00000000000 --- a/devel/mit-pthreads/patches/patch-aj +++ /dev/null @@ -1,146 +0,0 @@ -$NetBSD: patch-aj,v 1.10 2002/07/18 09:08:28 agc Exp $ - ---- config/configure 2002/07/18 08:54:37 1.1 -+++ config/configure 2002/07/18 08:54:54 -@@ -1049,6 +1049,17 @@ - name=$host_cpu-$host_os - - case $host in -+ alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[456789]*) -+ name=alpha-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+ alpha-*-netbsd1.3*) -+ name=alpha-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek pipe sigsuspend sigprocmask fstat" -+ ;; - alpha-*-netbsd1.1* | alpha-*-netbsd1.2*) - name=alpha-netbsd-1.1 - sysincludes=netbsd-1.1 -@@ -1062,12 +1073,29 @@ - CFLAGS="$CFLAGS -std" - fi - ;; -+ arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[456789]*) -+ name=arm32-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork pipe lseek ftruncate fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+ arm32-*-netbsd1.3*) -+ name=arm32-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork pipe lseek ftruncate sigsuspend sigprocmask fstat" -+ ;; - hppa1.1-*-hpux*) - name=hppa-hpux-9.03 - sysincludes=hpux-9.03 - # hpux-9.03.mk seems to be missing; what should this be? - except="fork" - ;; -+ powerpc-*-netbsd1.*) -+ name=powerpc-netbsd -+ sysincludes=netbsd-1.1 -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigprocmask sigaction sigsuspend" -+ ;; - sparc-*-sunos4.1.3* | sparc-*-sunos4.1.4*) - name=sparc-sunos-4.1.3 - sysincludes=sunos-4.1.3 -@@ -1092,6 +1120,17 @@ - EOF - - ;; -+ sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[456789]*) -+ name=sparc-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="pipe fork lseek ftruncate fstat" -+ available_syscalls="sigprocmask sigsuspend" -+ ;; -+ sparc-*-netbsd1.3*) -+ name=sparc-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="pipe fork lseek ftruncate sigprocmask sigsuspend fstat" -+ ;; - sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*) - name=sparc-sunos-4.1.3 - sysincludes=netbsd-1.0 -@@ -1112,6 +1151,17 @@ - syscall=i386-bsdi-2.0 - except="fork lseek sigsuspend" - ;; -+ i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[456789]*|i386-*-netbsdelf*) -+ name=i386-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigprocmask sigaction" -+ ;; -+ i386-*-netbsd1.3*) -+ name=i386-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek ftruncate pipe sigsuspend sigprocmask fstat" -+ ;; - i386-*-netbsd1.1* | i386-*-netbsd1.2*) - name=i386-netbsd-1.0 - sysincludes=netbsd-1.1 -@@ -1127,8 +1177,16 @@ - name=i386-netbsd-0.9 - sysincludes=netbsd-0.9 - ;; -- m68*-*-netbsd*) -+ m68*-*-netbsd1.3[H-Z]|m68*-*-netbsd1.[456789]*) - name=m68000-netbsd -+ sysincludes=netbsd-1.1 -+ except="lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+ m68*-*-netbsd1.3*) -+ name=m68000-netbsd -+ sysincludes=netbsd-1.1 -+ except="lseek ftruncate pipe fstat sigsuspend sigprocmask" - ;; - i386-*-freebsd2.*) - name=i386-freebsd-2.0 -@@ -1697,6 +1755,39 @@ - if test $pthreads_cv_timespec_in_time = yes ; then - cat >> confdefs.h <<\EOF - #define _OS_HAS_TIMESPEC 1 -+EOF -+ -+fi -+ -+echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -+if eval "test \"`echo '$''{'pthreads_cv_socklen_t'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 1678 "configure" -+#include "confdefs.h" -+#include <sys/types.h> -+#include <sys/socket.h> -+int main() { return 0; } -+int t() { -+socklen_t foo; -+; return 0; } -+EOF -+if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ pthreads_cv_socklen_t=yes -+else -+ rm -rf conftest* -+ pthreads_cv_socklen_t=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$pthreads_cv_socklen_t" 1>&6 -+if test $pthreads_cv_socklen_t = yes ; then -+ cat >> confdefs.h <<\EOF -+#define _OS_HAS_SOCKLEN_T 1 - EOF - - fi diff --git a/devel/mit-pthreads/patches/patch-ak b/devel/mit-pthreads/patches/patch-ak deleted file mode 100644 index 8337b584525..00000000000 --- a/devel/mit-pthreads/patches/patch-ak +++ /dev/null @@ -1,126 +0,0 @@ -$NetBSD: patch-ak,v 1.10 2002/07/18 09:08:28 agc Exp $ - ---- config/configure.in 2002/07/18 08:54:37 1.1 -+++ config/configure.in 2002/07/18 08:54:54 -@@ -124,6 +124,19 @@ - name=$host_cpu-$host_os - - case $host in -+changequote(,)dnl -+ alpha-*-netbsd1.3[H-Z]|alpha-*-netbsd1.[456789]*) -+ name=alpha-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+changequote([,])dnl -+ alpha-*-netbsd1.3*) -+ name=alpha-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek pipe sigsuspend sigprocmask fstat" -+ ;; - alpha-*-netbsd1.1* | alpha-*-netbsd1.2*) - name=alpha-netbsd-1.1 - sysincludes=netbsd-1.1 -@@ -137,6 +150,19 @@ - CFLAGS="$CFLAGS -std" - fi - ;; -+changequote(,)dnl -+ arm32-*-netbsd1.3[H-Z]|arm32-*-netbsd1.[456789]*) -+ name=arm32-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork pipe lseek ftruncate fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+changequote([,])dnl -+ arm32-*-netbsd1.3*) -+ name=arm32-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork pipe lseek ftruncate sigsuspend sigprocmask fstat" -+ ;; - hppa1.1-*-hpux*) - name=hppa-hpux-9.03 - sysincludes=hpux-9.03 -@@ -158,6 +184,24 @@ - AC_DEFINE(LD_LINKS_STATIC_DATA) - AC_DEFINE(BROKEN_SIGNALS) - ;; -+changequote(,)dnl -+ powerpc-*-netbsd1.*) -+ name=powerpc-netbsd -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigprocmask sigaction sigsuspend" -+ ;; -+ sparc-*-netbsd1.3[H-Z]|sparc-*-netbsd1.[456789]*) -+ name=sparc-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="pipe fork lseek ftruncate fstat" -+ available_syscalls="sigprocmask sigsuspend" -+ ;; -+changequote([,])dnl -+ sparc-*-netbsd1.3*) -+ name=sparc-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="pipe fork lseek ftruncate sigprocmask sigsuspend fstat" -+ ;; - sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*) - name=sparc-sunos-4.1.3 - sysincludes=netbsd-1.0 -@@ -178,6 +222,19 @@ - syscall=i386-bsdi-2.0 - except="fork lseek sigsuspend" - ;; -+changequote(,)dnl -+ i386-*-netbsd1.3[H-Z]|i386-*-netbsd1.[456789]*|i386-*-netbsdelf*) -+ name=i386-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigaction sigprocmask" -+ ;; -+changequote([,])dnl -+ i386-*-netbsd1.3*) -+ name=i386-netbsd-1.3 -+ sysincludes=netbsd-1.1 -+ except="fork lseek ftruncate pipe sigsuspend sigprocmask fstat" -+ ;; - i386-*-netbsd1.1* | i386-*-netbsd1.2*) - name=i386-netbsd-1.0 - sysincludes=netbsd-1.1 -@@ -193,8 +250,18 @@ - name=i386-netbsd-0.9 - sysincludes=netbsd-0.9 - ;; -- m68*-*-netbsd*) -+changequote(,)dnl -+ m68*-*-netbsd1.3[H-Z]|m68*-*-netbsd1.[456789]*) - name=m68000-netbsd -+ sysincludes=netbsd-1.1 -+ except="lseek ftruncate pipe fstat" -+ available_syscalls="sigsuspend sigprocmask" -+ ;; -+changequote([,])dnl -+ m68*-*-netbsd1.3*) -+ name=m68000-netbsd -+ sysincludes=netbsd-1.1 -+ except="lseek ftruncate pipe fstat sigsuspend sigprocmask" - ;; - i386-*-freebsd2.*) - name=i386-freebsd-2.0 -@@ -304,6 +371,16 @@ - AC_MSG_RESULT($pthreads_cv_timespec_in_time) - if test $pthreads_cv_timespec_in_time = yes ; then - AC_DEFINE(_OS_HAS_TIMESPEC) -+fi -+ -+dnl socklen_t -+AC_CACHE_VAL(pthreads_cv_socklen_t, -+ AC_TRY_COMPILE([#include <sys/types.h> -+#include <sys/socket.h>], [socklen_t foo;], -+ pthreads_cv_socklen_t=yes, pthreads_cv_socklen_t=no)) -+AC_MSG_RESULT($pthreads_cv_socklen_t) -+if test $pthreads_cv_socklen_t = yes ; then -+ AC_DEFINE(_OS_HAS_SOCKLEN_T) - fi - - diff --git a/devel/mit-pthreads/patches/patch-al b/devel/mit-pthreads/patches/patch-al deleted file mode 100644 index ff02bfe3d61..00000000000 --- a/devel/mit-pthreads/patches/patch-al +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-al,v 1.1 1998/08/23 06:22:18 garbled Exp $ -*** /dev/null Thu Jan 8 12:58:03 1998 ---- shlib_version Thu Jan 8 15:44:03 1998 -*************** -*** 0 **** ---- 1,2 ---- -+ major=1 -+ minor=60 diff --git a/devel/mit-pthreads/patches/patch-am b/devel/mit-pthreads/patches/patch-am deleted file mode 100644 index 678ec0cd55d..00000000000 --- a/devel/mit-pthreads/patches/patch-am +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-am,v 1.1 1998/08/23 06:22:18 garbled Exp $ ---- include/pthread/types.h.orig Sat Jul 18 06:02:08 1998 -+++ include/pthread/types.h Sat Jul 18 06:02:20 1998 -@@ -35,2 +35,12 @@ - -+#if defined(__STDC__) || defined(__GNUC__) -+#ifndef __P_ -+#define __P_(protos) protos -+#endif -+#else -+#ifndef __P_ -+#define __P_(protos) -+#endif -+#endif -+ - #endif /* pthread_types_h */ diff --git a/devel/mit-pthreads/patches/patch-an b/devel/mit-pthreads/patches/patch-an deleted file mode 100644 index a3978277a23..00000000000 --- a/devel/mit-pthreads/patches/patch-an +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-an,v 1.1 1998/12/28 22:22:00 bad Exp $ - ---- config/config.sub.orig Fri Jan 23 23:07:31 1998 -+++ config/config.sub Sun Oct 25 18:54:55 1998 -@@ -119,7 +119,7 @@ - case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. -- tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \ -+ tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | arm32 | pyramid \ - | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \ - | powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \ -@@ -133,7 +133,7 @@ - ;; - # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \ -- | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ -+ | sparc-* | ns32k-* | fx80-* | arm-* | arm32-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ - | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ diff --git a/devel/mit-pthreads/patches/patch-ap b/devel/mit-pthreads/patches/patch-ap deleted file mode 100644 index 53f7ed27a4b..00000000000 --- a/devel/mit-pthreads/patches/patch-ap +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ap,v 1.2 1998/12/28 23:31:37 bad Exp $ - ---- pthreads/fd.c.orig Sun Jul 7 05:58:47 1996 -+++ pthreads/fd.c Tue Dec 29 00:13:33 1998 -@@ -49,6 +49,7 @@ - #include <sys/stat.h> - #include <sys/uio.h> - #include <stdarg.h> -+#include <string.h> - #include <fcntl.h> - #include <errno.h> - #include <pthread/posix.h> -@@ -565,7 +566,7 @@ - */ - off_t lseek(int fd, off_t offset, int whence) - { -- int ret; -+ off_t ret; - - if ((ret = fd_lock(fd, FD_RDWR, NULL)) == OK) { - ret = fd_table[fd]->ops->seek(fd_table[fd]->fd, diff --git a/devel/mit-pthreads/patches/patch-aq b/devel/mit-pthreads/patches/patch-aq deleted file mode 100644 index 9f384f117dd..00000000000 --- a/devel/mit-pthreads/patches/patch-aq +++ /dev/null @@ -1,132 +0,0 @@ -$NetBSD: patch-aq,v 1.4 1999/04/08 19:40:45 bad Exp $ - ---- pthreads/fd_kern.c.orig Tue Oct 1 20:26:48 1996 -+++ pthreads/fd_kern.c Sat Mar 20 22:46:30 1999 -@@ -51,6 +51,7 @@ - #include <sys/time.h> - #include <sys/uio.h> - #include <stdarg.h> -+#include <string.h> - #include <signal.h> - #include <fcntl.h> - #include <errno.h> -@@ -582,6 +583,7 @@ - off_t __fd_kern_lseek(union fd_data fd_data, int f, off_t offset, int whence) - { - int fd = fd_data.i; -+ extern off_t machdep_sys_lseek(int, off_t, int); - - return(machdep_sys_lseek(fd, offset, whence)); - } -@@ -1076,7 +1078,11 @@ - /* ========================================================================== - * bind() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int bind(int fd, const struct sockaddr *name, socklen_t namelen) -+#else - int bind(int fd, const struct sockaddr *name, int namelen) -+#endif - { - /* Not much to do in bind */ - int ret; -@@ -1098,7 +1104,11 @@ - /* ========================================================================== - * connect() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int connect(int fd, const struct sockaddr *name, socklen_t namelen) -+#else - int connect(int fd, const struct sockaddr *name, int namelen) -+#endif - { - struct sockaddr tmpname; - int ret, tmpnamelen; -@@ -1146,7 +1156,11 @@ - /* ========================================================================== - * accept() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int accept(int fd, struct sockaddr *name, socklen_t *namelen) -+#else - int accept(int fd, struct sockaddr *name, int *namelen) -+#endif - { - int ret, fd_kern; - -@@ -1334,8 +1348,13 @@ - /* ========================================================================== - * sendto() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+ssize_t sendto(int fd, const void * msg, size_t len, int flags, -+ const struct sockaddr *to, socklen_t to_len) -+#else - ssize_t sendto(int fd, const void * msg, size_t len, int flags, - const struct sockaddr *to, int to_len) -+#endif - { - return(sendto_timedwait(fd, msg, len, flags, to, to_len, NULL)); - } -@@ -1560,8 +1579,13 @@ - /* ========================================================================== - * recvfrom() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+ssize_t recvfrom(int fd, void * buf, size_t len, int flags, -+ struct sockaddr * from, socklen_t * from_len) -+#else - ssize_t recvfrom(int fd, void * buf, size_t len, int flags, - struct sockaddr * from, int * from_len) -+#endif - { - return(recvfrom_timedwait(fd, buf, len, flags, from, from_len, NULL)); - } -@@ -1711,7 +1735,11 @@ - /* ========================================================================== - * setsockopt() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int setsockopt(int fd, int level, int optname, const void * optval, socklen_t optlen) -+#else - int setsockopt(int fd, int level, int optname, const void * optval, int optlen) -+#endif - { - int ret; - -@@ -1733,7 +1761,11 @@ - /* ========================================================================== - * getsockopt() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int getsockopt(int fd, int level, int optname, void * optval, socklen_t * optlen) -+#else - int getsockopt(int fd, int level, int optname, void * optval, int * optlen) -+#endif - { - int ret; - -@@ -1755,7 +1787,11 @@ - /* ========================================================================== - * getsockname() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int getsockname(int fd, struct sockaddr * name, socklen_t * naddrlen) -+#else - int getsockname(int fd, struct sockaddr * name, int * naddrlen) -+#endif - { - int ret; - -@@ -1777,7 +1813,11 @@ - /* ========================================================================== - * getpeername() - */ -+#ifdef _OS_HAS_SOCKLEN_T -+int getpeername(int fd, struct sockaddr * peer, socklen_t * paddrlen) -+#else - int getpeername(int fd, struct sockaddr * peer, int * paddrlen) -+#endif - { - int ret; - diff --git a/devel/mit-pthreads/patches/patch-ar b/devel/mit-pthreads/patches/patch-ar deleted file mode 100644 index 7379ee0e35b..00000000000 --- a/devel/mit-pthreads/patches/patch-ar +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ar,v 1.1 1998/12/28 22:22:01 bad Exp $ - ---- machdep/netbsd-1.1/__signal.h.orig Tue Apr 23 08:11:39 1996 -+++ machdep/netbsd-1.1/__signal.h Sat Oct 17 21:41:52 1998 -@@ -1,8 +1,20 @@ - #include <sys/signal.h> - -+#if NSIG <= 32 - #define __SIGEMPTYSET 0 - #define __SIGFILLSET 0xffffffff - #define __SIGADDSET(s, n) (*(s) |= 1 << ((n) - 1), 0) - #define __SIGDELSET(s, n) (*(s) &= ~(1 << ((n) - 1)), 0) - #define __SIGISMEMBER(s, n) ((*(s) & (1 << ((n) - 1))) != 0) - -+#else /* XXX Netbsd >= 1.3H */ -+#define __SIGEMPTYSET { 0, 0, 0, 0} -+#define __SIGFILLSET { 0xffffffff, 0xffffffff, \ -+ 0xffffffff, 0xffffffff } -+#define __SIGMASK(n) (1 << (((n) - 1) & 31)) -+#define __SIGWORD(n) (((n) - 1) >> 5) -+#define __SIGADDSET(s, n) ((s)->__bits[__SIGWORD(n)] |= __SIGMASK(n)) -+#define __SIGDELSET(s, n) ((s)->__bits[__SIGWORD(n)] &= ~__SIGMASK(n)) -+#define __SIGISMEMBER(s, n) (((s)->__bits[__SIGWORD(n)] & __SIGMASK(n)) != 0) -+ -+#endif diff --git a/devel/mit-pthreads/patches/patch-as b/devel/mit-pthreads/patches/patch-as deleted file mode 100644 index 5664bd31583..00000000000 --- a/devel/mit-pthreads/patches/patch-as +++ /dev/null @@ -1,111 +0,0 @@ -$NetBSD: patch-as,v 1.1 1998/12/28 22:22:01 bad Exp $ - ---- /dev/null Thu Oct 22 03:18:30 1998 -+++ machdep/engine-sparc-netbsd-1.3.h Thu Oct 22 18:29:44 1998 -@@ -0,0 +1,106 @@ -+/* ==== machdep.h ============================================================ -+ * Copyright (c) 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * engine-sparc-sunos-4.1.3.h,v 1.52.4.1 1995/12/13 05:42:33 proven Exp -+ * -+ */ -+ -+#include <unistd.h> -+#include <setjmp.h> -+#include <sys/time.h> -+#include <sys/cdefs.h> -+#include <sys/signal.h> /* for _NSIG */ -+ -+/* -+ * The first machine dependent functions are the SEMAPHORES -+ * needing the test and set instruction. -+ */ -+#define SEMAPHORE_CLEAR 0 -+#define SEMAPHORE_SET 0xff -+ -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+char *p = lock; \ -+long temp; \ -+ \ -+__asm__ volatile("ldstub %1,%0" \ -+ :"=r" (temp) \ -+ :"m" (*p) \ -+ :"memory"); \ -+temp; \ -+}) -+ -+#define SEMAPHORE_RESET(lock) \ -+{ \ -+__asm__ volatile("stb %1, %0" \ -+ :"=m" (*lock) \ -+ :"r" (SEMAPHORE_CLEAR) \ -+ :"memory"); \ -+} -+ -+/* -+ * New types -+ */ -+typedef char 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_state; -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } -+ -+/* -+ * Minimum stack size -+ */ -+#define PTHREAD_STACK_MIN 1024 -+ -+/* -+ * Some fd flag defines that are necessary to distinguish between posix -+ * behavior and bsd4.3 behavior. -+ */ -+#define __FD_NONBLOCK (O_NONBLOCK | O_NDELAY) -+ -+/* -+ * 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); \ -+} -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); -+ -+#endif -+ -+__END_DECLS diff --git a/devel/mit-pthreads/patches/patch-at b/devel/mit-pthreads/patches/patch-at deleted file mode 100644 index 1a50963143b..00000000000 --- a/devel/mit-pthreads/patches/patch-at +++ /dev/null @@ -1,237 +0,0 @@ -$NetBSD: patch-at,v 1.1 1998/12/28 22:22:01 bad Exp $ - ---- /dev/null Sun Oct 25 03:18:33 1998 -+++ machdep/engine-sparc-netbsd-1.3.c Sun Oct 25 18:26:20 1998 -@@ -0,0 +1,232 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Description : Machine dependent functions for SunOS-4.1.3 on sparc -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * 98/10/22 bad -+ * -update for fat sigset_t in NetBSD 1.3H -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "$Id: patch-at,v 1.1 1998/12/28 22:22:01 bad Exp $"; -+#endif -+ -+#include "config.h" -+#include <pthread.h> -+#include <stdlib.h> -+#include <errno.h> -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ /* Save register windows onto stackframe */ -+ __asm__ ("ta 3"); -+ -+ return(setjmp(pthread_run->machdep_data.machdep_state)); -+} -+ -+/* ========================================================================== -+ * machdep_restore_state() -+ */ -+void machdep_restore_state(void) -+{ -+ longjmp(pthread_run->machdep_data.machdep_state, 1); -+} -+/* ========================================================================== -+ * machdep_save_float_state() -+ */ -+void machdep_save_float_state(struct pthread * pthread) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_restore_float_state() -+ */ -+void machdep_restore_float_state(void) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * 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(); -+ } -+} -+ -+/* ========================================================================== -+ * 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 (); -+ -+ /* 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(); -+} -+ -+/* ========================================================================== -+ * __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, -+ 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; -+ -+ /* Save register windows onto stackframe */ -+ __asm__ ("ta 3"); -+ -+ setjmp(machdep_pthread->machdep_state); -+ /* -+ * Set up new stact frame so that it looks like it -+ * returned from a longjmp() to the beginning of -+ * machdep_pthread_start(). -+ */ -+ machdep_pthread->machdep_state[3] = (int)machdep_pthread_start; -+ machdep_pthread->machdep_state[4] = (int)machdep_pthread_start; -+ -+ /* Sparc stack starts high and builds down. */ -+ machdep_pthread->machdep_state[2] = -+ (int)machdep_pthread->machdep_stack + stack_size - 1024; -+ machdep_pthread->machdep_state[2] &= ~7; -+ -+} -+ -+#if defined(HAVE_SYSCALL_GETDENTS) -+/* ========================================================================== -+ * 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)); -+} -+#endif -+ -+/* ========================================================================== -+ * 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 pid, int * statusp, int options) -+{ -+ if (pid == -1) -+ pid = 0; -+ else if (pid == 0) -+ pid = - getpgrp (); -+ return machdep_sys_wait4 (pid, statusp, options, NULL); -+} -+ -+#if !defined(HAVE_SYSCALL_SIGPROCMASK) -+#if 0 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ * This isn't a real implementation; we can make the assumption that the -+ * pthreads library is not using oset, and that it is always blocking or -+ * unblocking all signals at once. -+ */ -+int machdep_sys_sigprocmask(int how, const sigset_t *set, sigset_t *oset) -+{ -+ switch(how) { -+ case SIG_BLOCK: -+ sigblock(*set); -+ break; -+ case SIG_UNBLOCK: -+ sigsetmask(~*set); -+ break; -+ case SIG_SETMASK: -+ sigsetmask(*set); -+ break; -+ default: -+ return -EINVAL; -+ } -+ return(OK); -+} -+ -+/* ========================================================================== -+ * sigaction() -+ * -+ * Temporary until I do machdep_sys_sigaction() -+ */ -+int sigaction(int sig, const struct sigaction *act, struct sigaction *oldact) -+{ -+ return(sigvec(sig, (struct sigvec *)act, (struct sigvec *)oldact)); -+} -+#endif -+#endif -+ -+#if !defined(HAVE_SYSCALL_GETDTABLESIZE) -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+machdep_sys_getdtablesize() -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+#endif diff --git a/devel/mit-pthreads/patches/patch-au b/devel/mit-pthreads/patches/patch-au deleted file mode 100644 index 8c678805ed8..00000000000 --- a/devel/mit-pthreads/patches/patch-au +++ /dev/null @@ -1,176 +0,0 @@ -$NetBSD: patch-au,v 1.3 2001/04/19 13:28:49 wiz Exp $ ---- machdep/syscall-sparc-netbsd-1.3.S.orig Thu Apr 12 06:57:19 2001 -+++ machdep/syscall-sparc-netbsd-1.3.S Thu Apr 12 07:15:26 2001 -@@ -0,0 +1,172 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1994 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ */ -+ -+#ifndef lint -+ .text -+ .asciz "$Id: patch-au,v 1.3 2001/04/19 13:28:49 wiz Exp $"; -+#endif -+ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#define SYSCALL(x) \ -+ .globl _C_LABEL(machdep_sys_##x); \ -+ \ -+_C_LABEL(machdep_sys_##x):; \ -+ \ -+ mov SYS_##x, %g1; \ -+ ta 0; \ -+ bcs,a 2b; \ -+ sub %r0,%o0,%o0; \ -+ retl -+ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 4 -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ sub %r0, %o0, %o0 -+2: -+ retl -+ nop -+ -+/* ========================================================================== -+ * machdep_sys_pipe() -+ */ -+ .globl _C_LABEL(machdep_sys_pipe) -+ -+_C_LABEL(machdep_sys_pipe): -+ mov %o0, %o2 -+ mov SYS_pipe, %g1 -+ ta 0 -+ bcs 1b -+ nop -+ st %o0, [ %o2 ] -+ st %o1, [ %o2 + 4 ] -+ retl -+ mov %g0, %o0 -+ -+/* ========================================================================== -+ * machdep_sys_fork() -+ */ -+ .globl _C_LABEL(machdep_sys_fork); -+ -+_C_LABEL(machdep_sys_fork):; -+ -+ mov SYS_fork, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ dec %o1; -+ retl; -+ and %o0, %o1, %o0; ! return 0 in child, pid in parent -+ -+#ifndef SYS___sigprocmask14 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ */ -+ .globl _C_LABEL(machdep_sys_sigprocmask); -+ -+_C_LABEL(machdep_sys_sigprocmask):; -+ -+ ld [%o1], %o1; -+ mov SYS_sigprocmask, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+#endif -+ -+#ifndef SYS___sigsuspend14 -+/* ========================================================================== -+ * machdep_sys_sigsuspend() -+ */ -+ .globl _C_LABEL(machdep_sys_sigsuspend); -+ -+_C_LABEL(machdep_sys_sigsuspend):; -+ -+ ld [%o0], %o0; -+ mov SYS_sigsuspend, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+#endif -+ -+/* ========================================================================== -+ * machdep_sys_fstat() -+ */ -+ .globl _C_LABEL(machdep_sys_fstat); -+ -+_C_LABEL(machdep_sys_fstat):; -+ -+ mov SYS___fstat13, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+ -+/* ========================================================================== -+ * machdep_sys___syscall() -+ */ -+_C_LABEL(machdep_sys___syscall):; -+ -+ mov SYS___syscall, %g1; -+ ta 0; -+ bcs 1b; -+ nop; -+ retl -+ nop -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+ .global _C_LABEL(machdep_sys_lseek) -+ -+_C_LABEL(machdep_sys_lseek): -+ save %sp,-112,%sp -+ mov %i1,%o4 -+ mov %i2,%o5 -+ st %i3,[%sp+92] -+ mov 0,%o0 -+ mov SYS_lseek,%o1 -+ mov %i0,%o2 -+ call _C_LABEL(machdep_sys___syscall),0 -+ mov 0,%o3 -+ mov %o0,%i0 -+ mov %o1,%i1 -+ ret -+ restore -+ -+/* ========================================================================== -+ * machdep_sys_ftruncate() -+ */ -+ .global _C_LABEL(machdep_sys_ftruncate) -+ -+_C_LABEL(machdep_sys_ftruncate): -+ save %sp,-104,%sp -+ mov %i1,%o4 -+ mov %i2,%o5 -+ mov 0,%o0 -+ mov SYS_ftruncate,%o1 -+ mov %i0,%o2 -+ call _C_LABEL(machdep_sys___syscall),0 -+ mov 0,%o3 -+ mov %o0,%o1 -+ sra %o0,31,%o0 -+ ret -+ restore %g0,%o1,%o0 diff --git a/devel/mit-pthreads/patches/patch-av b/devel/mit-pthreads/patches/patch-av deleted file mode 100644 index 9ca4ad70e65..00000000000 --- a/devel/mit-pthreads/patches/patch-av +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-av,v 1.3 2001/04/19 13:28:49 wiz Exp $ ---- machdep/syscall-template-sparc-netbsd-1.3.S.orig Thu Apr 12 06:57:20 2001 -+++ machdep/syscall-template-sparc-netbsd-1.3.S Thu Apr 12 07:20:31 2001 -@@ -0,0 +1,48 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1994 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ */ -+ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#define SYSCALL(x) \ -+ .globl _C_LABEL(machdep_sys_##x); \ -+ \ -+_C_LABEL(machdep_sys_##x):; \ -+ \ -+ mov SYS_##x, %g1; \ -+ ta 0; \ -+ bcs,a 2b; \ -+ sub %r0,%o0,%o0; \ -+ retl; \ -+ nop -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 4 -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ sub %r0, %o0, %o0 -+2: -+ retl -+ nop -+ -+#define XSYSCALL(NAME) SYSCALL(NAME) -+ -+XSYSCALL(SYSCALL_NAME) diff --git a/devel/mit-pthreads/patches/patch-aw b/devel/mit-pthreads/patches/patch-aw deleted file mode 100644 index 85bdcc3464e..00000000000 --- a/devel/mit-pthreads/patches/patch-aw +++ /dev/null @@ -1,230 +0,0 @@ -$NetBSD: patch-aw,v 1.1 1998/12/28 22:22:02 bad Exp $ - ---- /dev/null Sun Dec 27 17:45:54 1998 -+++ machdep/engine-i386-netbsd-1.3.c Mon Mar 2 19:44:34 1998 -@@ -0,0 +1,225 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Copyright (c) 1993 by Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by Chris Provenzano. -+ * 4. The name of Chris Provenzano may not be used to endorse or promote -+ * products derived from this software without specific prior written -+ * permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL CHRIS PROVENZANO BE LIABLE FOR ANY -+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * Description : Machine dependent functions for NetBSD on i386 -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "$Id: patch-aw,v 1.1 1998/12/28 22:22:02 bad Exp $"; -+#endif -+ -+#include <pthread.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <stdio.h> -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ return(_setjmp(pthread_run->machdep_data.machdep_state)); -+} -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_float_state(struct pthread * pthread) -+{ -+ char * fdata = (char *)pthread->machdep_data.machdep_float_state; -+ -+ __asm__ ("fsave %0"::"m" (*fdata)); -+} -+ -+/* ========================================================================== -+ * machdep_restore_state() -+ */ -+void machdep_restore_state(void) -+{ -+ _longjmp(pthread_run->machdep_data.machdep_state, 1); -+} -+ -+/* ========================================================================== -+ * machdep_restore_float_state() -+ */ -+int machdep_restore_float_state(void) -+{ -+ char * fdata = (char *)pthread_run->machdep_data.machdep_float_state; -+ -+ __asm__ ("frstor %0"::"m" (*fdata)); -+} -+ -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_unset_thread_timer() -+ */ -+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ struct itimerval zeroval = { { 0, 0 }, { 0, 0 } }; -+ int ret; -+ -+ if (machdep_pthread) { -+ ret = setitimer(ITIMER_VIRTUAL, &zeroval, -+ &(machdep_pthread->machdep_timer)); -+ } else { -+ ret = setitimer(ITIMER_VIRTUAL, &zeroval, NULL); -+ } -+ -+ if (ret) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * 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(); -+ -+ /* 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(); -+} -+ -+/* ========================================================================== -+ * __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, -+ 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; -+ -+ _setjmp(machdep_pthread->machdep_state); -+ /* -+ * Set up new stact frame so that it looks like it -+ * returned from a longjmp() to the beginning of -+ * machdep_pthread_start(). -+ */ -+ machdep_pthread->machdep_state[0] = (int)machdep_pthread_start; -+ -+ /* Stack starts high and builds down. */ -+ machdep_pthread->machdep_state[2] = -+ (int)machdep_pthread->machdep_stack + stack_size; -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * 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)); -+} diff --git a/devel/mit-pthreads/patches/patch-ax b/devel/mit-pthreads/patches/patch-ax deleted file mode 100644 index 6d5ba7c7c9f..00000000000 --- a/devel/mit-pthreads/patches/patch-ax +++ /dev/null @@ -1,103 +0,0 @@ -$NetBSD: patch-ax,v 1.1 1998/12/28 22:22:02 bad Exp $ - ---- /dev/null Sun Dec 27 17:07:36 1998 -+++ machdep/engine-i386-netbsd-1.3.h Sun Dec 27 17:21:41 1998 -@@ -0,0 +1,98 @@ -+/* ==== machdep.h ============================================================ -+ * Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu -+ * -+ * $Id: patch-ax,v 1.1 1998/12/28 22:22:02 bad Exp $ -+ * -+ */ -+ -+#include <unistd.h> -+#include <setjmp.h> -+#include <sys/time.h> -+#include <sys/signal.h> /* for _NSIG */ -+ -+/* -+ * The first machine dependent functions are the SEMAPHORES -+ * needing the test and set instruction. -+ */ -+#define SEMAPHORE_CLEAR 0 -+#define SEMAPHORE_SET 1 -+ -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+long temp = SEMAPHORE_SET; \ -+ \ -+__asm__ volatile ("xchgl %0,(%2)" \ -+ :"=r" (temp) \ -+ :"0" (temp),"r" (lock)); \ -+temp; \ -+}) -+ -+#define SEMAPHORE_RESET(lock) *lock = SEMAPHORE_CLEAR -+ -+/* -+ * New types -+ */ -+typedef long 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_state; -+ char machdep_float_state[108]; -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } -+ -+/* -+ * Minimum stack size -+ */ -+#define PTHREAD_STACK_MIN 1024 -+ -+/* -+ * 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); \ -+} -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); -+ -+#endif -+ -+__END_DECLS diff --git a/devel/mit-pthreads/patches/patch-ay b/devel/mit-pthreads/patches/patch-ay deleted file mode 100644 index caa1f28c4cd..00000000000 --- a/devel/mit-pthreads/patches/patch-ay +++ /dev/null @@ -1,205 +0,0 @@ -$NetBSD: patch-ay,v 1.1 1998/12/28 22:22:02 bad Exp $ - ---- /dev/null Sun Dec 27 17:07:36 1998 -+++ machdep/syscall-i386-netbsd-1.3.S Sun Dec 27 17:21:41 1998 -@@ -0,0 +1,200 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1990 The Regents of the University of California. -+ * Copyright (c) 1993 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ * This code is derived from software contributed to Berkeley by -+ * William Jolitz. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by the University of -+ * California, Berkeley and its contributors. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * Description : Machine dependent syscalls for i386/i486/i586 -+ * -+ * 1.00 93/08/26 proven -+ * -Started coding this file. -+ * -+ * 1.01 93/11/13 proven -+ * -The functions readv() and writev() added. -+ */ -+ -+#ifndef lint -+ .text -+ .asciz "$Id: patch-ay,v 1.1 1998/12/28 22:22:02 bad Exp $"; -+#endif -+ -+#if defined(SYSLIBC_SCCS) && !defined(lint) -+ .asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90" -+#endif /* SYSLIBC_SCCS and not lint */ -+ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 2 -+ -+ -+/* ========================================================================== -+ * machdep_sys_fork() -+ */ -+ .globl _machdep_sys_fork; -+ -+_machdep_sys_fork:; -+ -+ movl $(SYS_fork), %eax; -+ .byte 0x9a; .long 0; .word 7; -+ cmpl $0, %edx -+ je 2f -+ movl $0, %eax -+2: -+ ret; -+ -+/* ========================================================================== -+ * machdep_sys___syscall() -+ */ -+ -+_machdep_sys___syscall:; -+ -+ movl $(SYS___syscall), %eax; -+ int $0x80; -+ jb 3f; -+ ret -+ -+#ifndef SYS___sigsuspend14 -+/* ========================================================================== -+ * machdep_sys_sigsuspend() -+ */ -+ .globl _machdep_sys_sigsuspend; -+ -+_machdep_sys_sigsuspend:; -+ -+ movl 4(%esp),%eax # fetch mask arg -+ movl (%eax),%eax # indirect to mask arg -+ movl %eax,4(%esp) -+ movl $(SYS_sigsuspend), %eax; -+ int $0x80; -+ jb 3f; -+ ret -+#endif -+ -+3: -+ -+ neg %eax -+ movl $0xffffffff,%edx -+ ret -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+ .globl _machdep_sys_lseek; -+ -+_machdep_sys_lseek:; -+ -+ pushl %ebp; -+ movl %esp,%ebp; -+ pushl 0x14(%ebp); -+ pushl 0x10(%ebp); -+ pushl 0xc(%ebp); -+ pushl $0x0; -+ pushl 0x8(%ebp); -+ pushl $0x0; -+ pushl $(SYS_lseek); -+ call _machdep_sys___syscall; -+ leave -+ ret -+ -+/* ========================================================================== -+ * machdep_sys_ftruncate() ; Added by Monty -+ */ -+ .globl _machdep_sys_ftruncate; -+ -+_machdep_sys_ftruncate:; -+ -+ pushl %ebp; -+ movl %esp,%ebp; -+ pushl 0x10(%ebp); -+ pushl 0xc(%ebp); -+ pushl $0x0; # Why this? -+ pushl 0x8(%ebp); -+ pushl $0x0; # And this? -+ pushl $(SYS_ftruncate); -+ call _machdep_sys___syscall; -+ leave -+ ret -+ -+#ifndef SYS___sigprocmask14 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ */ -+ .globl _machdep_sys_sigprocmask; -+ -+_machdep_sys_sigprocmask:; -+ -+ movl 8(%esp),%ecx -+ movl (%ecx),%ecx -+ movl %ecx,8(%esp) -+ movl $(SYS_sigprocmask), %eax; -+ int $0x80; -+ jb 3b; -+ ret -+#endif -+ -+/* ========================================================================== -+ * machdep_sys_pipe() -+ */ -+ .globl _machdep_sys_pipe; -+ -+_machdep_sys_pipe:; -+ -+ movl $(SYS_pipe), %eax; -+ int $0x80; -+ jb 3b; -+ movl 4(%esp),%ecx -+ movl %eax,(%ecx) -+ movl %edx,4(%ecx) -+ xorl %eax,%eax -+ ret -+ -+/* ========================================================================== -+ * machdep_sys_fstat() -+ */ -+ .globl _machdep_sys_fstat; -+ -+_machdep_sys_fstat:; -+ movl $(SYS___fstat13), %eax; -+ int $0x80; -+ jb 4f; -+ ret -+4: -+ neg %eax -+ movl $0xffffffff,%edx -+ ret -+ diff --git a/devel/mit-pthreads/patches/patch-az b/devel/mit-pthreads/patches/patch-az deleted file mode 100644 index ebff9024742..00000000000 --- a/devel/mit-pthreads/patches/patch-az +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-az,v 1.1 1998/12/28 22:22:03 bad Exp $ - ---- /dev/null Sun Dec 27 17:07:36 1998 -+++ machdep/syscall-template-i386-netbsd-1.3.S Sun Dec 27 17:21:41 1998 -@@ -0,0 +1,56 @@ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#ifdef __STDC__ -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_##x; \ -+ \ -+_machdep_sys_##x:; \ -+ \ -+ movl $(SYS_##x), %eax; \ -+ int $0x80; \ -+ jb 1b; \ -+ ret; -+ -+#else -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_/**/x; \ -+ \ -+_machdep_sys_/**/x:; \ -+ \ -+ movl $(SYS_/**/x), %eax; \ -+ int $0x80; \ -+ jb 1b; \ -+ ret; -+ -+#endif -+ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 2 -+ -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ neg %eax -+ ret -+ -+#define XSYSCALL(NAME) SYSCALL(NAME) -+ -+XSYSCALL(SYSCALL_NAME) diff --git a/devel/mit-pthreads/patches/patch-ba b/devel/mit-pthreads/patches/patch-ba deleted file mode 100644 index c3cb5c8c1b9..00000000000 --- a/devel/mit-pthreads/patches/patch-ba +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-ba,v 1.1 1998/12/28 22:22:03 bad Exp $ - ---- /dev/null Thu Oct 22 03:18:30 1998 -+++ machdep/engine-arm32-netbsd-1.3.h Thu Oct 22 19:39:30 1998 -@@ -0,0 +1,102 @@ -+/* ==== machdep.h ============================================================ -+ * Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Id: engine-i386-netbsd-1.3.h,v 1.1 1998/02/28 04:53:15 cjs Exp -+ * -+ */ -+ -+#include <unistd.h> -+#include <setjmp.h> -+#include <sys/time.h> -+#include <sys/signal.h> /* for _NSIG */ -+ -+/* -+ * The first machine dependent functions are the SEMAPHORES -+ * needing the test and set instruction. -+ */ -+#define SEMAPHORE_CLEAR 0 -+#define SEMAPHORE_SET 1 -+ -+#if 0 -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+long temp = SEMAPHORE_SET; \ -+ \ -+__asm__ volatile ("xchgl %0,(%2)" \ -+ :"=r" (temp) \ -+ :"0" (temp),"r" (lock)); \ -+temp; \ -+}) -+ -+#define SEMAPHORE_RESET(lock) *lock = SEMAPHORE_CLEAR -+#endif -+ -+/* -+ * New types -+ */ -+typedef long 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_state; -+#if 0 -+ char machdep_float_state[108]; -+#endif -+}; -+ -+/* -+ * Static machdep_pthread initialization values. -+ * For initial thread only. -+ */ -+#define MACHDEP_PTHREAD_INIT \ -+{ NULL, NULL, NULL, { { 0, 0 }, { 0, 100000 } }, 0 } -+ -+/* -+ * Minimum stack size -+ */ -+#define PTHREAD_STACK_MIN 1024 -+ -+/* -+ * 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); \ -+} -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); -+ -+#endif -+ -+__END_DECLS diff --git a/devel/mit-pthreads/patches/patch-bb b/devel/mit-pthreads/patches/patch-bb deleted file mode 100644 index 40e27718987..00000000000 --- a/devel/mit-pthreads/patches/patch-bb +++ /dev/null @@ -1,208 +0,0 @@ -$NetBSD: patch-bb,v 1.2 1999/02/03 22:18:39 bad Exp $ - ---- /dev/null Wed Feb 3 11:06:48 1999 -+++ machdep/engine-arm32-netbsd-1.3.c Wed Feb 3 22:33:58 1999 -@@ -0,0 +1,203 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Description : Machine dependent functions for NetBSD on arm32 -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * 98/10/22 bad -+ * -adapt from i386 version -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "$Id: patch-bb,v 1.2 1999/02/03 22:18:39 bad 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> -+ -+#if defined(_JB_REG_R13) -+#define REG_LR _JB_REG_R14 -+#define REG_SP _JB_REG_R13 -+#else -+#define REG_LR JMPBUF_REG_R14 -+#define REG_SP JMPBUF_REG_R13 -+#endif -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ return(_setjmp(pthread_run->machdep_data.machdep_state)); -+} -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_float_state(struct pthread * pthread) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_restore_state() -+ */ -+void machdep_restore_state(void) -+{ -+ _longjmp(pthread_run->machdep_data.machdep_state, 1); -+} -+ -+/* ========================================================================== -+ * machdep_restore_float_state() -+ */ -+int machdep_restore_float_state(void) -+{ -+ return; -+} -+ -+/* ========================================================================== -+ * machdep_set_thread_timer() -+ */ -+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_unset_thread_timer() -+ */ -+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread) -+{ -+ struct itimerval zeroval = { { 0, 0 }, { 0, 0 } }; -+ int ret; -+ -+ if (machdep_pthread) { -+ ret = setitimer(ITIMER_VIRTUAL, &zeroval, -+ &(machdep_pthread->machdep_timer)); -+ } else { -+ ret = setitimer(ITIMER_VIRTUAL, &zeroval, NULL); -+ } -+ -+ if (ret) { -+ PANIC(); -+ } -+} -+ -+/* ========================================================================== -+ * 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(); -+ -+ /* 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(); -+} -+ -+/* ========================================================================== -+ * __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, -+ 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; -+ -+ _setjmp(machdep_pthread->machdep_state); -+ /* -+ * Set up new stact frame so that it looks like it -+ * returned from a longjmp() to the beginning of -+ * machdep_pthread_start(). -+ */ -+ machdep_pthread->machdep_state[REG_LR] = (int)machdep_pthread_start; -+ -+ /* Stack starts high and builds down. */ -+ machdep_pthread->machdep_state[REG_SP] = -+ (int)machdep_pthread->machdep_stack + stack_size; -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * 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)); -+} diff --git a/devel/mit-pthreads/patches/patch-bc b/devel/mit-pthreads/patches/patch-bc deleted file mode 100644 index 1a1415063d4..00000000000 --- a/devel/mit-pthreads/patches/patch-bc +++ /dev/null @@ -1,198 +0,0 @@ -$NetBSD: patch-bc,v 1.1 1998/12/28 22:22:03 bad Exp $ - ---- /dev/null Sun Oct 25 03:15:17 1998 -+++ machdep/syscall-arm32-netbsd-1.3.S Sun Oct 25 18:49:24 1998 -@@ -0,0 +1,193 @@ -+/* ==== syscall.S ============================================================ -+ * Copyright (c) 1990 The Regents of the University of California. -+ * Copyright (c) 1993 Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ * This code is derived from software contributed to Berkeley by -+ * William Jolitz. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by the University of -+ * California, Berkeley and its contributors. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * Description : Machine dependent syscalls for i386/i486/i586 -+ * -+ * 1.00 93/08/26 proven -+ * -Started coding this file. -+ * -+ * 1.01 93/11/13 proven -+ * -The functions readv() and writev() added. -+ */ -+ -+#ifndef lint -+ .text -+ .asciz "$Id: patch-bc,v 1.1 1998/12/28 22:22:03 bad Exp $"; -+#endif -+ -+#if defined(SYSLIBC_SCCS) && !defined(lint) -+ .asciz "@(#)syscall.s 5.1 (Berkeley) 4/23/90" -+#endif /* SYSLIBC_SCCS and not lint */ -+ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 0 -+ -+ -+/* ========================================================================== -+ * machdep_sys_fork() -+ */ -+ .globl _machdep_sys_fork; -+ -+_machdep_sys_fork:; -+ -+ swi SYS_fork -+ bcs 1f -+ sub r1, r1, #0x00000001 -+ and r0, r0, r1 -+ mov r15, r14 -+ -+ -+ -+/* ========================================================================== -+ * machdep_sys_fstat() -+ */ -+ .globl _machdep_sys_fstat; -+ -+_machdep_sys_fstat:; -+ -+ swi SYS___fstat13 -+ bcs 1f -+ mov r15, r14 -+ -+/* ========================================================================== -+ * machdep_sys___syscall() -+ */ -+ -+_machdep_sys___syscall:; -+ -+ swi SYS___syscall -+ bcs 1f -+ mov r15, r14 -+ -+ -+#ifndef SYS___sigsuspend14 -+/* ========================================================================== -+ * machdep_sys_sigsuspend() -+ */ -+ .globl _machdep_sys_sigsuspend; -+ -+_machdep_sys_sigsuspend:; -+ -+ ldr r0, [r0] -+ swi SYS_sigsuspend -+ bcs 1f -+ mov r0, #0x00000000 -+ mov r15, r14 -+ -+#endif -+ -+#ifndef SYS___sigprocmask14 -+/* ========================================================================== -+ * machdep_sys_sigprocmask() -+ */ -+ .globl _machdep_sys_sigprocmask; -+ -+_machdep_sys_sigprocmask:; -+ -+ teq r1, #0x00000000 -+ moveq r0, #0x00000001 -+ moveq r1, #0x00000000 -+ ldrne r1, [r1] -+ swi SYS_sigprocmask -+ bcs 1f -+ teq r2, #0x00000000 -+ strne r0, [r2] -+ mov r0, #0x00000000 -+ mov r15, r14 -+#endif -+ -+/* ========================================================================== -+ * machdep_sys_ftruncate() -+ */ -+ .global _machdep_sys_ftruncate -+_machdep_sys_ftruncate: -+ mov r12, r13 -+ stmfd r13!, {r11, r12, r14, r15} -+ sub r13, r13, #8 -+ stmia r13, {r1-r2} -+ mov r3, #0 -+ sub r11, r12, #4 -+ mov r2, r0 -+ mov r1, #0 -+ mov r0, #201 -+ bl _machdep_sys___syscall -+ ldmea r11, {r11, r13, r15} -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+ .global _machdep_sys_lseek -+ -+_machdep_sys_lseek: -+ mov r12, r13 -+ stmfd r13!, {r11, r12, r14, r15} -+ str r3, [r13, #-4]! -+ sub r13, r13, #8 -+ stmia r13, {r1-r2} -+ sub r11, r12, #4 -+ mov r3, #0 -+ mov r2, r0 -+ mov r1, #0 -+ mov r0, #SYS_lseek -+ bl _machdep_sys___syscall -+ ldmea r11, {r11, r13, r15} -+ -+/* ========================================================================== -+ * machdep_sys_pipe() -+ */ -+ .globl _machdep_sys_pipe; -+ -+_machdep_sys_pipe:; -+ -+ mov r2, r0 -+ swi SYS_pipe -+ bcs 1f -+ str r0, [r2, #0x0000] -+ str r1, [r2, #0x0004] -+ mov r0, #0x00000000 -+ mov r15, r14 -+ -+ -+1: -+ rsb r0, r0, #0x00000000 -+ mvn r1, #0x00000000 -+ mov r15, r14 diff --git a/devel/mit-pthreads/patches/patch-bd b/devel/mit-pthreads/patches/patch-bd deleted file mode 100644 index 56b3456b06b..00000000000 --- a/devel/mit-pthreads/patches/patch-bd +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-bd,v 1.1 1998/12/28 22:22:04 bad Exp $ - ---- /dev/null Sun Oct 25 20:12:14 1998 -+++ machdep/syscall-template-arm32-netbsd-1.3.S Sun Oct 25 20:18:57 1998 -@@ -0,0 +1,55 @@ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+#ifdef __STDC__ -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_##x; \ -+ \ -+_machdep_sys_##x:; \ -+ \ -+ swi SYS_##x; \ -+ bcs 1b; \ -+ mov r15, r14; -+ -+#else -+ -+#define SYSCALL(x) \ -+ .globl _machdep_sys_/**/x; \ -+ \ -+_machdep_sys_/**/x:; \ -+ \ -+ swi SYS_/**/x; \ -+ bcs 1b; \ -+ mov r15, r14; -+ -+#endif -+ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .align 0 -+ -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+1: -+ rsb r0, r0, #0x00000000 -+ mvn r1, #0x00000000 -+ mov r15, r14 -+ -+#define XSYSCALL(NAME) SYSCALL(NAME) -+ -+XSYSCALL(SYSCALL_NAME) diff --git a/devel/mit-pthreads/patches/patch-be b/devel/mit-pthreads/patches/patch-be deleted file mode 100644 index 5994a81c2f0..00000000000 --- a/devel/mit-pthreads/patches/patch-be +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-be,v 1.1 1998/12/28 23:31:37 bad Exp $ - ---- pthreads/specific.c.orig Sat Dec 10 20:32:15 1994 -+++ pthreads/specific.c Tue Dec 29 00:16:06 1998 -@@ -42,6 +42,7 @@ - #include <errno.h> - #include <pthread.h> - #include <stdlib.h> -+#include <string.h> - - static struct pthread_key key_table[PTHREAD_DATAKEYS_MAX]; - static pthread_mutex_t key_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/devel/mit-pthreads/patches/patch-bf b/devel/mit-pthreads/patches/patch-bf deleted file mode 100644 index 2d917ff4926..00000000000 --- a/devel/mit-pthreads/patches/patch-bf +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bf,v 1.1 1998/12/28 23:31:37 bad Exp $ - ---- tests/test_sock_2.c.orig Tue Dec 29 00:22:23 1998 -+++ tests/test_sock_2.c Tue Dec 29 00:21:53 1998 -@@ -10,6 +10,7 @@ - #include <pthread.h> - #include <errno.h> - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/devel/mit-pthreads/patches/patch-bg b/devel/mit-pthreads/patches/patch-bg deleted file mode 100644 index 5490d97883b..00000000000 --- a/devel/mit-pthreads/patches/patch-bg +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-bg,v 1.2 1999/04/29 17:03:38 bad Exp $ - ---- scripts/pgcc.sh.orig Fri Sep 1 00:43:39 1995 -+++ scripts/pgcc.sh Thu Apr 29 19:00:46 1999 -@@ -7,6 +7,7 @@ - include_dir='-I$pthreads_root/include' - lib_dir='-L$pthreads_root/lib' - libs='-lpthread -lm -lgcc -lpthread' -+ldrun='-Wl,-R$pthreads_root/lib' - - # Might be a good idea to also provide a way to override pthreads_root - # so that we can use this script in the build tree, before installation. -@@ -23,10 +24,10 @@ - for arg in "$@" ; do - case $arg in - -nostdinc) include_dir= ;; -- -nostdlib | -c) libs= ;; -+ -nostdlib | -c | -E | -M | -S) libs= ldrun= ;; - esac - done - - # 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 $libs -+eval exec COMPILER '"$@"' $include_dir $lib_dir $ldrun $libs diff --git a/devel/mit-pthreads/patches/patch-bh b/devel/mit-pthreads/patches/patch-bh deleted file mode 100644 index 5824730185b..00000000000 --- a/devel/mit-pthreads/patches/patch-bh +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bh,v 1.2 1999/04/08 19:41:56 bad Exp $ - ---- machdep/netbsd-1.1/__string.h.orig Tue Apr 23 08:11:48 1996 -+++ machdep/netbsd-1.1/__string.h Thu Apr 8 20:34:40 1999 -@@ -1,4 +1,5 @@ - -+#include <sys/types.h> - #include <machine/ansi.h> - #ifdef _BSD_SIZE_T_ - typedef _BSD_SIZE_T_ size_t; -@@ -14,7 +15,7 @@ - char *index __P((const char *, int)); - char *rindex __P((const char *, int)); - char *strdup __P((const char *)); --void strmode __P((int, char *)); -+void strmode __P((mode_t, char *)); - char *strsep __P((char **, const char *)); - __END_DECLS - #endif diff --git a/devel/mit-pthreads/patches/patch-bi b/devel/mit-pthreads/patches/patch-bi deleted file mode 100644 index 50b0c057620..00000000000 --- a/devel/mit-pthreads/patches/patch-bi +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bi,v 1.1 1999/04/08 19:44:36 bad Exp $ - ---- config/config.h.in.orig Fri Mar 22 05:30:04 1996 -+++ config/config.h.in Sat Mar 20 22:22:28 1999 -@@ -15,6 +15,9 @@ - /* Does the OS already support struct timespec */ - #undef _OS_HAS_TIMESPEC - -+/* Does the OS need socklen_t for the socket syscalls? */ -+#undef _OS_HAS_SOCKLEN_T -+ - /* For networking code: an integral type the size of an IP address (4 - octets). Determined by examining return values from certain - functions. */ diff --git a/devel/mit-pthreads/patches/patch-bj b/devel/mit-pthreads/patches/patch-bj deleted file mode 100644 index 90f55708693..00000000000 --- a/devel/mit-pthreads/patches/patch-bj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bj,v 1.1 1999/04/29 17:05:49 bad Exp $ - ---- include/unistd.h.orig Thu Apr 25 05:17:47 1996 -+++ include/unistd.h Thu Apr 29 18:49:31 1999 -@@ -176,6 +176,11 @@ - unsigned ualarm __P((unsigned, unsigned)); - void usleep __P((unsigned)); - int vfork __P((void)); -+int getopt __P((int, char * const *, const char *)); -+extern char *optarg; /* getopt(3) external variables */ -+extern int opterr; -+extern int optind; -+extern int optopt; - - #endif /* !_POSIX_SOURCE */ - __END_DECLS diff --git a/devel/mit-pthreads/patches/patch-bk b/devel/mit-pthreads/patches/patch-bk deleted file mode 100644 index be900ce7561..00000000000 --- a/devel/mit-pthreads/patches/patch-bk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bk,v 1.1 1999/05/18 14:55:48 bad Exp $ - ---- net/getprotoent.c.orig Fri Feb 9 06:39:41 1996 -+++ net/getprotoent.c Tue May 18 16:45:09 1999 -@@ -128,8 +128,8 @@ - if (p != NULL) - *p++ = '\0'; - } -- if (p && *p); -- break; -+ if (p && *p) -+ break; - } - *alias = NULL; - pthread_mutex_unlock(&proto_file_lock); diff --git a/devel/mit-pthreads/patches/patch-bl b/devel/mit-pthreads/patches/patch-bl deleted file mode 100644 index 9694728ec49..00000000000 --- a/devel/mit-pthreads/patches/patch-bl +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-bl,v 1.1 1999/07/29 16:44:43 bad Exp $ - ---- machdep/engine-m68000-netbsd.h.orig Tue Nov 8 16:39:15 1994 -+++ machdep/engine-m68000-netbsd.h Wed Jul 7 04:29:09 1999 -@@ -3,6 +3,9 @@ - * - * $Id: patch-bl,v 1.1 1999/07/29 16:44:43 bad Exp $ - * -+ * m68k work by Andy Finnell <andyf@vei.net> based off work by -+ * David Leonard and Chris Provenzano. -+ * - */ - - #include <unistd.h> -@@ -16,14 +19,14 @@ - #define SEMAPHORE_CLEAR 0 - #define SEMAPHORE_SET 0x80; - --#define SEMAPHORE_TEST_AND_SET(lock) \ --({ \ --volatile long temp = SEMAPHORE_CLEAR; \ -- \ --__asm__ volatile("tas (%2); bpl 0f; movl #1,%0; 0:" \ -- :"=r" (temp) \ -- :"0" (temp),"r" (lock)); \ --temp; \ -+#define SEMAPHORE_TEST_AND_SET(lock) \ -+({ \ -+ volatile long temp = SEMAPHORE_CLEAR; \ -+ __asm__ volatile( \ -+ "tas %2; bpl 0f; movl #1,%0; 0:" \ -+ :"=r" (temp) \ -+ :"0" (temp),"m" (*lock)); \ -+ temp; \ - }) - - #define SEMAPHORE_RESET(lock) *lock = SEMAPHORE_CLEAR -@@ -48,6 +51,7 @@ - void *machdep_stack; - struct itimerval machdep_timer; - jmp_buf machdep_state; -+ char machdep_fstate[92]; - }; - - /* -@@ -56,6 +60,12 @@ - #define PTHREAD_STACK_MIN 1024 - - /* -+ * Some fd flag defines that are necessary to distinguish between posix -+ * behavior and bsd4.3 behavior. -+ */ -+#define __FD_NONBLOCK O_NONBLOCK -+ -+/* - * Static machdep_pthread initialization values. - * For initial thread only. - */ -@@ -70,7 +80,27 @@ - - #if defined(PTHREAD_KERNEL) - --int machdep_save_state __P((void)); -+ -+#ifndef __machdep_stack_get -+#define __machdep_stack_get(x) (x)->machdep_stack -+#endif -+#ifndef __machdep_stack_set -+#define __machdep_stack_set(x, y) (x)->machdep_stack = y -+#endif -+#ifndef __machdep_stack_repl -+#define __machdep_stack_repl(x, y) \ -+{ \ -+ if (stack = __machdep_stack_get(x)) { \ -+ __machdep_stack_free(stack); \ -+ } \ -+ __machdep_stack_set(x, y); \ -+} -+#endif -+ -+void * __machdep_stack_alloc __P_((size_t)); -+void __machdep_stack_free __P_((void *)); -+ -+int machdep_save_state __P_((void)); - - #endif - diff --git a/devel/mit-pthreads/patches/patch-bm b/devel/mit-pthreads/patches/patch-bm deleted file mode 100644 index 43053463c1f..00000000000 --- a/devel/mit-pthreads/patches/patch-bm +++ /dev/null @@ -1,260 +0,0 @@ -$NetBSD: patch-bm,v 1.3 2002/04/11 15:43:37 fredb Exp $ - ---- machdep/engine-m68000-netbsd.c.orig Thu Apr 11 09:25:42 2002 -+++ machdep/engine-m68000-netbsd.c Thu Apr 11 09:12:40 2002 -@@ -0,0 +1,255 @@ -+/* ==== machdep.c ============================================================ -+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu -+ * -+ * Copyright (c) 1993 by Chris Provenzano, proven@mit.edu -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by Chris Provenzano. -+ * 4. The name of Chris Provenzano may not be used to endorse or promote -+ * products derived from this software without specific prior written -+ * permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL CHRIS PROVENZANO BE LIABLE FOR ANY -+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * Description : Machine dependent functions for NetBSD on i386 -+ * -+ * 1.00 93/08/04 proven -+ * -Started coding this file. -+ * -+ * m68k work from David Leonard <david.leonard@it.uq.edu.au>. -+ * updated and NetBSD/m68k work from Andy Finnell <andyf@vei.net>. -+ * -+ */ -+ -+#ifndef lint -+static const char rcsid[] = "$Id: patch-bm,v 1.3 2002/04/11 15:43:37 fredb Exp $"; -+#endif -+ -+#include "pthread.h" -+#include <sys/syscall.h> -+#include <sys/stat.h> -+ -+/* ========================================================================== -+ * machdep_save_state() -+ */ -+int machdep_save_state(void) -+{ -+ return( _setjmp(pthread_run->machdep_data.machdep_state) ); -+} -+ -+/* ========================================================================== -+ * machdep_restore_state() -+ */ -+void machdep_restore_state(void) -+{ -+ _longjmp(pthread_run->machdep_data.machdep_state, 1); -+} -+ -+/* ========================================================================== -+ * machdep_save_float_state() -+ */ -+void machdep_save_float_state(struct pthread * pthread) -+{ -+ char * fdata = pthread->machdep_data.machdep_fstate; -+ -+ __asm__ ( "fmovem %%fp0-%%fp7,%0"::"m" (*fdata) ); -+ __asm__ ( "fmovem %%fpcr/%%fpsr/%%fpi,%0"::"m" (fdata[80]) ); -+} -+ -+/* ========================================================================== -+ * machdep_restore_float_state() -+ */ -+void machdep_restore_float_state(void) -+{ -+ 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(); -+ } -+} -+ -+/* ========================================================================== -+ * 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(); -+ } -+} -+ -+/* ========================================================================== -+ * __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() -+ */ -+void machdep_pthread_start(void) -+{ -+ context_switch_done(); -+ pthread_sched_resume(); -+ -+ /* Run current thread's start routine with argument */ -+ pthread_exit( -+ pthread_run->machdep_data.start_routine( -+ pthread_run->machdep_data.start_argument -+ ) -+ ); -+ -+ /* should never reach here */ -+ PANIC(); -+} -+ -+/* ========================================================================== -+ * __machdep_pthread_create() -+ */ -+void __machdep_pthread_create(struct machdep_pthread *machdep_pthread, -+ void *(* start_routine)(), 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; -+ -+ _setjmp(machdep_pthread->machdep_state); -+ /* -+ * Set up new stack frame so that it looks like it -+ * returned from a longjmp() to the beginning of -+ * machdep_pthread_start(). -+ * -+ * state is the set_jmp structure, which for m68k is: -+ * long onstack_flag; // [0] -+ * long sigmask; // [1] -+ * long sp; // [2] -+ * long fp; // [3] -+ * long ap; // [4] -+ * long pc; // [5] -+ * long ps; // [6] -+ * long regs[10]; // non scratch registers -+ */ -+ machdep_pthread->machdep_state[5] = (long)machdep_pthread_start; -+ -+ /* Stack starts high and builds down. */ -+ machdep_pthread->machdep_state[2] = -+ (int)machdep_pthread->machdep_stack + stack_size; -+} -+ -+/* ========================================================================== -+ * 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() -+ */ -+off_t machdep_sys_lseek(int fd, off_t offset, int whence) -+{ -+ return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -+} -+ -+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; -+} -+ -+int machdep_sys_fstat( int f, struct stat* st ) -+{ -+ return __fstat13(f,st); -+} diff --git a/devel/mit-pthreads/patches/patch-bn b/devel/mit-pthreads/patches/patch-bn deleted file mode 100644 index 8a46a2d0ec1..00000000000 --- a/devel/mit-pthreads/patches/patch-bn +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-bn,v 1.4 2002/04/11 15:43:37 fredb Exp $ - ---- machdep/syscall-m68000-netbsd.S.orig Thu Apr 11 09:26:02 2002 -+++ machdep/syscall-m68000-netbsd.S Thu Apr 11 09:33:02 2002 -@@ -0,0 +1,83 @@ -+ -+#ifndef lint -+ .text -+ .asciz "$Id: patch-bn,v 1.4 2002/04/11 15:43:37 fredb Exp $"; -+#endif -+ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#ifdef __STDC__ -+#define IMM # -+#define SYSCALL(x) .even; ENTRY(machdep_sys_ ## x); \ -+ 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 -+#endif /* !__STDC__ */ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .even -+ -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+err: -+ negl %d0 -+ rts -+ -+/* ========================================================================== -+ * machdep_sys_pipe -+ */ -+ .even -+ENTRY(machdep_sys_pipe); -+ movl #SYS_pipe,%d0 -+ trap #0 -+ jcs err -+ 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 -+ trap #0 -+ jcs err -+ clrl %d0 -+ rts -+#endif -+ -+#ifndef SYS___sigprocmask14 -+ .even -+ENTRY(machdep_sys_sigprocmask) -+ tstl %sp@(8) -+ jne gotptr -+/* 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) -+doit: -+ movl #SYS_sigprocmask,%d0 -+ trap #0 -+ jcs err -+ tstl %sp@(12) -+ jeq out -+ movl %sp@(12),%a0 -+ movl %d0,%a0@ -+out: -+ clrl %d0 -+ rts -+#endif diff --git a/devel/mit-pthreads/patches/patch-bo b/devel/mit-pthreads/patches/patch-bo deleted file mode 100644 index 35f3c0b3071..00000000000 --- a/devel/mit-pthreads/patches/patch-bo +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-bo,v 1.2 2002/04/11 15:43:37 fredb Exp $ - ---- machdep/syscall-template-m68000-netbsd.S.orig Thu Apr 11 09:26:27 2002 -+++ machdep/syscall-template-m68000-netbsd.S Thu Apr 11 09:12:45 2002 -@@ -0,0 +1,43 @@ -+#include <machine/asm.h> -+#include <sys/syscall.h> -+ -+#ifdef SYS___sigsuspend14 -+#define SYS_sigsuspend SYS___sigsuspend14 -+#endif -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif -+ -+ -+#ifdef __STDC__ -+#define IMM # -+#define SYSCALL(x) .even; \ -+ ENTRY(machdep_sys_ ## x); \ -+ 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 -+#endif /* !__STDC__ */ -+ -+/* -+ * Initial asm stuff for all functions. -+ */ -+ .text -+ .even -+ -+ -+/* ========================================================================== -+ * error code for all syscalls. The error value is returned as the negative -+ * of the errno value. -+ */ -+ -+err: -+ negl %d0 -+ rts -+ -+#define XSYSCALL(NAME) SYSCALL(NAME) -+ -+XSYSCALL(SYSCALL_NAME) diff --git a/devel/mit-pthreads/patches/patch-bp b/devel/mit-pthreads/patches/patch-bp deleted file mode 100644 index ca1c0ca87f0..00000000000 --- a/devel/mit-pthreads/patches/patch-bp +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-bp,v 1.3 2002/04/11 17:11:34 fredb Exp $ - ---- config/config.guess.orig Sun Jul 7 05:51:23 1996 -+++ config/config.guess Fri Sep 10 19:42:26 1999 -@@ -261,8 +261,29 @@ - CRAY-2:UNICOS:*:*) - echo cray2-cray-unicos - exit 0 ;; -+ amiga:NetBSD:*:*) -+ echo m68k-amiga-netbsd${UNAME_RELEASE} -+ exit 0 ;; -+ atari:NetBSD:*:*) -+ echo m68k-atari-netbsd${UNAME_RELEASE} -+ exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mac68k:NetBSD:*:*) -+ echo m68k-apple-netbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mvme68k:NetBSD:*:*) -+ echo m68k-motorola-netbsd${UNAME_RELEASE} -+ exit 0 ;; -+ next68k:NetBSD:*:*) -+ echo m68k-next-netbsd${UNAME_RELEASE} -+ exit 0 ;; -+ sun3:NetBSD:*:*) -+ echo m68k-sun-netbsd${UNAME_RELEASE} -+ exit 0 ;; -+ x68k:NetBSD:*:*) -+ echo m68k-sharp-netbsd${UNAME_RELEASE} - exit 0 ;; - i[34]86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -@@ -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/mit-pthreads/patches/patch-bq b/devel/mit-pthreads/patches/patch-bq deleted file mode 100644 index 0361396265c..00000000000 --- a/devel/mit-pthreads/patches/patch-bq +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bq,v 1.3 1999/12/28 05:08:11 wiz Exp $ ---- include/arpa/nameser.h.orig Tue May 30 07:33:39 1995 -+++ include/arpa/nameser.h Fri Nov 5 09:44:44 1999 -@@ -56,8 +56,12 @@ - #ifndef _NAMESER_H_ - #define _NAMESER_H_ - --#include <endian.h> - #include <sys/types.h> -+#if __NetBSD_Version__ > 104010000 -+#include <sys/endian.h> -+#else -+#include <machine/endian.h> -+#endif - #include <pthread/types.h> - - /* diff --git a/devel/mit-pthreads/patches/patch-br b/devel/mit-pthreads/patches/patch-br deleted file mode 100644 index cd5e2242d66..00000000000 --- a/devel/mit-pthreads/patches/patch-br +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-br,v 1.3 1999/12/28 05:08:11 wiz Exp $ ---- stdlib/strtod.c.orig Fri Nov 5 09:21:45 1999 -+++ stdlib/strtod.c Fri Nov 5 09:33:24 1999 -@@ -94,7 +94,12 @@ - #endif /* LIBC_SCCS and not lint */ - - #ifndef __arm32__ --#include <endian.h> -+#if __NetBSD_Version__ > 104010000 -+#include <sys/endian.h> -+#else -+#include <sys/types.h> -+#include <machine/endian.h> -+#endif - #if BYTE_ORDER == BIG_ENDIAN - #define IEEE_BIG_ENDIAN 1 - #else diff --git a/devel/mit-pthreads/patches/patch-bs b/devel/mit-pthreads/patches/patch-bs deleted file mode 100644 index 8ff907cabe7..00000000000 --- a/devel/mit-pthreads/patches/patch-bs +++ /dev/null @@ -1,200 +0,0 @@ -$NetBSD: patch-bs,v 1.2 1999/12/28 05:08:11 wiz Exp $ -diff -ur machdep/syscall-i386-netbsd-1.3.S machdep/syscall-i386-netbsd-1.3.S ---- machdep/syscall-i386-netbsd-1.3.S Wed Nov 3 12:15:30 1999 -+++ machdep/syscall-i386-netbsd-1.3.S Wed Nov 3 19:04:58 1999 -@@ -61,52 +61,47 @@ - .text - .align 2 - -- - /* ========================================================================== - * machdep_sys_fork() - */ -- .globl _machdep_sys_fork; -- --_machdep_sys_fork:; -- -- movl $(SYS_fork), %eax; -- .byte 0x9a; .long 0; .word 7; -+ .globl _C_LABEL(machdep_sys_fork) -+ -+_C_LABEL(machdep_sys_fork): -+ movl $(SYS_fork), %eax -+ .byte 0x9a ; .long 0; .word 7; - cmpl $0, %edx - je 2f - movl $0, %eax --2: -- ret; -+2: -+ ret - - /* ========================================================================== - * machdep_sys___syscall() - */ - --_machdep_sys___syscall:; -- -- movl $(SYS___syscall), %eax; -- int $0x80; -- jb 3f; -+_C_LABEL(machdep_sys___syscall): -+ movl $(SYS___syscall), %eax -+ int $0x80 -+ jb 3f - ret - - #ifndef SYS___sigsuspend14 - /* ========================================================================== - * machdep_sys_sigsuspend() - */ -- .globl _machdep_sys_sigsuspend; -+ .globl _C_LABEL(machdep_sys_sigsuspend) - --_machdep_sys_sigsuspend:; -- -- movl 4(%esp),%eax # fetch mask arg -- movl (%eax),%eax # indirect to mask arg -- movl %eax,4(%esp) -- movl $(SYS_sigsuspend), %eax; -- int $0x80; -- jb 3f; -+_C_LABEL(machdep_sys_sigsuspend): -+ movl 4(%esp),%eax ; fetch mask arg -+ movl (%eax),%eax ; indirect to mask arg -+ movl %eax,4(%esp) -+ movl $(SYS_sigsuspend), %eax -+ int $0x80 -+ jb 3f - ret - #endif - - 3: -- - neg %eax - movl $0xffffffff,%edx - ret -@@ -114,39 +109,37 @@ - /* ========================================================================== - * machdep_sys_lseek() - */ -- .globl _machdep_sys_lseek; -+ .globl _C_LABEL(machdep_sys_lseek) - --_machdep_sys_lseek:; -- -- pushl %ebp; -- movl %esp,%ebp; -- pushl 0x14(%ebp); -- pushl 0x10(%ebp); -- pushl 0xc(%ebp); -- pushl $0x0; -- pushl 0x8(%ebp); -- pushl $0x0; -- pushl $(SYS_lseek); -- call _machdep_sys___syscall; -+_C_LABEL(machdep_sys_lseek): -+ pushl %ebp -+ movl %esp,%ebp -+ pushl 0x14(%ebp) -+ pushl 0x10(%ebp) -+ pushl 0xc(%ebp) -+ pushl $0x0 -+ pushl 0x8(%ebp) -+ pushl $0x0 -+ pushl $(SYS_lseek) -+ call _C_LABEL(machdep_sys___syscall) - leave - ret - - /* ========================================================================== - * machdep_sys_ftruncate() ; Added by Monty - */ -- .globl _machdep_sys_ftruncate; -- --_machdep_sys_ftruncate:; -+ .globl _C_LABEL(machdep_sys_ftruncate) - -- pushl %ebp; -- movl %esp,%ebp; -- pushl 0x10(%ebp); -- pushl 0xc(%ebp); -+_C_LABEL(machdep_sys_ftruncate): -+ pushl %ebp -+ movl %esp,%ebp -+ pushl 0x10(%ebp) -+ pushl 0xc(%ebp) - pushl $0x0; # Why this? -- pushl 0x8(%ebp); -+ pushl 0x8(%ebp) - pushl $0x0; # And this? -- pushl $(SYS_ftruncate); -- call _machdep_sys___syscall; -+ pushl $(SYS_ftruncate) -+ call _C_LABEL(machdep_sys___syscall); - leave - ret - -@@ -154,29 +147,28 @@ - /* ========================================================================== - * machdep_sys_sigprocmask() - */ -- .globl _machdep_sys_sigprocmask; -+ .globl _C_LABEL(machdep_sys_sigprocmask) -+ -+_C_LABEL(machdep_sys_sigprocmask): - --_machdep_sys_sigprocmask:; -- - movl 8(%esp),%ecx - movl (%ecx),%ecx -- movl %ecx,8(%esp) -- movl $(SYS_sigprocmask), %eax; -- int $0x80; -- jb 3b; -+ movl %ecx,8(%esp) -+ movl $(SYS_sigprocmask), %eax -+ int $0x80 -+ jb 3b - ret - #endif - - /* ========================================================================== - * machdep_sys_pipe() - */ -- .globl _machdep_sys_pipe; -+ .globl _C_LABEL(machdep_sys_pipe) - --_machdep_sys_pipe:; -- -- movl $(SYS_pipe), %eax; -- int $0x80; -- jb 3b; -+_C_LABEL(machdep_sys_pipe): -+ movl $(SYS_pipe), %eax -+ int $0x80 -+ jb 3b - movl 4(%esp),%ecx - movl %eax,(%ecx) - movl %edx,4(%ecx) -@@ -186,15 +178,14 @@ - /* ========================================================================== - * machdep_sys_fstat() - */ -- .globl _machdep_sys_fstat; -+ .globl _C_LABEL(machdep_sys_fstat) - --_machdep_sys_fstat:; -- movl $(SYS___fstat13), %eax; -- int $0x80; -- jb 4f; -+_C_LABEL(machdep_sys_fstat): -+ movl $(SYS___fstat13), %eax -+ int $0x80 -+ jb 4f - ret - 4: - neg %eax - movl $0xffffffff,%edx - ret -- diff --git a/devel/mit-pthreads/patches/patch-bt b/devel/mit-pthreads/patches/patch-bt deleted file mode 100644 index 369f3a5b620..00000000000 --- a/devel/mit-pthreads/patches/patch-bt +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-bt,v 1.2 1999/12/28 05:08:11 wiz Exp $ -diff -ur machdep/syscall-template-i386-netbsd-1.3.S machdep/syscall-template-i386-netbsd-1.3.S ---- machdep/syscall-template-i386-netbsd-1.3.S Wed Nov 3 12:15:31 1999 -+++ machdep/syscall-template-i386-netbsd-1.3.S Wed Nov 3 19:28:47 1999 -@@ -4,36 +4,33 @@ - #ifdef SYS___sigsuspend14 - #define SYS_sigsuspend SYS___sigsuspend14 - #endif --#ifdef SYS___sigprocmask14 --#define SYS_sigprocmask SYS___sigprocmask14 -+ -+#ifdef SYS___sigaction14 -+#define SYS_sigaction SYS___sigaction14 - #endif - --#ifdef __STDC__ -+#ifdef SYS___sigpause14 -+#define SYS_sigpause SYS___sigpause14 -+#endif - --#define SYSCALL(x) \ -- .globl _machdep_sys_##x; \ -- \ --_machdep_sys_##x:; \ -- \ -- movl $(SYS_##x), %eax; \ -- int $0x80; \ -- jb 1b; \ -- ret; -- --#else -- --#define SYSCALL(x) \ -- .globl _machdep_sys_/**/x; \ -- \ --_machdep_sys_/**/x:; \ -- \ -- movl $(SYS_/**/x), %eax; \ -- int $0x80; \ -- jb 1b; \ -- ret; -+#ifdef SYS___sigprocmask14 -+#define SYS_sigprocmask SYS___sigprocmask14 -+#endif - -+#ifdef SYS___vfork14xxxmlg -+#define SYS_vfork SYS___vfork14 - #endif - -+/* XXXMLG What about sigantstack14 and sigreturn14? */ -+ -+#define SYSCALL(x) ; \ -+ .globl _C_LABEL(machdep_sys_##x) ; \ -+ ; \ -+_C_LABEL(machdep_sys_##x): ; \ -+ movl $(SYS_##x), %eax ; \ -+ int $0x80 ; \ -+ jb 1b ; \ -+ ret - - /* - * Initial asm stuff for all functions. diff --git a/devel/mit-pthreads/patches/patch-bw b/devel/mit-pthreads/patches/patch-bw deleted file mode 100644 index 6d733d5d6da..00000000000 --- a/devel/mit-pthreads/patches/patch-bw +++ /dev/null @@ -1,198 +0,0 @@ ---- include/signal.h Sun Dec 24 19:03:09 1995 -+++ include/signal.h Wed Nov 3 21:31:11 1999 -@@ -1,3 +1,5 @@ -+/* $NetBSD: patch-bw,v 1.1 1999/11/05 17:13:29 explorer Exp $ */ -+ - /*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. -@@ -33,48 +35,160 @@ - * @(#)signal.h 8.3 (Berkeley) 3/30/94 - */ - --#ifndef _SIGNAL_H --#define _SIGNAL_H -+#ifndef _SIGNAL_H_ -+#define _SIGNAL_H_ - --#include <sys/types.h> - #include <sys/cdefs.h> --#include <sys/__signal.h> -+#include <sys/featuretest.h> - --__BEGIN_DECLS -+#if !defined(_ANSI_SOURCE) -+#include <sys/types.h> -+#endif - --int raise __P((int)); -+#include <sys/signal.h> - --#ifndef _ANSI_SOURCE -+#include <sys/__signal.h> - --int sigfillset __P((sigset_t *)); --int sigemptyset __P((sigset_t *)); --int sigaddset __P((sigset_t *, int)); --int sigdelset __P((sigset_t *, int)); --int sigismember __P((const sigset_t *, int)); --int sigsuspend __P((const sigset_t *)); --int sigprocmask __P((int, const sigset_t *, sigset_t *)); -+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \ -+ !defined(_XOPEN_SOURCE) -+extern __const char *__const *sys_signame __RENAME(__sys_signame14); -+extern __const char *__const *sys_siglist __RENAME(__sys_siglist14); -+extern __const int sys_nsig __RENAME(__sys_nsig14); -+#endif - --/* Still need work */ -+__BEGIN_DECLS -+int raise __P((int)); -+#ifndef _ANSI_SOURCE - int kill __P((pid_t, int)); --int sigaction __P((int, const struct sigaction *, struct sigaction *)); --int sigpending __P((sigset_t *)); -- --#ifndef _POSIX_SOURCE - -+#ifdef __LIBC12_SOURCE__ -+int sigaction __P((int, const struct sigaction13 *, struct sigaction13 *)); -+int __sigaction14 __P((int, const struct sigaction *, struct sigaction *)); -+int sigaddset __P((sigset13_t *, int)); -+int __sigaddset14 __P((sigset_t *, int)); -+int sigdelset __P((sigset13_t *, int)); -+int __sigdelset14 __P((sigset_t *, int)); -+int sigemptyset __P((sigset13_t *)); -+int __sigemptyset14 __P((sigset_t *)); -+int sigfillset __P((sigset13_t *)); -+int __sigfillset14 __P((sigset_t *)); -+int sigismember __P((const sigset13_t *, int)); -+int __sigismember14 __P((const sigset_t *, int)); -+int sigpending __P((sigset13_t *)); -+int __sigpending14 __P((sigset_t *)); -+int sigprocmask __P((int, const sigset13_t *, sigset13_t *)); -+int __sigprocmask14 __P((int, const sigset_t *, sigset_t *)); -+int sigsuspend __P((const sigset13_t *)); -+int __sigsuspend14 __P((const sigset_t *)); -+#else /* !__LIBC12_SOURCE__ */ -+int sigaction __P((int, const struct sigaction *, struct sigaction *)) __RENAME(__sigaction14); -+int sigaddset __P((sigset_t *, int)) __RENAME(__sigaddset14); -+int sigdelset __P((sigset_t *, int)) __RENAME(__sigdelset14); -+int sigemptyset __P((sigset_t *)) __RENAME(__sigemptyset14); -+int sigfillset __P((sigset_t *)) __RENAME(__sigfillset14); -+int sigismember __P((const sigset_t *, int)) __RENAME(__sigismember14); -+int sigpending __P((sigset_t *)) __RENAME(__sigpending14); -+int sigprocmask __P((int, const sigset_t *, sigset_t *)) __RENAME(__sigprocmask14); -+int sigsuspend __P((const sigset_t *)) __RENAME(__sigsuspend14); -+ -+#if defined(__GNUC__) && defined(__STDC__) -+extern __inline int -+sigaddset(sigset_t *set, int signo) -+{ -+#ifdef _REENTRANT -+ extern int *__errno __P((void)); -+#else -+ extern int errno; -+#endif -+ -+ if (signo <= 0 || signo >= _NSIG) { -+#ifdef _REENTRANT -+ *__errno() = 22; /* EINVAL */ -+#else -+ errno = 22; /* EINVAL */ -+#endif -+ return (-1); -+ } -+ __sigaddset(set, signo); -+ return (0); -+} -+ -+extern __inline int -+sigdelset(sigset_t *set, int signo) -+{ -+#ifdef _REENTRANT -+ extern int *__errno __P((void)); -+#else -+ extern int errno; -+#endif -+ -+ if (signo <= 0 || signo >= _NSIG) { -+#ifdef _REENTRANT -+ *__errno() = 22; /* EINVAL */ -+#else -+ errno = 22; /* EINVAL */ -+#endif -+ return (-1); -+ } -+ __sigdelset(set, signo); -+ return (0); -+} -+ -+extern __inline int -+sigismember(const sigset_t *set, int signo) -+{ -+#ifdef _REENTRANT -+ extern int *__errno __P((void)); -+#else -+ extern int errno; -+#endif -+ -+ if (signo <= 0 || signo >= _NSIG) { -+#ifdef _REENTRANT -+ *__errno() = 22; /* EINVAL */ -+#else -+ errno = 22; /* EINVAL */ -+#endif -+ return (-1); -+ } -+ return (__sigismember(set, signo)); -+} -+#endif /* __GNUC__ && __STDC__ */ -+ -+/* List definitions after function declarations, or Reiser cpp gets upset. */ -+#define sigemptyset(set) (__sigemptyset(set), /*LINTED*/0) -+#define sigfillset(set) (__sigfillset(set), /*LINTED*/ 0) -+#endif /* !__LIBC12_SOURCE__ */ -+ -+#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \ -+ (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \ -+ (_XOPEN_SOURCE - 0) >= 500 - int killpg __P((pid_t, int)); - int siginterrupt __P((int, int)); --void psignal __P((unsigned int, const char *)); -+int sigpause __P((int)); -+int sigstack __P((const struct sigstack *, struct sigstack *)); -+#ifdef __LIBC12_SOURCE__ -+int sigaltstack __P((const struct sigaltstack13 *, struct sigaltstack13 *)); -+int __sigaltstack14 __P((const stack_t *, stack_t *)); -+#else -+int sigaltstack __P((const stack_t *, stack_t *)) __RENAME(__sigaltstack14); -+#endif -+#endif /* (!_POSIX_C_SOURCE && !_XOPEN_SOURCE) || ... */ - --/* int sigpause __P((int)); */ --/* int sigsetmask __P((int)); */ --/* int sigblock __P((int)); */ --/* int sigreturn __P((struct sigcontext *)); */ --/* int sigvec __P((int, struct sigvec *, struct sigvec *)); */ --/* int sigstack __P((const struct sigstack *, struct sigstack *)); */ -+#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) -+void psignal __P((unsigned int, const char *)); -+int sigblock __P((int)); -+#ifdef __LIBC12_SOURCE__ -+int sigreturn __P((struct sigcontext13 *)); -+int __sigreturn14 __P((struct sigcontext *)); -+#else -+int sigreturn __P((struct sigcontext *)) __RENAME(__sigreturn14); -+#endif -+int sigsetmask __P((int)); -+int sigvec __P((int, struct sigvec *, struct sigvec *)); -+#endif /* !_POSIX_C_SOURCE && !_XOPEN_SOURCE */ - --#endif /* !_POSIX_SOURCE */ - #endif /* !_ANSI_SOURCE */ -- - __END_DECLS - --#endif /* !_USER_SIGNAL_H */ -+#endif /* !_SIGNAL_H_ */ diff --git a/devel/mit-pthreads/patches/patch-bx b/devel/mit-pthreads/patches/patch-bx deleted file mode 100644 index f44901bdd9f..00000000000 --- a/devel/mit-pthreads/patches/patch-bx +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bx,v 1.4 1999/12/28 05:08:12 wiz Exp $ ---- stdlib/system.c Wed Apr 24 20:18:56 1996 -+++ stdlib/system.c Thu Nov 13 11:27:43 1997 -@@ -62,7 +62,7 @@ - argp[2] = (char *) command; - sigemptyset(&tmp_mask); - sigaddset(&tmp_mask, SIGCHLD); -- pthread_sigmask(SIG_BLOCK, tmp_mask, &old_mask); -+ pthread_sigmask(SIG_BLOCK, &tmp_mask, &old_mask); - switch(pid = fork()) { - case -1: /* error */ - (void)pthread_sigmask(SIG_SETMASK, &old_mask, NULL); diff --git a/devel/mit-pthreads/patches/patch-by b/devel/mit-pthreads/patches/patch-by deleted file mode 100644 index 92f1b9e56dc..00000000000 --- a/devel/mit-pthreads/patches/patch-by +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-by,v 1.2 1999/12/28 05:08:12 wiz Exp $ ---- pthreads/signal.c Tue Mar 12 20:33:17 1996 -+++ pthreads/signal.c Thu Nov 4 13:17:26 1999 -@@ -303,9 +303,17 @@ - break; - case NOTOK: - /* Do the registered action, no threads were sleeping */ -- sigdefault(sig); -- break; -- } -+ /* There is a timing window that gets -+ * here when no threads are on the -+ * sleep queue. This is a quick fix. -+ * The real problem is possibly related -+ * to heavy use of condition variables -+ * with time outs. -+ * (mevans) -+ *sigdefault(sig); -+ */ -+ break; -+ } - break; - case SIGCHLD: - /* sigdelset((sigset_t *)&sig_to_process, SIGCHLD); */ diff --git a/devel/mit-pthreads/patches/patch-bz b/devel/mit-pthreads/patches/patch-bz deleted file mode 100644 index 44764485a92..00000000000 --- a/devel/mit-pthreads/patches/patch-bz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bz,v 1.3 1999/12/28 05:08:12 wiz Exp $ ---- include/pthread/fd.h.orig Sat Mar 25 15:51:48 1995 -+++ include/pthread/fd.h Fri Nov 5 10:54:54 1999 -@@ -117,6 +117,9 @@ - - #if defined(PTHREAD_KERNEL) - -+extern off_t machdep_sys_lseek(int, off_t, int); -+extern int machdep_sys_ftruncate(int, off_t); -+ - #endif - - __END_DECLS diff --git a/devel/mit-pthreads/patches/patch-ca b/devel/mit-pthreads/patches/patch-ca deleted file mode 100644 index a363b77353f..00000000000 --- a/devel/mit-pthreads/patches/patch-ca +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2000/01/10 19:59:15 mycroft Exp $ ---- pthreads/process.c.orig Thu Jan 6 12:34:18 2000 -+++ pthreads/process.c Thu Jan 6 13:49:00 2000 -@@ -66,7 +66,7 @@ - } else { /* Child */ - machdep_unset_thread_timer(NULL); - machdep_stop_timer(NULL); -- fork_lock++; -+ pthread_sched_resume(); - } - return(ret); - } diff --git a/devel/mit-pthreads/patches/patch-cb b/devel/mit-pthreads/patches/patch-cb deleted file mode 100644 index a4a4c2c0c0e..00000000000 --- a/devel/mit-pthreads/patches/patch-cb +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2000/11/29 16:42:58 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/mit-pthreads/patches/patch-cf b/devel/mit-pthreads/patches/patch-cf deleted file mode 100644 index fb3d905fde9..00000000000 --- a/devel/mit-pthreads/patches/patch-cf +++ /dev/null @@ -1,232 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2001/01/10 01:28:51 briggs Exp $ - ---- /dev/null Tue Jan 9 17:03:11 2001 -+++ machdep/engine-powerpc-netbsd.c Tue Jan 9 16:56:18 2001 -@@ -0,0 +1,227 @@ -+/* ==== 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(); -+} -+ -+/* ========================================================================== -+ * __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(); -+ } -+} -+ -+/* ========================================================================== -+ * 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(); -+ } -+} -+ -+/* ========================================================================== -+ * machdep_pthread_cleanup() -+ */ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread) -+{ -+ return(machdep_pthread->machdep_stack); -+} -+ -+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread); -+void machdep_pthread_start(void); -+ -+/* ========================================================================== -+ * __machdep_stack_free() -+ */ -+void -+__machdep_stack_free(void * stack) -+{ -+ free(stack); -+} -+ -+/* ========================================================================== -+ * __machdep_stack_alloc() -+ */ -+void * -+__machdep_stack_alloc(size_t size) -+{ -+ return(malloc(size)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_creat() -+ */ -+int -+machdep_sys_creat(char * path, int mode) -+{ -+ return(machdep_sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_wait3() -+ */ -+int -+machdep_sys_wait3(int * b, int c, int *d) -+{ -+ return(machdep_sys_wait4(0, b, c, d)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_waitpid() -+ */ -+int -+machdep_sys_waitpid(int a, int * b, int c) -+{ -+ return(machdep_sys_wait4(a, b, c, NULL)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_getdtablesize() -+ */ -+int -+machdep_sys_getdtablesize(void) -+{ -+ return(sysconf(_SC_OPEN_MAX)); -+} -+ -+/* ========================================================================== -+ * machdep_sys_lseek() -+ */ -+off_t -+machdep_sys_lseek(int fd, off_t offset, int whence) -+{ -+ return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); -+} -+ -+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() -+ */ -+int -+machdep_sys_getdirentries(int fd, char * buf, int len, int * seek) -+{ -+ return(machdep_sys_getdents(fd, buf, len)); -+} diff --git a/devel/mit-pthreads/patches/patch-cg b/devel/mit-pthreads/patches/patch-cg deleted file mode 100644 index b06d830fe71..00000000000 --- a/devel/mit-pthreads/patches/patch-cg +++ /dev/null @@ -1,114 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2001/01/10 01:28:51 briggs Exp $ - ---- /dev/null Tue Jan 9 17:03:11 2001 -+++ machdep/engine-powerpc-netbsd.h Tue Jan 9 16:54:05 2001 -@@ -0,0 +1,109 @@ -+/* ==== 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 */ -+ -+/* -+ * 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_stack_alloc(size_t); -+void __machdep_stack_free(void *); -+ -+#endif -+ -+__END_DECLS diff --git a/devel/mit-pthreads/patches/patch-ch b/devel/mit-pthreads/patches/patch-ch deleted file mode 100644 index acb1c3035a5..00000000000 --- a/devel/mit-pthreads/patches/patch-ch +++ /dev/null @@ -1,186 +0,0 @@ -$NetBSD: patch-ch,v 1.3 2002/03/25 16:08:32 briggs Exp $ - ---- /dev/null Wed Dec 31 19:00:00 1969 -+++ machdep/syscall-powerpc-netbsd.S Tue Jan 9 10:42:07 2001 -@@ -0,0 +1,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/mit-pthreads/patches/patch-ci b/devel/mit-pthreads/patches/patch-ci deleted file mode 100644 index 7e606cbe033..00000000000 --- a/devel/mit-pthreads/patches/patch-ci +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2001/01/10 01:28:51 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/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> |