Date: Mon, 23 Aug 2010 06:06:55 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r211689 - in user/imp/tbemd/sys/modules: opensolaris zfs Message-ID: <201008230606.o7N66t0L029158@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Aug 23 06:06:55 2010 New Revision: 211689 URL: http://svn.freebsd.org/changeset/base/211689 Log: Vastly simplify the rats-nest of ifs for the atomic ops... Modified: user/imp/tbemd/sys/modules/opensolaris/Makefile user/imp/tbemd/sys/modules/zfs/Makefile Modified: user/imp/tbemd/sys/modules/opensolaris/Makefile ============================================================================== --- user/imp/tbemd/sys/modules/opensolaris/Makefile Mon Aug 23 06:00:21 2010 (r211688) +++ user/imp/tbemd/sys/modules/opensolaris/Makefile Mon Aug 23 06:06:55 2010 (r211689) @@ -8,11 +8,12 @@ SRCS= opensolaris.c \ opensolaris_kmem.c \ opensolaris_misc.c -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64" || ${MACHINE_CPUARCH} == "sparc64" -.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_CPUARCH} +_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic +.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S) +.PATH: ${_A}/${MACHINE_CPUARCH} SRCS+= opensolaris_atomic.S -.elif ${MACHINE_ARCH} == "powerpc64" -.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${_A}/${MACHINE_ARCH} SRCS+= opensolaris_atomic.S .else SRCS+= opensolaris_atomic.c Modified: user/imp/tbemd/sys/modules/zfs/Makefile ============================================================================== --- user/imp/tbemd/sys/modules/zfs/Makefile Mon Aug 23 06:00:21 2010 (r211688) +++ user/imp/tbemd/sys/modules/zfs/Makefile Mon Aug 23 06:06:55 2010 (r211689) @@ -27,11 +27,12 @@ SRCS+= opensolaris_uio.c SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64" || ${MACHINE_CPUARCH} == "sparc64" -.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_CPUARCH} +_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic +.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S) +.PATH: ${_A}/${MACHINE_CPUARCH} SRCS+= opensolaris_atomic.S -.elif ${MACHINE_ARCH} == "powerpc64" -.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${_A}/${MACHINE_ARCH} SRCS+= opensolaris_atomic.S .else SRCS+= opensolaris_atomic.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008230606.o7N66t0L029158>