Date: Sat, 22 Nov 2008 14:24:55 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185175 - in head/sys/boot: i386 i386/gptzfsboot zfs Message-ID: <200811221424.mAMEOtVt020067@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811221424.mAMEOtVt020067>