svn commit: r217213 - head/lib/bind

John Baldwin jhb at freebsd.org
Tue Jan 11 14:58:42 UTC 2011


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


More information about the svn-src-head mailing list