summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2017-06-01 08:46:34 +0000
committermpi <mpi@openbsd.org>2017-06-01 08:46:34 +0000
commitdee8611e5adc61dfb6fcb1fa3a5766ffd3a6cf25 (patch)
treebc778df2fd9d72226d2e0e0a33a09f7ea98201d0
parentIf CVS_LOCK_REPO is set only attempt to unlock the repo if we're local. (diff)
downloadwireguard-openbsd-dee8611e5adc61dfb6fcb1fa3a5766ffd3a6cf25.tar.xz
wireguard-openbsd-dee8611e5adc61dfb6fcb1fa3a5766ffd3a6cf25.zip
New condvar introduced a regression with vmd(8), revert until it is found.
Reported by Gregor Best.
-rw-r--r--lib/librthread/Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile
index 9328326cc61..c9af30d8dfe 100644
--- a/lib/librthread/Makefile
+++ b/lib/librthread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2017/05/29 21:19:30 mpi Exp $
+# $OpenBSD: Makefile,v 1.45 2017/06/01 08:46:34 mpi Exp $
LIB=pthread
LIBCSRCDIR= ${.CURDIR}/../libc
@@ -39,17 +39,10 @@ SRCS= rthread.c \
rthread_sig.c \
rthread_stack.c \
rthread_spin_lock.c \
+ rthread_sync.c \
rthread_tls.c \
sched_prio.c
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-CFLAGS+= -DFUTEX
-SRCS+= rthread_mutex.c \
- rthread_cond.c
-.else
-SRCS+= rthread_sync.c
-.endif
-
OBJS+= _atomic_lock.o
SRCDIR= ${.CURDIR}/../libpthread