summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2011-01-07 20:26:33 +0000
committerimp <imp@FreeBSD.org>2011-01-07 20:26:33 +0000
commit54d5c7e86fd36ddd2ea33b3ec25fdc3e4b71f0f4 (patch)
tree12ed45fc5cc0930d7f4165ad7f223aba33b36162 /share/mk
parenta6ca4af56352f3a556f847fe386e74305fa0c2aa (diff)
downloadFreeBSD-src-54d5c7e86fd36ddd2ea33b3ec25fdc3e4b71f0f4.zip
FreeBSD-src-54d5c7e86fd36ddd2ea33b3ec25fdc3e4b71f0f4.tar.gz
Retire TARGET_ABI.
Implement MACHINE_ARCH=mips64e[lb] to build N64 images. This replaces MACHINE_ARCH=mipse[lb] TARGET_ABI=n64. MACHINE_ARCH=mipsn32e[lb] has been added, but currently requires WITHOUT_CDDL due to atomic issues in libzfs. I've not investigated this much, but implemented this to preserve as much of the TARGET_ABI functionality that I could. Since its presence doesn't affect the working cases, I've kept it in for now. Added mips64e[lb] to make universe, so more kernels build. And I think this (finally) closes the curtain on the tbemd tree.
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.endian.mk4
-rw-r--r--share/mk/sys.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
index 2bc75b0..c9e0e6b 100644
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -4,12 +4,12 @@
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "ia64" || \
${MACHINE_ARCH} == "arm" || \
- ${MACHINE_ARCH} == "mipsel"
+ ${MACHINE_ARCH:Mmips*el} != ""
TARGET_ENDIANNESS= 1234
.elif ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "powerpc64" || \
${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "armeb" || \
- ${MACHINE_ARCH} == "mipseb"
+ ${MACHINE_ARCH:Mmips*eb} != ""
TARGET_ENDIANNESS= 4321
.endif
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index a4b429b..1760573 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -13,7 +13,7 @@ unix ?= We run FreeBSD, not UNIX.
# and/or endian. This is called MACHINE_CPU in NetBSD, but that's used
# for something different in FreeBSD.
#
-MACHINE_CPUARCH=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+MACHINE_CPUARCH=${MACHINE_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
.endif
# If the special target .POSIX appears (without prerequisites or
OpenPOWER on IntegriCloud