From owner-svn-src-head@FreeBSD.ORG  Wed Jan 12 00:05:18 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF63A1065670;
	Wed, 12 Jan 2011 00:05:18 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EDEF8FC1C;
	Wed, 12 Jan 2011 00:05:18 +0000 (UTC)
Received: from [127.0.0.1] (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id p0BIPGVV029097;
	Tue, 11 Jan 2011 11:25:16 -0700 (MST) (envelope-from imp@bsdimp.com)
Message-ID: <4D2CA08A.906@bsdimp.com>
Date: Tue, 11 Jan 2011 11:25:14 -0700
From: Warner Losh <imp@bsdimp.com>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.2.12) Gecko/20101029 Thunderbird/3.1.6
MIME-Version: 1.0
To: Doug Barton <dougb@freebsd.org>
References: <201101092347.p09NlB4M060802@svn.freebsd.org>
	<201101101433.18847.jhb@freebsd.org> <4D2BE4F8.3030902@FreeBSD.org>
In-Reply-To: <4D2BE4F8.3030902@FreeBSD.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, John Baldwin <jhb@freebsd.org>
Subject: Re: svn commit: r217213 - head/lib/bind
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jan 2011 00:05:19 -0000

On 01/10/2011 22:04, Doug Barton wrote:
> On 01/10/2011 11:33, John Baldwin wrote:
>> On Sunday, January 09, 2011 6:47:11 pm Doug Barton wrote:
>
>>>   # Use the right version of the atomic.h file from lib/isc
>>> -ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/}
>>> +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
>>
>> This should use MACHINE_CPUARCH instead of MACHINE_ARCH?
>
> When this block was first written I don't think _CPUARCH existed at 
> all, and/or had not been MFC'ed. Subsequently, nwhitehorn made the 
> change in r209886 to use _CPUARCH in both places, however the diff 
> from Warner's commit in r217071 (which is what I based my change on) 
> clearly showed _ARCH 
> (http://svn.freebsd.org/viewvc/base/head/lib/bind/config.mk?r1=209886&r2=217071). 
> So, I'm not sure where svn went sideways there, but it's definitely 
> "odd."
>
> I have no objection to putting it back to the state that it was in at 
> r209886, although frankly less diffs to RELENG_[78] without good 
> reason make my life easier.

yea, that's the right bias.  I did MFC the CPUARCH stuff to 8, but not to 7.

Warner
>
>
> Doug
>
> PS, this is just another reason why I prefer pre-commit review when 
> convenient ...
>
>
>>> +ISC_ATOMIC_ARCH=    x86_32
>>> +.else
>>> +ISC_ATOMIC_ARCH=    ${MACHINE_CPUARCH}
>>> +.endif
>>>
>>>   # Optional features
>>>   .if ${MK_BIND_LARGE_FILE} == "yes"
>>>
>>
>
>
>