From c92da57c43b8d5b4efdfcb0c5c23bd5ad089f47a Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 3 Mar 2017 00:39:29 +0000 Subject: 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 --- contrib/gcc/config/mips/mips.c | 1 + contrib/gcc/config/mips/mips.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'contrib/gcc') diff --git a/contrib/gcc/config/mips/mips.c b/contrib/gcc/config/mips/mips.c index faa4e46..5a7792c 100644 --- a/contrib/gcc/config/mips/mips.c +++ b/contrib/gcc/config/mips/mips.c @@ -765,6 +765,7 @@ const struct mips_cpu_info mips_cpu_info_table[] = { /* MIPS64R2 */ { "octeon", PROCESSOR_OCTEON, 65 }, + { "octeon+", PROCESSOR_OCTEON, 65 }, /* End marker */ { 0, 0, 0 } diff --git a/contrib/gcc/config/mips/mips.h b/contrib/gcc/config/mips/mips.h index 1ba1402..cba35a2 100644 --- a/contrib/gcc/config/mips/mips.h +++ b/contrib/gcc/config/mips/mips.h @@ -285,7 +285,10 @@ extern const struct mips_rtx_cost_data *mips_cost; \ macro = concat ((PREFIX), "_", (INFO)->name, NULL); \ for (p = macro; *p != 0; p++) \ - *p = TOUPPER (*p); \ + if (*p == '+') \ + *p = 'P'; \ + else \ + *p = TOUPPER (*p); \ \ builtin_define (macro); \ builtin_define_with_value ((PREFIX), (INFO)->name, 1); \ -- cgit v1.1