From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2116.outbound.protection.outlook.com [40.107.215.116]) by sourceware.org (Postfix) with ESMTPS id CAB613831E0B for ; Fri, 16 Jun 2023 06:34:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAB613831E0B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=cipunited.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cipunited.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NTuTfxKQhHyC8zh9zTLtfhC30iGhJ8TSddaOrpPFh4eUjAzmfmdv2fWyDwLl9T/tnGnhHem2TSs6KQozS9/9qFlvKRtW588wfPO3A0m7+Gwx6FJ2dNTeaKYvHdtLmQWZ60tp7UOiY0BRyU1TX0Erjb1s+T/uHWawzAjSpM/veOvVK/8UkHFRyM+VI4h7y9zklH1cCsoUfwGgbwPDpgd3AF8LGdxRxbTJX0imGZljbCWBKD2klzeYSL833I5RaVb/T9RnJprAWTXVveQEcn2/YWPA2pSafPoll8fKeeCxxEc2kmR0StDdsDT4VZD8QUJ5Z+zbwf9FB0wDz499Ze5p6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SeJzZEMzm3xPPQLlanF9TggppGlFTdN7Tai0DuOl0bc=; b=YFDGcsKFHzbogG1NTr559gP5MzJ84RUVlYIXhIJ2U5ZL6tkZiOp7xi6bMGSC1l8vRH0zEzyXhU33MDW3xOzH3sMzMEGVmrM8GNCt0iRKH9vjcYrfJvQYw8m8muFq3SfoE+Ht9Zle46sdPf278Whb2qLESNh6+4MrSPpi7XS+DEyvel03/7Skblk+F4AVW081X2cnSASXv+Xi5gi58y2ssnIUMtJLiGPkQckTHQm5lxDUewwhkzDdD6kMuR7NgWnuDjTh7e11l5wfaZ8G8X9JVYJKxR/pnp3OBWGFOryY0/llPmLUp1uOBgMf4TSiTNLPgGdvNqRzC/hXEB8h4L5mEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cipunited.com; dmarc=pass action=none header.from=cipunited.com; dkim=pass header.d=cipunited.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cipunited.onmicrosoft.com; s=selector1-cipunited-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SeJzZEMzm3xPPQLlanF9TggppGlFTdN7Tai0DuOl0bc=; b=LYzzmiH8yILBQtAxXiogyDzD30HHwCi5u+EVVSr8O4lQP53Agynmr/qMSc7lE9GbatSzrgepicR4aHc7QaYAshXbqxeN56ccDR1uicMoPKIowTZBVL8ydTfOvUnFtApyTyF7SJkBSM9uKSZKeQJQ3iEnQ87fC5X0+XzvJ/Pk/C8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cipunited.com; Received: from SEZPR04MB6121.apcprd04.prod.outlook.com (2603:1096:101:98::10) by TYUPR04MB6911.apcprd04.prod.outlook.com (2603:1096:400:350::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.44; Fri, 16 Jun 2023 06:34:40 +0000 Received: from SEZPR04MB6121.apcprd04.prod.outlook.com ([fe80::8969:4dde:3fc5:33c9]) by SEZPR04MB6121.apcprd04.prod.outlook.com ([fe80::8969:4dde:3fc5:33c9%4]) with mapi id 15.20.6500.026; Fri, 16 Jun 2023 06:34:40 +0000 From: YunQiang Su To: binutils@sourceware.org Cc: macro@orcam.me.uk, paul.hua.gm@gmail.com, amodra@gmail.com, jbeulich@suse.com, YunQiang Su Subject: [PATCH v4 1/7] MIPS: Gas: alter 64 or 32 for mipsisa triples if march is implicit Date: Fri, 16 Jun 2023 14:34:06 +0800 Message-Id: <20230616063412.1715024-2-yunqiang.su@cipunited.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230616063412.1715024-1-yunqiang.su@cipunited.com> References: <20230616063412.1715024-1-yunqiang.su@cipunited.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2PR01CA0014.apcprd01.prod.exchangelabs.com (2603:1096:4:191::17) To SEZPR04MB6121.apcprd04.prod.outlook.com (2603:1096:101:98::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR04MB6121:EE_|TYUPR04MB6911:EE_ X-MS-Office365-Filtering-Correlation-Id: bd1f29c2-deb1-49a1-a535-08db6e33c33f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /i60o1rV4hT0DN3IZF/eWCQdW6o31jgL/YCv8L1A1K5+u8PIUScdBikHnL0ceAt8Ng/TgCayKFpARs0MRDluC+Vqd/dZzQCrH9u47xyzcAnIFpfRXLNiA4jkheZyiOVRhreq4pRzPKazEJGLy9t40b59FNPH4A5x+HWgz8K/VTnsuuFImVOzqZa/k3cQFoMPpCU5g6ud6uHAE9kwdFtQFG7MEhMhvfsBxNbA9sw3EWpBztuFfyAbaNPmJW/wktJBH+G/Yp96KrCli0vdEO+K9NksRsTE/mN+LXLdNdZGuE7kkW4M/pa8ChsH71WfJqCqj4y4ik+D6qcSL+BFqPNjHuq/+IM1Z9OhO38b4VqgdKXX+TYsP+TTJXaK7lz2M516DGoRJXAgyDwipSiyajOIEkkg5BtU9WfgbrtZGUO7niY0fERUwIBHuREqMRkaRJhlo00cAYbokeCy4Kzpt/SMxIXBSziE/Be48FbuP2PLSUZxux23TDU4ylKg5qCzEpb5b6OC9iAbXyy1V+vVbcvd8EmcDGoSFd3tZWX6IefrTJ+emMWzXqWlBf9hURN1ghg0q5mWh7azt9d44FdVybIDvNDt783cRYQAjV9BUuBZWF8X2WWKqYF+U1AeNubpI0p+ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR04MB6121.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(396003)(39830400003)(366004)(346002)(376002)(451199021)(36756003)(186003)(30864003)(2906002)(83380400001)(26005)(1076003)(6512007)(6506007)(66946007)(52116002)(41300700001)(6486002)(107886003)(316002)(8676002)(8936002)(5660300002)(86362001)(66476007)(2616005)(66556008)(4326008)(6916009)(38350700002)(38100700002)(478600001)(6666004);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nvH9IMrsFz9fpRtN7Pk/LIR8Vl7Ix7sD0u25UUH0RdRSStgT30I2VypY0nSR?= =?us-ascii?Q?UztA1cIxpWHpH/wM8h0WL5bQX4pJ/4qVHqr7qYN0ckZ5vJwDVzpIf2Xe1O8n?= =?us-ascii?Q?26baofU97hGDTx28schB1R6LhOr0pjRlXfPvRRdeiCu3yHsm8Lee+1uOUwad?= =?us-ascii?Q?lsG2NxaLihPiCc4AjOZh0l9UN3fOE/q6Ii7GJoO0bmwngvROAQkNBJKPqGKh?= =?us-ascii?Q?bhV/lfJxPAJVpiRv035NAIZGRv0RN/jQ1WzDvM0+mAF/umr3oh841b0xq/F2?= =?us-ascii?Q?xX4/cfrCcw5++OBtt1v8jGsMR0z2L96Qe/s4gdIlsEUGiuNGN5X8XjEeu986?= =?us-ascii?Q?UWZKxz/wg6T+r+HKav2eoP1baBn1/Zjpqn2z6Y5ytAK1BoxU1uwzUG3bkuoU?= =?us-ascii?Q?v+Uwyy1mOl7kx+z4nIztodptQj7QgDu4GmI1SbtCnKJjwZV2qvHEgU2Rd+KJ?= =?us-ascii?Q?PECN/7QXG4elWHRy846n5Msbf8VmdAQX6TpDrWRJzKov1jY4AZiqqeWMduRM?= =?us-ascii?Q?/tWzMYivZZUYbCLMAJsiDNb1ljE/EhVrVk6oS2Pn060XpqI6zIsH+yaqoUl4?= =?us-ascii?Q?bTqAS5ecsHmWGhuT3iqTAsMjFmCgCCXDYjm69f9NBqM1GgV6O5nfDoKE0HUJ?= =?us-ascii?Q?Fcz3Ec2fLgJ0YTDvc58nojFqqgh5rbngpHw1FCgGOpA3up4R3ofI0yBoOdaI?= =?us-ascii?Q?2MPA3RXBZjrgGkJhqMTu8ffWHDlyiKLrC67s6hy/rVYDgVD+UCYiruKx0725?= =?us-ascii?Q?a/Kr2YH2vzV9DKo6PZMKYS0c4kxK9wZLiVEWcplc84THu0cq8eA0oUJDem6/?= =?us-ascii?Q?S0/Gei2yvZcgfqRoeFegPsLuBvtY1hxvl1t56q/3ZOSAq4hNmF0MhD1JRJLM?= =?us-ascii?Q?DdUYdaIeUCtEavRNztuAEm4WbKoLMjhw0n7HNeztUtcfhHeRjhn+0NiTEHht?= =?us-ascii?Q?L4B3nyncpKbs9ktksw27xNhASWC26fdSHZ1k0p/PwJT1BxnFns624rggD9F8?= =?us-ascii?Q?TmX9f2hkG/ioKy9fOcoeUUBcYsSDOGtt3eQAVJdPxuvo9aw3/jMR+nyYXvLB?= =?us-ascii?Q?/6oEUXgINcqwbuwZPfkq6Bkf/ecxESRYMpJst4EYoCPUM2HbQ9+6lG5hWNBC?= =?us-ascii?Q?daA59WkfiLcfHVmD5mN7uW4QiJ++APEUFvSVIbqzl0zJNXEmQ1ROD+e9nXXf?= =?us-ascii?Q?KJ6EWpm6ERvEj2dlOuUnnh77CpLGUhSXjnXQWY736gpBe6bf1iP3JdY6ZwCO?= =?us-ascii?Q?mDRJR6+gE6JPUKDv+j9liwG3oOfZpNaIK3+/loNN/THJqgd22uErmVMYsuET?= =?us-ascii?Q?wlmHBVLq2GNxSqIdiotVPp2CZ9zA+u6LwruufU0kp13fHmDFLu+ZLeuTvIs6?= =?us-ascii?Q?TPjnFMNxlO9NrkMr8ppaM8HV1Kyppd7vfPuD1ogSU4vXsGQ25c8faUXARhW7?= =?us-ascii?Q?qSQUC+k/tEwYd/ufVT4YakQaR93IclEromv/pCloZhfLfqFM3J8M/e9ekNm+?= =?us-ascii?Q?r5rNT8+O3sulxbzzn+VZ7rX69nCvkIeWfIEzxttb0K9awqLmxBVRUSePLIhs?= =?us-ascii?Q?upi1pqtynLRlSEyLGKSP7p/87RprgDaJpGEhrDCutWzWlIFcuCmJJeGjylAK?= =?us-ascii?Q?hg=3D=3D?= X-OriginatorOrg: cipunited.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd1f29c2-deb1-49a1-a535-08db6e33c33f X-MS-Exchange-CrossTenant-AuthSource: SEZPR04MB6121.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 06:34:40.4180 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e31cf5b5-ee69-4d5f-9c69-edeeda2458c0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YAx93bHc13QdOowmOXLlF3EHCQL7Sg/AQzAzYVX3My6RDh9xrKXzXVpxsUCFjwsyGouwkI3/c/XTQuEVxfXk/IHj4y9b8cfdF0xBB5iB3u0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYUPR04MB6911 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: When GAS is configured with triples mipsisa[32,64]rN[el,], the default march value is pinned to a fix value. for example 1) mipsisa32r6-linux-gnu -n32 xx.s will complains that: -march=mips32r6 is not compatible with the selected ABI 2) mipsisa64r2el-linux-gnu -o32 generates objects with 64bit CPU: ELF 32-bit LSB relocatable, MIPS, MIPS64 rel2 version 1 (SYSV) They are not good default behaviors due to we are using them for regular Linux distributions, like Debian. So, let's alter march according to ABI. --- gas/config/tc-mips.c | 1003 +++++++++++++++++++++++++++---- gas/testsuite/gas/mips/mips.exp | 4 +- 2 files changed, 873 insertions(+), 134 deletions(-) diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index d6aae660abf..77eb6d1d10d 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -1430,11 +1430,13 @@ static void file_mips_check_options (void); struct mips_cpu_info { - const char *name; /* CPU or ISA name. */ - int flags; /* MIPS_CPU_* flags. */ - int ase; /* Set of ASEs implemented by the CPU. */ - int isa; /* ISA level. */ - int cpu; /* CPU number (default CPU if ISA). */ + const char *name; /* CPU or ISA name. */ + int flags; /* MIPS_CPU_* flags. */ + int ase; /* Set of ASEs implemented by the CPU. */ + int isa; /* ISA level. */ + int isa_32; /* Best matched 32bit ISA level. */ + int isa_64; /* Best matched 64bit ISA level. */ + int cpu; /* CPU number (default CPU if ISA). */ }; #define MIPS_CPU_IS_ISA 0x0001 /* Is this an ISA? (If 0, a CPU.) */ @@ -1442,6 +1444,7 @@ struct mips_cpu_info static const struct mips_cpu_info *mips_parse_cpu (const char *, const char *); static const struct mips_cpu_info *mips_cpu_info_from_isa (int); static const struct mips_cpu_info *mips_cpu_info_from_arch (int); +static const struct mips_cpu_info *mips_cpu_info_from_name (const char *); /* Command-line options. */ const char *md_shortopts = "O::g::G:"; @@ -19988,180 +19991,880 @@ s_mips_mask (int reg_type) static const struct mips_cpu_info mips_cpu_info_table[] = { /* Entries for generic ISAs. */ - { "mips1", MIPS_CPU_IS_ISA, 0, ISA_MIPS1, CPU_R3000 }, - { "mips2", MIPS_CPU_IS_ISA, 0, ISA_MIPS2, CPU_R6000 }, - { "mips3", MIPS_CPU_IS_ISA, 0, ISA_MIPS3, CPU_R4000 }, - { "mips4", MIPS_CPU_IS_ISA, 0, ISA_MIPS4, CPU_R8000 }, - { "mips5", MIPS_CPU_IS_ISA, 0, ISA_MIPS5, CPU_MIPS5 }, - { "mips32", MIPS_CPU_IS_ISA, 0, ISA_MIPS32, CPU_MIPS32 }, - { "mips32r2", MIPS_CPU_IS_ISA, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "mips32r3", MIPS_CPU_IS_ISA, 0, ISA_MIPS32R3, CPU_MIPS32R3 }, - { "mips32r5", MIPS_CPU_IS_ISA, 0, ISA_MIPS32R5, CPU_MIPS32R5 }, - { "mips32r6", MIPS_CPU_IS_ISA, 0, ISA_MIPS32R6, CPU_MIPS32R6 }, - { "mips64", MIPS_CPU_IS_ISA, 0, ISA_MIPS64, CPU_MIPS64 }, - { "mips64r2", MIPS_CPU_IS_ISA, 0, ISA_MIPS64R2, CPU_MIPS64R2 }, - { "mips64r3", MIPS_CPU_IS_ISA, 0, ISA_MIPS64R3, CPU_MIPS64R3 }, - { "mips64r5", MIPS_CPU_IS_ISA, 0, ISA_MIPS64R5, CPU_MIPS64R5 }, - { "mips64r6", MIPS_CPU_IS_ISA, 0, ISA_MIPS64R6, CPU_MIPS64R6 }, + { "mips1", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS1, + ISA_MIPS1, + ISA_MIPS3, + CPU_R3000 }, + { "mips2", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS2, + ISA_MIPS2, + ISA_MIPS3, + CPU_R6000 }, + { "mips3", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS3, + ISA_MIPS2, + ISA_MIPS3, + CPU_R4000 }, + { "mips4", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS4, + ISA_MIPS2, + ISA_MIPS4, + CPU_R8000 }, + { "mips5", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS5, + ISA_MIPS2, + ISA_MIPS5, + CPU_MIPS5 }, + { "mips32", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS32, + ISA_MIPS32, + ISA_MIPS64, + CPU_MIPS32 }, + { "mips32r2", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS32R2, + ISA_MIPS32R2, + ISA_MIPS64R2, + CPU_MIPS32R2 }, + { "mips32r3", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS32R3, + ISA_MIPS32R3, + ISA_MIPS64R3, + CPU_MIPS32R3 }, + { "mips32r5", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS32R5, + ISA_MIPS32R5, + ISA_MIPS64R5, + CPU_MIPS32R5 }, + { "mips32r6", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS32R6, + ISA_MIPS32R6, + ISA_MIPS64R6, + CPU_MIPS32R6 }, + { "mips64", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS64, + ISA_MIPS32, + ISA_MIPS64, + CPU_MIPS64 }, + { "mips64r2", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS64R2, + ISA_MIPS32R2, + ISA_MIPS64R2, + CPU_MIPS64R2 }, + { "mips64r3", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS64R3, + ISA_MIPS32R3, + ISA_MIPS64R3, + CPU_MIPS64R3 }, + { "mips64r5", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS64R5, + ISA_MIPS32R5, + ISA_MIPS64R5, + CPU_MIPS64R5 }, + { "mips64r6", + MIPS_CPU_IS_ISA, + 0, + ISA_MIPS64R6, + ISA_MIPS32R6, + ISA_MIPS64R6, + CPU_MIPS64R6 }, /* MIPS I */ - { "r3000", 0, 0, ISA_MIPS1, CPU_R3000 }, - { "r2000", 0, 0, ISA_MIPS1, CPU_R3000 }, - { "r3900", 0, 0, ISA_MIPS1, CPU_R3900 }, + { "r3000", + 0, + 0, + ISA_MIPS1, + 0, + 0, + CPU_R3000 }, + { "r2000", + 0, + 0, + ISA_MIPS1, + 0, + 0, + CPU_R3000 }, + { "r3900", + 0, + 0, + ISA_MIPS1, + 0, + 0, + CPU_R3900 }, /* MIPS II */ - { "r6000", 0, 0, ISA_MIPS2, CPU_R6000 }, - { "allegrex", 0, 0, ISA_MIPS2, CPU_ALLEGREX }, + { "r6000", + 0, + 0, + ISA_MIPS2, + 0, + 0, + CPU_R6000 }, + { "allegrex", + 0, + 0, + ISA_MIPS2, + 0, + 0, + CPU_ALLEGREX }, /* MIPS III */ - { "r4000", 0, 0, ISA_MIPS3, CPU_R4000 }, - { "r4010", 0, 0, ISA_MIPS2, CPU_R4010 }, - { "vr4100", 0, 0, ISA_MIPS3, CPU_VR4100 }, - { "vr4111", 0, 0, ISA_MIPS3, CPU_R4111 }, - { "vr4120", 0, 0, ISA_MIPS3, CPU_VR4120 }, - { "vr4130", 0, 0, ISA_MIPS3, CPU_VR4120 }, - { "vr4181", 0, 0, ISA_MIPS3, CPU_R4111 }, - { "vr4300", 0, 0, ISA_MIPS3, CPU_R4300 }, - { "r4400", 0, 0, ISA_MIPS3, CPU_R4400 }, - { "r4600", 0, 0, ISA_MIPS3, CPU_R4600 }, - { "orion", 0, 0, ISA_MIPS3, CPU_R4600 }, - { "r4650", 0, 0, ISA_MIPS3, CPU_R4650 }, - { "r5900", 0, 0, ISA_MIPS3, CPU_R5900 }, + { "r4000", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4000 }, + { "r4010", + 0, + 0, + ISA_MIPS2, + 0, + 0, + CPU_R4010 }, + { "vr4100", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_VR4100 }, + { "vr4111", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4111 }, + { "vr4120", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_VR4120 }, + { "vr4130", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_VR4120 }, + { "vr4181", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4111 }, + { "vr4300", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4300 }, + { "r4400", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4400 }, + { "r4600", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4600 }, + { "orion", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4600 }, + { "r4650", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R4650 }, + { "r5900", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_R5900 }, /* ST Microelectronics Loongson 2E and 2F cores. */ - { "loongson2e", 0, 0, ISA_MIPS3, CPU_LOONGSON_2E }, - { "loongson2f", 0, ASE_LOONGSON_MMI, ISA_MIPS3, CPU_LOONGSON_2F }, + { "loongson2e", + 0, + 0, + ISA_MIPS3, + 0, + 0, + CPU_LOONGSON_2E }, + { "loongson2f", + 0, + ASE_LOONGSON_MMI, + ISA_MIPS3, + 0, + 0, + CPU_LOONGSON_2F }, /* MIPS IV */ - { "r8000", 0, 0, ISA_MIPS4, CPU_R8000 }, - { "r10000", 0, 0, ISA_MIPS4, CPU_R10000 }, - { "r12000", 0, 0, ISA_MIPS4, CPU_R12000 }, - { "r14000", 0, 0, ISA_MIPS4, CPU_R14000 }, - { "r16000", 0, 0, ISA_MIPS4, CPU_R16000 }, - { "vr5000", 0, 0, ISA_MIPS4, CPU_R5000 }, - { "vr5400", 0, 0, ISA_MIPS4, CPU_VR5400 }, - { "vr5500", 0, 0, ISA_MIPS4, CPU_VR5500 }, - { "rm5200", 0, 0, ISA_MIPS4, CPU_R5000 }, - { "rm5230", 0, 0, ISA_MIPS4, CPU_R5000 }, - { "rm5231", 0, 0, ISA_MIPS4, CPU_R5000 }, - { "rm5261", 0, 0, ISA_MIPS4, CPU_R5000 }, - { "rm5721", 0, 0, ISA_MIPS4, CPU_R5000 }, - { "rm7000", 0, 0, ISA_MIPS4, CPU_RM7000 }, - { "rm9000", 0, 0, ISA_MIPS4, CPU_RM9000 }, + { "r8000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R8000 }, + { "r10000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R10000 }, + { "r12000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R12000 }, + { "r14000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R14000 }, + { "r16000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R16000 }, + { "vr5000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R5000 }, + { "vr5400", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_VR5400 }, + { "vr5500", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_VR5500 }, + { "rm5200", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R5000 }, + { "rm5230", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R5000 }, + { "rm5231", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R5000 }, + { "rm5261", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R5000 }, + { "rm5721", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_R5000 }, + { "rm7000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_RM7000 }, + { "rm9000", + 0, + 0, + ISA_MIPS4, + 0, + 0, + CPU_RM9000 }, /* MIPS 32 */ - { "4kc", 0, 0, ISA_MIPS32, CPU_MIPS32 }, - { "4km", 0, 0, ISA_MIPS32, CPU_MIPS32 }, - { "4kp", 0, 0, ISA_MIPS32, CPU_MIPS32 }, - { "4ksc", 0, ASE_SMARTMIPS, ISA_MIPS32, CPU_MIPS32 }, + { "4kc", + 0, + 0, + ISA_MIPS32, + 0, + 0, + CPU_MIPS32 }, + { "4km", + 0, + 0, + ISA_MIPS32, + 0, + 0, + CPU_MIPS32 }, + { "4kp", + 0, + 0, + ISA_MIPS32, + 0, + 0, + CPU_MIPS32 }, + { "4ksc", + 0, + ASE_SMARTMIPS, + ISA_MIPS32, + 0, + 0, + CPU_MIPS32 }, /* MIPS 32 Release 2 */ - { "4kec", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "4kem", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "4kep", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "4ksd", 0, ASE_SMARTMIPS, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "m4k", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "m4kp", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "m14k", 0, ASE_MCU, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "m14kc", 0, ASE_MCU, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "m14ke", 0, ASE_DSP | ASE_DSPR2 | ASE_MCU, - ISA_MIPS32R2, CPU_MIPS32R2 }, - { "m14kec", 0, ASE_DSP | ASE_DSPR2 | ASE_MCU, - ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kc", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kf2_1", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kf", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kf1_1", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "4kec", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "4kem", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "4kep", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "4ksd", + 0, + ASE_SMARTMIPS, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "m4k", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "m4kp", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "m14k", + 0, + ASE_MCU, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "m14kc", + 0, + ASE_MCU, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "m14ke", + 0, + ASE_DSP | ASE_DSPR2 | ASE_MCU, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "m14kec", + 0, + ASE_DSP | ASE_DSPR2 | ASE_MCU, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kc", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kf2_1", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kf", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kf1_1", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* Deprecated forms of the above. */ - { "24kfx", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kx", 0, 0, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "24kfx", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kx", + 0, + 0, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* 24KE is a 24K with DSP ASE, other ASEs are optional. */ - { "24kec", 0, ASE_DSP, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kef2_1", 0, ASE_DSP, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kef", 0, ASE_DSP, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kef1_1", 0, ASE_DSP, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "24kec", + 0, + ASE_DSP, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kef2_1", + 0, + ASE_DSP, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kef", + 0, + ASE_DSP, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kef1_1", + 0, + ASE_DSP, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* Deprecated forms of the above. */ - { "24kefx", 0, ASE_DSP, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "24kex", 0, ASE_DSP, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "24kefx", + 0, + ASE_DSP, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "24kex", + 0, + ASE_DSP, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* 34K is a 24K with DSP and MT ASE, other ASEs are optional. */ - { "34kc", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "34kf2_1", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "34kf", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "34kf1_1", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "34kc", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "34kf2_1", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "34kf", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "34kf1_1", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* Deprecated forms of the above. */ - { "34kfx", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "34kx", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "34kfx", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "34kx", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* 34Kn is a 34kc without DSP. */ - { "34kn", 0, ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "34kn", + 0, + ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* 74K with DSP and DSPR2 ASE, other ASEs are optional. */ - { "74kc", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "74kf2_1", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "74kf", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "74kf1_1", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "74kf3_2", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "74kc", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "74kf2_1", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "74kf", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "74kf1_1", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "74kf3_2", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* Deprecated forms of the above. */ - { "74kfx", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "74kx", 0, ASE_DSP | ASE_DSPR2, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "74kfx", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "74kx", + 0, + ASE_DSP | ASE_DSPR2, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* 1004K cores are multiprocessor versions of the 34K. */ - { "1004kc", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "1004kf2_1", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "1004kf", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "1004kf1_1", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, + { "1004kc", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "1004kf2_1", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "1004kf", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "1004kf1_1", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, /* interaptiv is the new name for 1004kf. */ - { "interaptiv", 0, ASE_DSP | ASE_MT, ISA_MIPS32R2, CPU_MIPS32R2 }, - { "interaptiv-mr2", 0, + { "interaptiv", + 0, + ASE_DSP | ASE_MT, + ISA_MIPS32R2, + 0, + 0, + CPU_MIPS32R2 }, + { "interaptiv-mr2", + 0, ASE_DSP | ASE_EVA | ASE_MT | ASE_MIPS16E2 | ASE_MIPS16E2_MT, - ISA_MIPS32R3, CPU_INTERAPTIV_MR2 }, + ISA_MIPS32R3, + 0, + 0, + CPU_INTERAPTIV_MR2 }, /* M5100 family. */ - { "m5100", 0, ASE_MCU, ISA_MIPS32R5, CPU_MIPS32R5 }, - { "m5101", 0, ASE_MCU, ISA_MIPS32R5, CPU_MIPS32R5 }, + { "m5100", + 0, + ASE_MCU, + ISA_MIPS32R5, + 0, + 0, + CPU_MIPS32R5 }, + { "m5101", + 0, + ASE_MCU, + ISA_MIPS32R5, + 0, + 0, + CPU_MIPS32R5 }, /* P5600 with EVA and Virtualization ASEs, other ASEs are optional. */ - { "p5600", 0, ASE_VIRT | ASE_EVA | ASE_XPA, ISA_MIPS32R5, CPU_MIPS32R5 }, + { "p5600", + 0, + ASE_VIRT | ASE_EVA | ASE_XPA, + ISA_MIPS32R5, + 0, + 0, + CPU_MIPS32R5 }, /* MIPS 64 */ - { "5kc", 0, 0, ISA_MIPS64, CPU_MIPS64 }, - { "5kf", 0, 0, ISA_MIPS64, CPU_MIPS64 }, - { "20kc", 0, ASE_MIPS3D, ISA_MIPS64, CPU_MIPS64 }, - { "25kf", 0, ASE_MIPS3D, ISA_MIPS64, CPU_MIPS64 }, + { "5kc", + 0, + 0, + ISA_MIPS64, + 0, + 0, + CPU_MIPS64 }, + { "5kf", + 0, + 0, + ISA_MIPS64, + 0, + 0, + CPU_MIPS64 }, + { "20kc", + 0, + ASE_MIPS3D, + ISA_MIPS64, + 0, + 0, + CPU_MIPS64 }, + { "25kf", + 0, + ASE_MIPS3D, + ISA_MIPS64, + 0, + 0, + CPU_MIPS64 }, /* Broadcom SB-1 CPU core. */ - { "sb1", 0, ASE_MIPS3D | ASE_MDMX, ISA_MIPS64, CPU_SB1 }, + { "sb1", + 0, + ASE_MIPS3D | ASE_MDMX, + ISA_MIPS64, + 0, + 0, + CPU_SB1 }, /* Broadcom SB-1A CPU core. */ - { "sb1a", 0, ASE_MIPS3D | ASE_MDMX, ISA_MIPS64, CPU_SB1 }, + { "sb1a", + 0, + ASE_MIPS3D | ASE_MDMX, + ISA_MIPS64, + 0, + 0, + CPU_SB1 }, /* MIPS 64 Release 2. */ /* Loongson CPU core. */ /* -march=loongson3a is an alias of -march=gs464 for compatibility. */ - { "loongson3a", 0, ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT, - ISA_MIPS64R2, CPU_GS464 }, - { "gs464", 0, ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT, - ISA_MIPS64R2, CPU_GS464 }, - { "gs464e", 0, ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT - | ASE_LOONGSON_EXT2, ISA_MIPS64R2, CPU_GS464E }, - { "gs264e", 0, ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT - | ASE_LOONGSON_EXT2 | ASE_MSA | ASE_MSA64, ISA_MIPS64R2, CPU_GS264E }, + { "loongson3a", + 0, + ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT, + ISA_MIPS64R2, + 0, + 0, + CPU_GS464 }, + { "gs464", + 0, + ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT, + ISA_MIPS64R2, + 0, + 0, + CPU_GS464 }, + { "gs464e", + 0, + ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT | ASE_LOONGSON_EXT2, + ISA_MIPS64R2, + 0, + 0, + CPU_GS464E }, + { "gs264e", + 0, + ASE_LOONGSON_MMI | ASE_LOONGSON_CAM | ASE_LOONGSON_EXT | ASE_LOONGSON_EXT2 + | ASE_MSA | ASE_MSA64, + ISA_MIPS64R2, + 0, + 0, + CPU_GS264E }, /* Cavium Networks Octeon CPU core. */ - { "octeon", 0, 0, ISA_MIPS64R2, CPU_OCTEON }, - { "octeon+", 0, 0, ISA_MIPS64R2, CPU_OCTEONP }, - { "octeon2", 0, 0, ISA_MIPS64R2, CPU_OCTEON2 }, - { "octeon3", 0, ASE_VIRT | ASE_VIRT64, ISA_MIPS64R5, CPU_OCTEON3 }, + { "octeon", + 0, + 0, + ISA_MIPS64R2, + 0, + 0, + CPU_OCTEON }, + { "octeon+", + 0, + 0, + ISA_MIPS64R2, + 0, + 0, + CPU_OCTEONP }, + { "octeon2", + 0, + 0, + ISA_MIPS64R2, + 0, + 0, + CPU_OCTEON2 }, + { "octeon3", + 0, + ASE_VIRT | ASE_VIRT64, + ISA_MIPS64R5, + 0, + 0, + CPU_OCTEON3 }, /* RMI Xlr */ - { "xlr", 0, 0, ISA_MIPS64, CPU_XLR }, + { "xlr", + 0, + 0, + ISA_MIPS64, + 0, + 0, + CPU_XLR }, /* Broadcom XLP. XLP is mostly like XLR, with the prominent exception that it is MIPS64R2 rather than MIPS64. */ - { "xlp", 0, 0, ISA_MIPS64R2, CPU_XLR }, + { "xlp", + 0, + 0, + ISA_MIPS64R2, + 0, + 0, + CPU_XLR }, /* MIPS 64 Release 6. */ - { "i6400", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, - { "i6500", 0, ASE_VIRT | ASE_MSA | ASE_CRC | ASE_GINV, - ISA_MIPS64R6, CPU_MIPS64R6}, - { "p6600", 0, ASE_VIRT | ASE_MSA, ISA_MIPS64R6, CPU_MIPS64R6}, + { "i6400", + 0, + ASE_VIRT | ASE_MSA, + ISA_MIPS64R6, + 0, + 0, + CPU_MIPS64R6}, + { "i6500", + 0, + ASE_VIRT | ASE_MSA | ASE_CRC | ASE_GINV, + ISA_MIPS64R6, + 0, + 0, + CPU_MIPS64R6}, + { "p6600", + 0, + ASE_VIRT | ASE_MSA, + ISA_MIPS64R6, + 0, + 0, + CPU_MIPS64R6}, /* End marker. */ - { NULL, 0, 0, 0, 0 } + { NULL, 0, 0, 0, 0, 0, 0 } }; @@ -20253,6 +20956,29 @@ mips_parse_cpu (const char *option, const char *cpu_string) : ISA_MIPS1); } + /* mipsisa32rN-linux-gnu refuses -n32/-64 swtiches: + -march=mips32r6 is not compatible with the selected ABI + mipsisa64rN-linux-gnu -o32 generates objects with 64bit CPU: + ELF 32-bit LSB relocatable, MIPS, MIPS64 rel2 version 1 (SYSV) + They are not good default behaviors: Let's alter the CPU info. + We treat it some like -march=from-abi. */ + if (strcasecmp (option, "default CPU") == 0) + { + p = mips_cpu_info_from_name (cpu_string); + if (p != NULL && (p->flags & MIPS_CPU_IS_ISA)) + { + if (ABI_NEEDS_32BIT_REGS (mips_abi)) + return mips_cpu_info_from_isa (p->isa_32); + + if (ABI_NEEDS_64BIT_REGS (mips_abi)) + return mips_cpu_info_from_isa (p->isa_64); + + if (file_mips_opts.gp >= 0) + return mips_cpu_info_from_isa (file_mips_opts.gp == 32 + ? p->isa_32 : p->isa_64); + } + } + /* 'default' has traditionally been a no-op. Probably not very useful. */ if (strcasecmp (cpu_string, "default") == 0) return 0; @@ -20292,6 +21018,19 @@ mips_cpu_info_from_arch (int arch) return NULL; } + +static const struct mips_cpu_info * +mips_cpu_info_from_name (const char* name) +{ + int i; + + for (i = 0; mips_cpu_info_table[i].name != NULL; i++) + if (strcasecmp (mips_cpu_info_table[i].name, name) == 0) + return (&mips_cpu_info_table[i]); + + return NULL; +} + static void show (FILE *stream, const char *string, int *col_p, int *first_p) diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index 91cf8b11077..46823cfcf11 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -559,7 +559,7 @@ if { [istarget mips*-*-vxworks*] } { "MIPS invalid switch to SVR4 PIC from VxWorks PIC" } elseif { [istarget mips*-*-*] } { set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] \ - || [istarget mipsisa32-*-linux*] || [istarget mipsisa32el-*-linux*]] + || [istarget mipsisa32*-*-linux*] || [istarget mipsisa32*el-*-linux*]] set has_newabi [expr [istarget *-*-irix6*] || [istarget mips*-*-linux*] \ || [istarget mips*-sde-elf*] || [istarget mips*-mti-elf*] \ || [istarget mips*-img-elf*]] @@ -2059,7 +2059,7 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "module-override" run_dump_test "module-defer-warn1" - run_list_test "module-defer-warn2" "-32" + run_list_test "module-defer-warn2" "-32 -mips1" foreach testopt [list -mfp32 -mfpxx -mfp64 "-mfp64-noodd" \ -msingle-float -msoft-float] { -- 2.30.2