From owner-svn-src-all@FreeBSD.ORG Mon Nov 24 22:30:48 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A70381065673 for ; Mon, 24 Nov 2008 22:30:48 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.29]) by mx1.freebsd.org (Postfix) with ESMTP id 540CF8FC19 for ; Mon, 24 Nov 2008 22:30:48 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: by yw-out-2324.google.com with SMTP id 9so943269ywe.13 for ; Mon, 24 Nov 2008 14:30:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:cc:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:mime-version :subject:date:references:x-mailer; bh=BAkSsm05knhhSecAweLrihmfjm8Pik7zyrXWgI1bfFc=; b=f138MjnB7EGubl4mYNfL+JKJgZ80QlVhOSiTStzNfVHWXEfxlMsYWkKHfc7iccgHtR 1Z16UQosXsodde80MTgKmwKoa342cKEXeEs9Exp9grU2wmy29mFgq6Ex6rF2DcPQVhzw 2uBkXOJgzKTpZzI0znaAM4B8/Do+92I6jd15A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=cc:message-id:from:to:in-reply-to:content-type :content-transfer-encoding:mime-version:subject:date:references :x-mailer; b=Ezrd3djr9t2auBhNl+Tipry8XeIvmvpKNdltwVqboRFUKJttCFTSm3kKT6t2t/261s wM2WcTX25jUEKemPeKLvItrmI1ZP1CrYC+1CvChSWGLk2ToeehgBMDpG/+w+7UK1KrdT CEPaFtZFl4LeYEBVtZH99ScYJ+8dovqqu4Q/Y= Received: by 10.142.12.14 with SMTP id 14mr1853097wfl.203.1227563972454; Mon, 24 Nov 2008 13:59:32 -0800 (PST) Received: from ?192.168.10.3? (adsl-76-254-6-199.dsl.pltn13.sbcglobal.net [76.254.6.199]) by mx.google.com with ESMTPS id 28sm5717245wfd.14.2008.11.24.13.59.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 Nov 2008 13:59:31 -0800 (PST) Message-Id: <51761B1A-17DD-493A-8F2F-FEA8AFCC17DB@gmail.com> From: Garrett Cooper To: Doug Rabson In-Reply-To: <200811221424.mAMEOtVt020067@svn.freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v929.2) Date: Mon, 24 Nov 2008 14:03:07 -0800 References: <200811221424.mAMEOtVt020067@svn.freebsd.org> X-Mailer: Apple Mail (2.929.2) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r185175 - in head/sys/boot: i386 i386/gptzfsboot zfs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2008 22:30:48 -0000 On Nov 22, 2008, at 6:24 AM, Doug Rabson wrote: > Author: dfr > Date: Sat Nov 22 14:24:55 2008 > New Revision: 185175 > URL: http://svn.freebsd.org/changeset/base/185175 > > Log: > Fix amd64 build and re-enable gptzfsboot. > > Modified: > head/sys/boot/i386/Makefile > head/sys/boot/i386/gptzfsboot/Makefile > head/sys/boot/zfs/Makefile > > Modified: head/sys/boot/i386/Makefile > = > = > = > = > = > = > = > = > ====================================================================== > --- head/sys/boot/i386/Makefile Sat Nov 22 13:33:06 2008 (r185174) > +++ head/sys/boot/i386/Makefile Sat Nov 22 14:24:55 2008 (r185175) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ > - kgzldr libi386 libfirewire loader > + gptzfsboot kgzldr libi386 libfirewire loader > > # special boot programs, 'self-extracting boot2+loader' > SUBDIR+= pxeldr > > Modified: head/sys/boot/i386/gptzfsboot/Makefile > = > = > = > = > = > = > = > = > ====================================================================== > --- head/sys/boot/i386/gptzfsboot/Makefile Sat Nov 22 13:33:06 2008 > (r185174) > +++ head/sys/boot/i386/gptzfsboot/Makefile Sat Nov 22 14:24:55 2008 > (r185175) > @@ -65,7 +65,7 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio. > zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c > > .if ${MACHINE_ARCH} == "amd64" > -beforedepend gptzfsboot.o: machine > +beforedepend zfsboot.o: machine > CLEANFILES+= machine > machine: > ln -sf ${.CURDIR}/../../../i386/include machine > > Modified: head/sys/boot/zfs/Makefile > = > = > = > = > = > = > = > = > ====================================================================== > --- head/sys/boot/zfs/Makefile Sat Nov 22 13:33:06 2008 (r185174) > +++ head/sys/boot/zfs/Makefile Sat Nov 22 14:24:55 2008 (r185175) > @@ -9,10 +9,20 @@ CFLAGS+= -I${.CURDIR}/../common -I${.CUR > CFLAGS+= -I${.CURDIR}/../../../lib/libstand > CFLAGS+= -I${.CURDIR}/../../cddl/boot/zfs > > -# XXX need arch-specific bootstrap CFLAGS here > -# > -CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ > - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 > +CFLAGS+= -ffreestanding > +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" > +CFLAGS+= -mpreferred-stack-boundary=2 > +CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 > +.endif > +.if ${MACHINE_ARCH} == "i386" > +CFLAGS+= -mno-sse3 > +.endif > +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" > +CFLAGS+= -msoft-float > +.endif > +.if ${MACHINE_ARCH} == "amd64" > +CFLAGS+= -m32 -march=i386 > +.endif > > CFLAGS+= -Wformat -Wall What about http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/129059 ? I didn't realize that gptzfsboot wasn't available for amd64. -Garrett