From e9c926da912f1985b3a00df6995af59a26881ef3 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 24 Sep 2018 11:25:09 +0000 Subject: [PATCH] enable futex(2) based mutexes on armv7 and use futex based semaphores in librthread on armv7 as well from brad ok visa@ kettenis@ mpi@ --- lib/libc/thread/Makefile.inc | 6 +++--- lib/librthread/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/thread/Makefile.inc b/lib/libc/thread/Makefile.inc index d2b42faca7a..a46221808f9 100644 --- a/lib/libc/thread/Makefile.inc +++ b/lib/libc/thread/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.15 2018/05/19 12:27:33 mpi Exp $ +# $OpenBSD: Makefile.inc,v 1.16 2018/09/24 11:25:09 jsg Exp $ .PATH: ${LIBCSRCDIR}/thread @@ -19,8 +19,8 @@ notyet= rthread_condattr_clock.c \ spinlock.c \ spinlocktry.c -.if ${MACHINE_ARCH} == "aarch64" || \ - ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ +.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" || \ ${MACHINE_ARCH} == "sparc64" CFLAGS+= -DFUTEX diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile index 7d188db71da..c7d96c91ec2 100644 --- a/lib/librthread/Makefile +++ b/lib/librthread/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2018/06/08 13:53:01 pirofti Exp $ +# $OpenBSD: Makefile,v 1.51 2018/09/24 11:25:09 jsg Exp $ LIB=pthread LIBCSRCDIR= ${.CURDIR}/../libc @@ -36,8 +36,8 @@ SRCS= rthread.c \ sched_prio.c # Architectures that implement atomics -.if ${MACHINE_ARCH} == "aarch64" || \ - ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ +.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" || \ ${MACHINE_ARCH} == "sparc64" SRCS+= rthread_sem.c -- 2.20.1