From owner-svn-src-all@freebsd.org Fri Jan 27 21:31:33 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B92B6CC471F; Fri, 27 Jan 2017 21:31:33 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68B92233; Fri, 27 Jan 2017 21:31:33 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0RLVWID003960; Fri, 27 Jan 2017 21:31:32 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0RLVWdo003957; Fri, 27 Jan 2017 21:31:32 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201701272131.v0RLVWdo003957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 27 Jan 2017 21:31:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r312899 - in head/contrib: binutils/gas/config gcc/config/mips X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2017 21:31:33 -0000 Author: emaste Date: Fri Jan 27 21:31:32 2017 New Revision: 312899 URL: https://svnweb.freebsd.org/changeset/base/312899 Log: add octeon+ as an alias for octeon in GCC & binutils In r208737 jmallett@ 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. PR: 216516 MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/contrib/binutils/gas/config/tc-mips.c head/contrib/gcc/config/mips/mips.c head/contrib/gcc/config/mips/mips.h Modified: head/contrib/binutils/gas/config/tc-mips.c ============================================================================== --- head/contrib/binutils/gas/config/tc-mips.c Fri Jan 27 21:26:23 2017 (r312898) +++ head/contrib/binutils/gas/config/tc-mips.c Fri Jan 27 21:31:32 2017 (r312899) @@ -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: head/contrib/gcc/config/mips/mips.c ============================================================================== --- head/contrib/gcc/config/mips/mips.c Fri Jan 27 21:26:23 2017 (r312898) +++ head/contrib/gcc/config/mips/mips.c Fri Jan 27 21:31:32 2017 (r312899) @@ -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: head/contrib/gcc/config/mips/mips.h ============================================================================== --- head/contrib/gcc/config/mips/mips.h Fri Jan 27 21:26:23 2017 (r312898) +++ head/contrib/gcc/config/mips/mips.h Fri Jan 27 21:31:32 2017 (r312899) @@ -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); \