diff options
| author |   miod <miod@openbsd.org> | 2010-02-03 20:48:58 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2010-02-03 20:48:58 +0000 |
| commit | b3ed33d2d70f99f07d350f98602c83b814dbcf10 (patch) | |
| tree | ff5e1d03e19ab46fcc7523609a613ffa56a13119 /lib/libpthread | |
| parent | If MACHINE_CPU != MACHINE_ARCH, pass -D__${MACHINE_CPU}__ to the preprocessor. (diff) | |
| download | wireguard-openbsd-b3ed33d2d70f99f07d350f98602c83b814dbcf10.tar.xz wireguard-openbsd-b3ed33d2d70f99f07d350f98602c83b814dbcf10.zip | |
Use MACHINE_CPU instead of MACHINE_ARCH to pick the correct machine dependent
files or directories when applicable.
The inspiration and name of MACHINE_CPU come from NetBSD, although the way to
provide it to Makefiles is completely different.
ok kettenis@
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/sys/Makefile.inc | 10 | ||||
| -rw-r--r-- | lib/libpthread/uthread/Makefile.inc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc index 7056e455e67..10fcfe22961 100644 --- a/lib/libpthread/sys/Makefile.inc +++ b/lib/libpthread/sys/Makefile.inc @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile.inc,v 1.17 2009/06/01 23:18:24 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2010/02/03 20:49:00 miod Exp $ -.PATH: ${SRCDIR}/sys ${SRCDIR}/arch/${MACHINE_ARCH} +.PATH: ${SRCDIR}/sys ${SRCDIR}/arch/${MACHINE_CPU} SRCS+= uthread_error.c -.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/_atomic_lock.c) +.if exists(${SRCDIR}/arch/${MACHINE_CPU}/_atomic_lock.c) SRCS+= _atomic_lock.c .endif -.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep_asm.S) +.if exists(${SRCDIR}/arch/${MACHINE_CPU}/uthread_machdep_asm.S) SRCS+= uthread_machdep_asm.S .endif -.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep.c) +.if exists(${SRCDIR}/arch/${MACHINE_CPU}/uthread_machdep.c) SRCS+= uthread_machdep.c .endif diff --git a/lib/libpthread/uthread/Makefile.inc b/lib/libpthread/uthread/Makefile.inc index 23d7f229128..66908ef5a21 100644 --- a/lib/libpthread/uthread/Makefile.inc +++ b/lib/libpthread/uthread/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.21 2008/12/18 09:30:32 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.22 2010/02/03 20:49:00 miod Exp $ # $FreeBSD: Makefile.inc,v 1.19 1999/08/28 00:03:19 peter Exp $ # uthread sources .PATH: ${SRCDIR}/uthread -CFLAGS += -I${SRCDIR}/arch/${MACHINE_ARCH} +CFLAGS += -I${SRCDIR}/arch/${MACHINE_CPU} SRCS+= \ uthread_accept.c \ |