From owner-svn-src-user@FreeBSD.ORG Mon Aug 23 14:11:49 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1783106564A; Mon, 23 Aug 2010 14:11:49 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from adsum.doit.wisc.edu (adsum.doit.wisc.edu [144.92.197.210]) by mx1.freebsd.org (Postfix) with ESMTP id 838358FC0A; Mon, 23 Aug 2010 14:11:49 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII; format=flowed Received: from avs-daemon.smtpauth1.wiscmail.wisc.edu by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0L7L00700WNOJ200@smtpauth1.wiscmail.wisc.edu>; Mon, 23 Aug 2010 08:11:48 -0500 (CDT) Received: from comporellon.tachypleus.net (adsl-75-50-89-87.dsl.mdsnwi.sbcglobal.net [75.50.89.87]) by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0L7L00J57WNMNP40@smtpauth1.wiscmail.wisc.edu>; Mon, 23 Aug 2010 08:11:47 -0500 (CDT) Date: Mon, 23 Aug 2010 08:11:46 -0500 From: Nathan Whitehorn In-reply-to: <201008230606.o7N66t0L029158@svn.freebsd.org> To: Warner Losh Message-id: <4C727392.2050805@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=75.50.89.87 X-Spam-PmxInfo: Server=avs-14, Version=5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.8.23.130315, SenderIP=75.50.89.87 References: <201008230606.o7N66t0L029158@svn.freebsd.org> User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.11) Gecko/20100729 Thunderbird/3.0.6 Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r211689 - in user/imp/tbemd/sys/modules: opensolaris zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2010 14:11:49 -0000 On 08/23/10 01:06, Warner Losh wrote: > 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 > Are you sure you want to prefer CPUARCH over ARCH here? Were we ever to grow support for these atomics on 32-bit powerpc, for instance, this code would pick the wrong source files on a 64-bit build. -Nathan