Date: Fri, 3 Mar 2017 00:39:29 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314573 - in stable/11: contrib/binutils/gas/config contrib/gcc/config/mips gnu/usr.bin/cc/cc_tools Message-ID: <201703030039.v230dTug070794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Fri Mar 3 00:39:29 2017 New Revision: 314573 URL: https://svnweb.freebsd.org/changeset/base/314573 Log: 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 Modified: stable/11/contrib/binutils/gas/config/tc-mips.c stable/11/contrib/gcc/config/mips/mips.c stable/11/contrib/gcc/config/mips/mips.h stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/binutils/gas/config/tc-mips.c ============================================================================== --- stable/11/contrib/binutils/gas/config/tc-mips.c Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/contrib/binutils/gas/config/tc-mips.c Fri Mar 3 00:39:29 2017 (r314573) @@ -15156,6 +15156,7 @@ static const struct mips_cpu_info mips_c /* Cavium Networks Octeon CPU core */ { "octeon", 0, ISA_MIPS64R2, CPU_OCTEON }, + { "octeon+", 0, ISA_MIPS64R2, CPU_OCTEON }, /* End marker */ { NULL, 0, 0, 0 } Modified: stable/11/contrib/gcc/config/mips/mips.c ============================================================================== --- stable/11/contrib/gcc/config/mips/mips.c Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/contrib/gcc/config/mips/mips.c Fri Mar 3 00:39:29 2017 (r314573) @@ -765,6 +765,7 @@ const struct mips_cpu_info mips_cpu_info /* MIPS64R2 */ { "octeon", PROCESSOR_OCTEON, 65 }, + { "octeon+", PROCESSOR_OCTEON, 65 }, /* End marker */ { 0, 0, 0 } Modified: stable/11/contrib/gcc/config/mips/mips.h ============================================================================== --- stable/11/contrib/gcc/config/mips/mips.h Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/contrib/gcc/config/mips/mips.h Fri Mar 3 00:39:29 2017 (r314573) @@ -285,7 +285,10 @@ extern const struct mips_rtx_cost_data * \ 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); \ Modified: stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h ============================================================================== --- stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h Thu Mar 2 23:23:28 2017 (r314572) +++ stable/11/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Mar 3 00:39:29 2017 (r314573) @@ -8,7 +8,7 @@ /* Fake out gcc/config/freebsd<version>.h. */ #define FBSD_MAJOR 11 -#define FBSD_CC_VER 1100002 /* form like __FreeBSD_version */ +#define FBSD_CC_VER 1100003 /* form like __FreeBSD_version */ #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ #undef TOOL_INCLUDE_DIR /* We don't need one for now. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703030039.v230dTug070794>