d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MF tbemd: Minor tweaks, prefer MACHINE_CPUARCH generally to MACHINE_ARCH

Browse Source
This commit is contained in:
imp 2010-08-23 01:42:09 +00:00
parent b0b888fbfe
commit 39fcadc28d
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/i386/Makefile.inc
View File

@ -9,7 +9,7 @@ CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \
-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
LDFLAGS+= -nostdlib LDFLAGS+= -nostdlib
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -m32 -march=i386 CFLAGS+= -m32 -march=i386
LDFLAGS+= -m elf_i386_fbsd LDFLAGS+= -m elf_i386_fbsd
AFLAGS+= --32 AFLAGS+= --32

2
sys/boot/i386/boot2/Makefile
View File

@ -99,7 +99,7 @@ boot2.h: boot1.out
ORG1=`printf "%d" ${ORG1}` \ ORG1=`printf "%d" ${ORG1}` \
REL1=`printf "%d" ${REL1}` > ${.TARGET} REL1=`printf "%d" ${REL1}` > ${.TARGET}
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend boot2.s: machine beforedepend boot2.s: machine
CLEANFILES+= machine CLEANFILES+= machine
machine: machine:

2
sys/boot/i386/gptboot/Makefile
View File

@ -67,7 +67,7 @@ gptboot.out: ${BTXCRT} gptboot.o sio.o
gptboot.o: ${.CURDIR}/../../common/ufsread.c gptboot.o: ${.CURDIR}/../../common/ufsread.c
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend gptboot.o: machine beforedepend gptboot.o: machine
CLEANFILES+= machine CLEANFILES+= machine
machine: machine:

2
sys/boot/i386/gptzfsboot/Makefile
View File

@ -64,7 +64,7 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o
zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend zfsboot.o: machine beforedepend zfsboot.o: machine
CLEANFILES+= machine CLEANFILES+= machine
machine: machine:

4
sys/boot/i386/libfirewire/Makefile
View File

@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../libi386
CFLAGS+= -Wformat -Wall CFLAGS+= -Wformat -Wall
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine CLEANFILES+= machine
machine: machine:
ln -sf ${.CURDIR}/../../../i386/include machine ln -sf ${.CURDIR}/../../../i386/include machine
@ -24,7 +24,7 @@ machine:
.include <bsd.lib.mk> .include <bsd.lib.mk>
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine beforedepend ${OBJS}: machine
.endif .endif

4
sys/boot/i386/libi386/Makefile
View File

@ -53,7 +53,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \
# the location of libstand # the location of libstand
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
CLEANFILES+= machine CLEANFILES+= machine
machine: machine:
ln -sf ${.CURDIR}/../../../i386/include machine ln -sf ${.CURDIR}/../../../i386/include machine
@ -61,6 +61,6 @@ machine:
.include <bsd.lib.mk> .include <bsd.lib.mk>
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine beforedepend ${OBJS}: machine
.endif .endif

2
sys/boot/i386/loader/Makefile
View File

@ -119,7 +119,7 @@ LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
.include <bsd.prog.mk> .include <bsd.prog.mk>
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend ${OBJS}: machine beforedepend ${OBJS}: machine
CLEANFILES+= machine CLEANFILES+= machine
machine: machine:

2
sys/boot/i386/zfsboot/Makefile
View File

@ -98,7 +98,7 @@ zfsboot.h: zfsldr.out
ORG1=`printf "%d" ${ORG1}` \ ORG1=`printf "%d" ${ORG1}` \
REL1=`printf "%d" ${REL1}` > ${.TARGET} REL1=`printf "%d" ${REL1}` > ${.TARGET}
.if ${MACHINE_ARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
beforedepend zfsboot.s: machine beforedepend zfsboot.s: machine
CLEANFILES+= machine CLEANFILES+= machine
machine: machine: