summaryrefslogtreecommitdiffstats
path: root/contrib/binutils
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2017-03-03 00:39:29 +0000
committeremaste <emaste@FreeBSD.org>2017-03-03 00:39:29 +0000
commitc92da57c43b8d5b4efdfcb0c5c23bd5ad089f47a (patch)
treecc9b8357621bbe1c7c2c25fd14b6891e021295f7 /contrib/binutils
parente80ebe3963280798bf09421ffe774092ea3963e2 (diff)
downloadFreeBSD-src-c92da57c43b8d5b4efdfcb0c5c23bd5ad089f47a.zip
FreeBSD-src-c92da57c43b8d5b4efdfcb0c5c23bd5ad089f47a.tar.gz
MFC r312899: add octeon+ as an alias for octeon in GCC & binutils
r208737 added support for the "mips64r2" architecture and "octeon" CPU, and the saa/saad instructions. Upstream binutils also added the "octeon+" CPU, and the saa/saad instructions are only available in octeon+, not octeon. Since our base system tool chain already accepts saa/saad with -march=octeon, just allow octeon+ as an alias. This allows the use of octeon+ in kernel config files, for use with both external tool chain and in-tree GCC/binutils. Also includes GCC FBSD_CC_VER bump (r313041 in HEAD) PR: 216516 Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'contrib/binutils')
-rw-r--r--contrib/binutils/gas/config/tc-mips.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/binutils/gas/config/tc-mips.c b/contrib/binutils/gas/config/tc-mips.c
index 80fdfd0..d1f745e 100644
--- a/contrib/binutils/gas/config/tc-mips.c
+++ b/contrib/binutils/gas/config/tc-mips.c
@@ -15156,6 +15156,7 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
/* Cavium Networks Octeon CPU core */
{ "octeon", 0, ISA_MIPS64R2, CPU_OCTEON },
+ { "octeon+", 0, ISA_MIPS64R2, CPU_OCTEON },
/* End marker */
{ NULL, 0, 0, 0 }
OpenPOWER on IntegriCloud