summaryrefslogtreecommitdiffstats
path: root/share/mk/bsd.cpu.mk
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2015-11-19 03:11:20 +0000
committerimp <imp@FreeBSD.org>2015-11-19 03:11:20 +0000
commit952142b8429e4692b0fa3c8ce70a9fd5e27809b7 (patch)
tree387cfff44ed000f9b90fbba35c343007a7ff43c2 /share/mk/bsd.cpu.mk
parent9bab3f871aeef517fd2db9aa6487ad6417be3479 (diff)
downloadFreeBSD-src-952142b8429e4692b0fa3c8ce70a9fd5e27809b7.zip
FreeBSD-src-952142b8429e4692b0fa3c8ce70a9fd5e27809b7.tar.gz
Fix mips CPUTYPE so that we can pass it through to gcc.
Keep old CPUTYPEs around for compatibility. Also include a list of typical values for FreeBSD. # Split out from other changes in D4155 Differential Revision: https://reviews.freebsd.org/D4155
Diffstat (limited to 'share/mk/bsd.cpu.mk')
-rw-r--r--share/mk/bsd.cpu.mk28
1 files changed, 15 insertions, 13 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 2cdf25f..cc1a74f 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -122,19 +122,18 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} -mno-powerpc64
. elif ${MACHINE_ARCH} == "powerpc64"
_CPUCFLAGS = -mcpu=${CPUTYPE}
. elif ${MACHINE_CPUARCH} == "mips"
-. if ${CPUTYPE} == "mips32"
-_CPUCFLAGS = -march=mips32
-. elif ${CPUTYPE} == "mips32r2"
-_CPUCFLAGS = -march=mips32r2
-. elif ${CPUTYPE} == "mips64"
-_CPUCFLAGS = -march=mips64
-. elif ${CPUTYPE} == "mips64r2"
-_CPUCFLAGS = -march=mips64r2
-. elif ${CPUTYPE} == "mips4kc"
-_CPUCFLAGS = -march=4kc
-. elif ${CPUTYPE} == "mips24kc"
-_CPUCFLAGS = -march=24kc
-. endif
+# mips[1234], mips32, mips64, and all later releases need to have mips
+# preserved (releases later than r2 require external toolchain)
+. if ${CPUTYPE:Mmips32*} != "" || ${CPUTYPE:Mmips64*} != "" || \
+ ${CPUTYPE:Mmips[1234]} != ""
+_CPUCFLAGS = -march=${CPUTYPE}
+. else
+# Default -march to the CPUTYPE passed in, with mips stripped off so we
+# accept either mips4kc or 4kc, mostly for historical reasons
+# Typical values for cores:
+# 4kc, 24kc, 34kc, 74kc, 1004kc, octeon, octeon+, octeon2, octeon3,
+# sb1, xlp, xlr
+_CPUCFLAGS = -march=${CPUTYPE:S/^mips//}
. elif ${MACHINE_ARCH} == "sparc64"
. if ${CPUTYPE} == "v9"
_CPUCFLAGS = -mcpu=v9
@@ -254,6 +253,9 @@ MACHINE_CPU = ssse3 sse3
MACHINE_CPU = sse3
. endif
MACHINE_CPU += amd64 sse2 sse mmx
+########## Mips
+. elif ${MACHINE_CPUARCH} == "mips"
+MACHINE_CPU = mips
########## powerpc
. elif ${MACHINE_ARCH} == "powerpc"
. if ${CPUTYPE} == "e500"
OpenPOWER on IntegriCloud