From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE1C0138350 for ; Tue, 14 Apr 2020 18:29:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E08EE08F4; Tue, 14 Apr 2020 18:29:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33F2BE08F4 for ; Tue, 14 Apr 2020 18:29:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC64B34F31F for ; Tue, 14 Apr 2020 18:29:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89FEE1DA for ; Tue, 14 Apr 2020 18:29:51 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586888954.39e28f75d0308b0cd1f0d41457379510d2c322c4.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/arch/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/arch/mips.py X-VCS-Directories: catalyst/arch/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 39e28f75d0308b0cd1f0d41457379510d2c322c4 X-VCS-Branch: master Date: Tue, 14 Apr 2020 18:29:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9e6d3bb5-d04d-4c4c-bc71-ee27f82ef6f3 X-Archives-Hash: 8f9e64b47f8e9face1eb5644380dc8b1 commit: 39e28f75d0308b0cd1f0d41457379510d2c322c4 Author: Matt Turner gentoo org> AuthorDate: Mon Apr 13 04:00:48 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Apr 14 18:29:14 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=39e28f75 catalyst/arch: Add "r5k" to mips4 configurations I mistakenly thought -march=mips4 was synonymous with -march=r5k, but it actually meant r8k until 2015 when it changed to r10k. Rather than let others be confused (by removing the r10k configuration) just change the mips4 configs to r5k. Bug: https://bugs.gentoo.org/679386 Signed-off-by: Matt Turner gentoo.org> catalyst/arch/mips.py | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py index f162a334..b1a4b5dc 100644 --- a/catalyst/arch/mips.py +++ b/catalyst/arch/mips.py @@ -87,29 +87,29 @@ class arch_mips3_multilib(generic_mips64): generic_mips64.__init__(self,myspec) self.settings["COMMON_FLAGS"]="-O2 -march=mips3 -mplt -mfix-r4000 -mfix-r4400 -pipe" -class arch_mips4(generic_mips): +class arch_mips4_r5k(generic_mips): "Builder class for MIPS IV [Big-endian]" def __init__(self,myspec): generic_mips.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mabi=32 -mplt -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=32 -mplt -pipe" -class arch_mips4_n32(generic_mips64): +class arch_mips4_r5k_n32(generic_mips64): "Builder class for MIPS IV [Big-endian N32]" def __init__(self,myspec): generic_mips64.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mabi=n32 -mplt -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=n32 -mplt -pipe" -class arch_mips4_n64(generic_mips64): +class arch_mips4_r5k_n64(generic_mips64): "Builder class for MIPS IV [Big-endian N64]" def __init__(self,myspec): generic_mips64.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mabi=64 -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=64 -pipe" -class arch_mips4_multilib(generic_mips64): +class arch_mips4_r5k_multilib(generic_mips64): "Builder class for MIPS IV [Big-endian multilib]" def __init__(self,myspec): generic_mips64.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mplt -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mplt -pipe" class arch_mips4_r10k(generic_mips): "Builder class for MIPS IV R10k [Big-endian]" @@ -317,29 +317,29 @@ class arch_loongson2f_multilib(generic_mips64el): generic_mips64el.__init__(self,myspec) self.settings["COMMON_FLAGS"]="-O2 -march=loongson2f -mplt -Wa,-mfix-loongson2f-nop -pipe" -class arch_mipsel4(generic_mipsel): +class arch_mipsel4_r5k(generic_mipsel): "Builder class for MIPS IV [Little-endian]" def __init__(self,myspec): generic_mipsel.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mabi=32 -mplt -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=32 -mplt -pipe" -class arch_mipsel4_n32(generic_mips64el): +class arch_mipsel4_r5k_n32(generic_mips64el): "Builder class for MIPS IV [Little-endian N32]" def __init__(self,myspec): generic_mips64el.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mabi=n32 -mplt -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=n32 -mplt -pipe" -class arch_mipsel4_n64(generic_mips64el): +class arch_mipsel4_r5k_n64(generic_mips64el): "Builder class for MIPS IV [Little-endian N64]" def __init__(self,myspec): generic_mips64el.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mabi=64 -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mabi=64 -pipe" -class arch_mipsel4_multilib(generic_mips64el): +class arch_mipsel4_r5k_multilib(generic_mips64el): "Builder class for MIPS IV [Little-endian multilib]" def __init__(self,myspec): generic_mips64el.__init__(self,myspec) - self.settings["COMMON_FLAGS"]="-O2 -march=mips4 -mplt -pipe" + self.settings["COMMON_FLAGS"]="-O2 -march=r5k -mplt -pipe" class arch_mips64el(generic_mipsel): "Builder class for MIPS 64 [Little-endian]" @@ -440,10 +440,10 @@ def register(): "mips3_n32" : arch_mips3_n32, "mips3_n64" : arch_mips3_n64, "mips3_multilib" : arch_mips3_multilib, - "mips4" : arch_mips4, - "mips4_n32" : arch_mips4_n32, - "mips4_n64" : arch_mips4_n64, - "mips4_multilib" : arch_mips4_multilib, + "mips4_r5k" : arch_mips4_r5k, + "mips4_r5k_n32" : arch_mips4_r5k_n32, + "mips4_r5k_n64" : arch_mips4_r5k_n64, + "mips4_r5k_multilib" : arch_mips4_r5k_multilib, "mips4_r10k" : arch_mips4_r10k, "mips4_r10k_n32" : arch_mips4_r10k_n32, "mips4_r10k_n64" : arch_mips4_r10k_n64, @@ -470,10 +470,10 @@ def register(): "mipsel3_n32" : arch_mipsel3_n32, "mipsel3_n64" : arch_mipsel3_n64, "mipsel3_multilib" : arch_mipsel3_multilib, - "mipsel4" : arch_mipsel4, - "mipsel4_n32" : arch_mipsel4_n32, - "mipsel4_n64" : arch_mipsel4_n64, - "mipsel4_multilib" : arch_mipsel4_multilib, + "mipsel4_r5k" : arch_mipsel4_r5k, + "mipsel4_r5k_n32" : arch_mipsel4_r5k_n32, + "mipsel4_r5k_n64" : arch_mipsel4_r5k_n64, + "mipsel4_r5k_multilib" : arch_mipsel4_r5k_multilib, "mips64el" : arch_mips64el, "mips64el_n32" : arch_mips64el_n32, "mips64el_n64" : arch_mips64el_n64,