From owner-freebsd-stable@FreeBSD.ORG  Fri May 29 13:49:33 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B683E106566C;
	Fri, 29 May 2009 13:49:33 +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 894F88FC18;
	Fri, 29 May 2009 13:49:33 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id 3FFA646C1F;
	Fri, 29 May 2009 09:49:33 -0400 (EDT)
Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8])
	by bigwig.baldwin.cx (Postfix) with ESMTPA id DD5788A029;
	Fri, 29 May 2009 09:49:31 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: freebsd-stable@freebsd.org
Date: Fri, 29 May 2009 09:16:31 -0400
User-Agent: KMail/1.9.7
References: <4A1D4A13.7030702@icyb.net.ua> <4A1D6DA3.40005@freebsd.org>
	<4A1FD724.4000503@freebsd.org>
In-Reply-To: <4A1FD724.4000503@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200905290916.32124.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Fri, 29 May 2009 09:49:32 -0400 (EDT)
X-Virus-Scanned: clamav-milter 0.95 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE
	autolearn=no version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: Doug Rabson <dfr@rabson.org>, Kip Macy <kmacy@freebsd.org>,
	Andriy Gapon <avg@freebsd.org>
Subject: Re: on 'btxld: zfsboot.ldr: Invalid argument' again
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2009 13:49:34 -0000

On Friday 29 May 2009 8:37:56 am Andriy Gapon wrote:
> 
> So anybody else feels that the below should be committed?
> Most probably modulo __FreeBSD_version bump because it has just got bumped 
in
> stable/7 for a different reason.

Yes.
 
> > diff --git a/Makefile.inc1 b/Makefile.inc1
> > index 119ba09..5071065 100644
> > --- a/Makefile.inc1
> > +++ b/Makefile.inc1
> > @@ -985,7 +985,7 @@ build-tools:
> >  #
> >  # cross-tools: Build cross-building tools
> >  #
> > -.if ${TARGET_ARCH} != ${MACHINE_ARCH}
> > +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102
> >  .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
> >  _btxld=		usr.sbin/btxld
> >  .endif

-- 
John Baldwin