Date: Mon, 23 Aug 2010 01:42:09 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211677 - in head/sys/boot/i386: . boot2 gptboot gptzfsboot libfirewire libi386 loader zfsboot Message-ID: <201008230142.o7N1g92E023137@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Aug 23 01:42:09 2010 New Revision: 211677 URL: http://svn.freebsd.org/changeset/base/211677 Log: MF tbemd: Minor tweaks, prefer MACHINE_CPUARCH generally to MACHINE_ARCH Modified: head/sys/boot/i386/Makefile.inc head/sys/boot/i386/boot2/Makefile head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libfirewire/Makefile head/sys/boot/i386/libi386/Makefile head/sys/boot/i386/loader/Makefile head/sys/boot/i386/zfsboot/Makefile Modified: head/sys/boot/i386/Makefile.inc ============================================================================== --- head/sys/boot/i386/Makefile.inc Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/Makefile.inc Mon Aug 23 01:42:09 2010 (r211677) @@ -9,7 +9,7 @@ CFLAGS+= -ffreestanding -mpreferred-stac -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 LDFLAGS+= -nostdlib -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -march=i386 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 Modified: head/sys/boot/i386/boot2/Makefile ============================================================================== --- head/sys/boot/i386/boot2/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/boot2/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -99,7 +99,7 @@ boot2.h: boot1.out ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend boot2.s: machine CLEANFILES+= machine machine: Modified: head/sys/boot/i386/gptboot/Makefile ============================================================================== --- head/sys/boot/i386/gptboot/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/gptboot/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -67,7 +67,7 @@ gptboot.out: ${BTXCRT} gptboot.o sio.o gptboot.o: ${.CURDIR}/../../common/ufsread.c -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend gptboot.o: machine CLEANFILES+= machine machine: Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/gptzfsboot/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -64,7 +64,7 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio. zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboot.o: machine CLEANFILES+= machine machine: Modified: head/sys/boot/i386/libfirewire/Makefile ============================================================================== --- head/sys/boot/i386/libfirewire/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/libfirewire/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../libi386 CFLAGS+= -Wformat -Wall -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine @@ -24,7 +24,7 @@ machine: .include <bsd.lib.mk> -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine .endif Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/libi386/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -53,7 +53,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine @@ -61,6 +61,6 @@ machine: .include <bsd.lib.mk> -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine .endif Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/loader/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -119,7 +119,7 @@ LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZF .include <bsd.prog.mk> -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine CLEANFILES+= machine machine: Modified: head/sys/boot/i386/zfsboot/Makefile ============================================================================== --- head/sys/boot/i386/zfsboot/Makefile Mon Aug 23 01:37:55 2010 (r211676) +++ head/sys/boot/i386/zfsboot/Makefile Mon Aug 23 01:42:09 2010 (r211677) @@ -98,7 +98,7 @@ zfsboot.h: zfsldr.out ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboot.s: machine CLEANFILES+= machine machine:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008230142.o7N1g92E023137>