commit - cea10000c59882b43525e4fd4fb17a55b7dba1c1
commit + 52e6164443782187e17e22f7ccddd0d9a25006e4
blob - c89e92a515127f2b66f17d3b0992dbaf53537c45
blob + 07218dddb69b6e36e5c73d28aeb52b2d274cdd3d
--- bin/9l
+++ bin/9l
*OpenBSD*)
ld=gcc
userpath=true
- extralibs="$extralibs -lutil -lpthread"
+ extralibs="$extralibs -lutil"
;;
*FreeBSD*)
ld=gcc
blob - ac8ffa9d943f9f43475d34e944e6d74faa9d03a3
blob + 88382c155fe0a3f6f4389ddcd302c6693986f4df
--- include/libc.h
+++ include/libc.h
#define DMWRITE 0x2 /* mode bit for write permission */
#define DMEXEC 0x1 /* mode bit for execute permission */
-#if defined(__FreeBSD__)
+#ifdef RFMEM /* FreeBSD, OpenBSD */
#undef RFFDG
#undef RFNOTEG
#undef RFPROC
# undef USED
# define USED(x) { ulong __y __attribute__ ((unused)); __y = (ulong)(x); }
# endif
+#endif
+
+#ifdef __OpenBSD__
+#define sched_yield() syscall(302) /* what is this? */
#endif
/* command line */
blob - 84cd78d0d1dcefb0a8f33a0edd9097f3eb4da6eb
blob + ccadff00c3ecf4fce9d6cc9b85c0a2bd1bddcda2
--- include/u.h
+++ include/u.h
# undef _NEEDUSHORT
# undef _NEEDUINT
# undef _NEEDULONG
-# undef PLAN9PORT_USING_PTHREADS
+#elif defined(__OpenBSD__)
+# undef _NEEDUSHORT
+# undef _NEEDUINT
+# undef _NEEDULONG
#else
/* No idea what system this is -- try some defaults */
# include <pthread.h>
blob - 92cc6fa36089e4b6897acf6d30478494a4fd0021
blob + 6a4105017116586e126ed587eeca29881d5605dc
--- src/Makefile
+++ src/Makefile
../bin/mk: mkmk.sh
SYSNAME=`uname` export SYSNAME; \
- OBJTYPE=`uname -m | sed 's;i.86;386;; s;amd64;x86_64;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \
+ OBJTYPE=`uname -m | sed 's;i.86;386;; s;amd64;x86_64;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/macppc/power/g; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \
PATH=`pwd`/../bin:$$PATH export PATH; \
PLAN9=`pwd`/.. export PLAN9; \
sh -x mkmk.sh
blob - 4c4aa7f0f2c4d143b395a54dd037ebb4de5e9080
blob + 6f1154a5b793f8b4be4dfd729a308fc2ed6f0a29
--- src/lib9/sendfd.c
+++ src/lib9/sendfd.c
#include <unistd.h>
#include <errno.h>
-typedef struct Sendfd Sendfd;
-struct Sendfd {
- struct cmsghdr cmsg;
- int fd;
-};
-
int
sendfd(int s, int fd)
{
char buf[1];
struct iovec iov;
struct msghdr msg;
+ struct cmsghdr *cmsg;
int n;
- Sendfd sfd;
-
+ char cms[CMSG_SPACE(sizeof(int))];
+
buf[0] = 0;
iov.iov_base = buf;
iov.iov_len = 1;
memset(&msg, 0, sizeof msg);
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
+ msg.msg_control = (caddr_t)cms;
+ msg.msg_controllen = CMSG_LEN(sizeof(int));
- sfd.cmsg.cmsg_len = sizeof sfd;
- sfd.cmsg.cmsg_level = SOL_SOCKET;
- sfd.cmsg.cmsg_type = SCM_RIGHTS;
- sfd.fd = fd;
+ cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+ *(int*)CMSG_DATA(cmsg) = fd;
- msg.msg_control = (caddr_t)&sfd;
- msg.msg_controllen = sizeof sfd;
-
if((n=sendmsg(s, &msg, 0)) != iov.iov_len)
return -1;
return 0;
recvfd(int s)
{
int n;
+ int fd;
char buf[1];
struct iovec iov;
struct msghdr msg;
- Sendfd sfd;
+ struct cmsghdr *cmsg;
+ char cms[CMSG_SPACE(sizeof(int))];
iov.iov_base = buf;
iov.iov_len = 1;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
- memset(&sfd, 0, sizeof sfd);
- sfd.fd = -1;
- sfd.cmsg.cmsg_len = sizeof sfd;
- sfd.cmsg.cmsg_level = SOL_SOCKET;
- sfd.cmsg.cmsg_type = SCM_RIGHTS;
+ msg.msg_control = (caddr_t)cms;
+ msg.msg_controllen = sizeof cms;
- msg.msg_control = (caddr_t)&sfd;
- msg.msg_controllen = sizeof sfd;
-
if((n=recvmsg(s, &msg, 0)) < 0)
return -1;
- if(n==0 && sfd.fd==-1){
- werrstr("eof in recvfd");
- return -1;
- }
- return sfd.fd;
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ fd = *(int*)CMSG_DATA(cmsg);
+ return fd;
}
blob - e99a261f25099b6ea91cf22d915ddbfe80b0e2e8
blob + 1b1e1925aacb7a00762c93d55efa4784df3ec72a
--- src/mkcommon
+++ src/mkcommon
%.$O: %.s
$AS $AFLAGS $stem.s
+# OpenBSD needs this; sigh
+%.$O: %.S
+ $CC $CFLAGS $stem.S
+
y.tab.h y.tab.c: $YFILES
$YACC $YFLAGS $prereq
blob - aa428b200189af76d3d19a0e1a9e037a0ee7a988
blob + 4263b508cfa84c3424f540e2c5b259987decab2d
--- src/mkhdr
+++ src/mkhdr
s;/.*;;;
s; ;;g;
s;PowerMacintosh;power;g;
+ s;macppc;power;g;
s;ppc64;power;g;
s;ppc;power;g'`