From owner-svn-src-head@FreeBSD.ORG Tue Jan 11 14:58:42 2011 Return-Path: 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 B601B1065679; Tue, 11 Jan 2011 14:58:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 86E908FC14; Tue, 11 Jan 2011 14:58:42 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 38F6546B1A; Tue, 11 Jan 2011 09:58:42 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 74E588A01D; Tue, 11 Jan 2011 09:58:41 -0500 (EST) From: John Baldwin To: Doug Barton Date: Tue, 11 Jan 2011 08:47:24 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201101092347.p09NlB4M060802@svn.freebsd.org> <201101101433.18847.jhb@freebsd.org> <4D2BE4F8.3030902@FreeBSD.org> In-Reply-To: <4D2BE4F8.3030902@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201101110847.24284.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Tue, 11 Jan 2011 09:58:41 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jan 2011 14:58:42 -0000 On Tuesday, January 11, 2011 12:04:56 am 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." Huh? Warner's change only used MACHINE_CPUARCH: ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/} Nowhere in that line is MACHINE_ARCH used. Only MACHINE_CPUARCH is used. > 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. 209886 did not use MACHINE_CPUARCH for ISC_ATOMIC_ARCH, and in fact the file is now back to the 209886 state (nwhitehorn did not change ISC_ATOMIC_ARCH to use MACHINE_CPUARCH). Fixing this does create diffs to [78] because MACHINE_CPUARCH is not present at all in [78], but that is because [78]'s handling of different endians for mips, arm, etc. is deficient. You are likely stuck with using MACHINE_CPUARCH for 9+ and MACHINE_ARCH for <= 8. -- John Baldwin