diff options
| author | imp <imp@FreeBSD.org> | 2010-08-23 22:24:11 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-08-23 22:24:11 +0000 |
| commit | c3a399c4ba4528500fec8cd412c88c10c7f637f5 (patch) | |
| tree | 3fedc9e4d65d62c819fe8818c625211ebbd8ef26 /sys | |
| parent | a1a6e5ff56d4b37557fc8a042de19bfc7560dc8e (diff) | |
| download | FreeBSD-src-c3a399c4ba4528500fec8cd412c88c10c7f637f5.zip FreeBSD-src-c3a399c4ba4528500fec8cd412c88c10c7f637f5.tar.gz | |
MFtbemd:
Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want
to test of all the CPUs of a given family conform.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/arm/ixp425/boot2/Makefile | 2 | ||||
| -rw-r--r-- | sys/conf/kern.post.mk | 4 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/arm/ixp425/boot2/Makefile b/sys/boot/arm/ixp425/boot2/Makefile index 138446b..a329b65 100644 --- a/sys/boot/arm/ixp425/boot2/Makefile +++ b/sys/boot/arm/ixp425/boot2/Makefile @@ -20,7 +20,7 @@ NO_MAN= KERNPHYSADDR=0x180000 KERNVIRTADDR=${KERNPHYSADDR} BOOT_STACK=0x200000-4 -M=${MACHINE_ARCH} +M=${MACHINE} LDFLAGS=-e ${KERNPHYSADDR} -EB -T ldscript.${M} OBJS+= ${SRCS:N*.h:R:S/$/.o/g} S=${.CURDIR}/../../../.. diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index f759f27..c7e6281 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -84,8 +84,8 @@ gdbinit: grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \ sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit cp ${S}/../tools/debugscripts/gdbinit.kernel ${.CURDIR} -.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH}) - cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \ +.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH}) + cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH} \ ${.CURDIR}/gdbinit.machine .endif .endif diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index b61113e..d4bdc1f 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -32,7 +32,7 @@ CTFFLAGS+= -g . else _MINUS_O= -O2 . endif -. if ${MACHINE_ARCH} == "amd64" +. if ${MACHINE_CPUARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe . else COPTFLAGS?=${_MINUS_O} -pipe |
