From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2124.outbound.protection.outlook.com [40.107.117.124]) by sourceware.org (Postfix) with ESMTPS id 33F293858412 for ; Tue, 18 Apr 2023 14:00:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 33F293858412 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=Ya2j41eBLET1uJJjIujcyvhtDrT49Lo0q0j/eJEdcezhMeOByhyCeizvmjumhvNMWwUplDANokp6y0ItQl7tztxNPlD6tn6Uj0c7YjXDc0KZtH/PDgKWb7b9geQCy1hNYgbi2xRPL+JxhuUywoBMlNJPU5Kb3IosvphZAM/2YIQEmZxavamQl8mdo/MXR3p+5d6BNc11kL/hXRPoaeYjHyeRs09+YaLSDYkAEcwY8UtQPCtuPuVL1J+wOoXZkEnrH9A1VabMHv491cxk5Ig9k4bRkXO5sYrbfDiBxKA5ggQBs6csbIgbj1sw3NNzWwJr6M4y6TcsRMfHLW6eKRL1XQ== 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=83M2zSwkwKDXCSKArU0Hq0Onj8gmInma9ecRvjzZ9aA=; b=k5aArftq1VQ/86d8Nrtbkson+d3Kk+wygVpf3dSvkXCo9SKUyEihIMieDx+gC/cOt/5Ao/QHfmh+8eWHlf4H8ROTaF6pTBjQ3RRFeJqgS8EBccX6Siq9v5NJXCtsH8nZUvee0WZtm1dT/3zJ4VrLENaOmIYtRyzLK2Z/xXkH1+azItaMXSF4TVUUE7XXupeFwImf+ZssK+0uzRHd7Q1BZl51VClN+l3OqxvLeSQ0gMIWiuyV2u3v09KCCps/RLEAF/4DSpwuVEQ2RIDe7rTsqPTU1tCcYpENT3MKvuceahseEdq/rwAMBEANa7IESpdePZGmHfiXyS8sjwSErg7gnQ== 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=83M2zSwkwKDXCSKArU0Hq0Onj8gmInma9ecRvjzZ9aA=; b=BjgR5yK8czIPsG63hmLJzwgMymfZFPNotBWYWZyq8PIY/p4kPipksAgHdLszrr5P/UwZUiKY/EDLnYhWeerFTygcVksoAWpy/oQCUGWgK6Bo8IMGSleA/N71xQuZ2bjDwaB7w3bennYZKWU65k0Sp7CyW3n2oVpFyFCBOL6Rb80= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cipunited.com; Received: from TYZPR04MB6117.apcprd04.prod.outlook.com (2603:1096:400:25a::9) by PUZPR04MB6674.apcprd04.prod.outlook.com (2603:1096:301:114::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.45; Tue, 18 Apr 2023 14:00:45 +0000 Received: from TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::4016:87b:f0d1:b150]) by TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::4016:87b:f0d1:b150%6]) with mapi id 15.20.6298.045; Tue, 18 Apr 2023 14:00:45 +0000 From: YunQiang Su To: binutils@sourceware.org Cc: syq@debian.org, macro@orcam.me.uk, xry111@xry111.site, richard.sandiford@arm.com, jiaxun.yang@flygoat.com, YunQiang Su Subject: [PATCH v4 2/2] MIPS: default output r6 obj if the triple is r6 Date: Tue, 18 Apr 2023 22:00:19 +0800 Message-Id: <20230418140019.2195551-2-yunqiang.su@cipunited.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230418140019.2195551-1-yunqiang.su@cipunited.com> References: <20230414072046.1639896-1-yunqiang.su@cipunited.com> <20230418140019.2195551-1-yunqiang.su@cipunited.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TY1PR01CA0191.jpnprd01.prod.outlook.com (2603:1096:403::21) To TYZPR04MB6117.apcprd04.prod.outlook.com (2603:1096:400:25a::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR04MB6117:EE_|PUZPR04MB6674:EE_ X-MS-Office365-Filtering-Correlation-Id: 92286160-4acf-4e4a-01f0-08db40154ddb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: As2JKUN8ZTz1m0ZGg5N9nW1aUfpz+RLScjtrsFp1KzJBxpDqrV8ZPcBsUTxx7SCVTi5yXugLMKJw7URtw6vxcnNpI8+fqGe075pfhjMaYQev3SMVKrH2yCP1JcDinbpQxA27e23JpSPmljhreAvgsW75nlVuxrmuiExhX8wPRpqT60CQvbmVioiyHcP3CyOcTaBXSrjnDg4l8z2OKLmj0bgr8Z+D2BLWhaKwEc1w7IKvxtJVAXdz6qy/aHaERaD+Ln6YJstYbVhku9sz4JjaenJNV+tczncDkguRFKXb8AD1RVjbOaY+UehaJ/deh6ZdJiTrU62HafjbbLZCQOpRWjz3dk+CplhkMtvc4+g/iPZ05XPLqXoy6zBeYhsgiT6cAAcskmchViuwa3RaTG9X07xK8Fib8Cx2J2Dq27lYPFsfqbz8ZCiPmru89AFavjyLwnfEHVhm4Zh77zMaF4NU0gs50+ib/svcbJZ0TGgaZc1vvBJJFFb0lFnmMrcvXhWA26ISOlSx7gMk3zRF0ZsX4dGKvAGepEJZOZUoI2kIGvNhXwnQ1UdqI1HUIIDRPu5kTiEeMjyFxbP9EZBTlgaOE+57NQP9RWceEEjaPKRUiiQcXWIDMYM+Y6aizgOdGBek X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR04MB6117.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39830400003)(366004)(136003)(396003)(376002)(346002)(451199021)(2906002)(8676002)(5660300002)(8936002)(66556008)(66476007)(4326008)(41300700001)(6916009)(66946007)(6506007)(107886003)(186003)(26005)(1076003)(6512007)(6486002)(6666004)(52116002)(36756003)(38350700002)(38100700002)(2616005)(86362001)(316002)(478600001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9jqOSNKka8Kx6MzDV4BvGQnZul4gkvUTjfiuGM5A9hElzyl5qYpJ8211UNBU?= =?us-ascii?Q?oqXbrTkB0rlGwxJRz5I3jSgZ67OJSPK614b/hNFwWd8F6+ykS2mky2zZa8zp?= =?us-ascii?Q?s57FLfCMkyYg6re+xGuGqEjIxq9JdgLqNyMCKNpfQsnpcB6kVNRd5DgQ06qT?= =?us-ascii?Q?cu99J2OSfCaRmKH0b/m+sFZxJEu18laCEEHCRnZJJJS0Dp1HqsIP//vvsaj+?= =?us-ascii?Q?ziE8os1hmLdK1PdbCIDRr6sY393/OPh3bQYWxmo37vipSaUKtmi+COCAHOhE?= =?us-ascii?Q?lfMRtvAktNLX4sc/C4wNRuvwAlLGPMdanuJh1ccd77q1HyuymJpFpmV81v/w?= =?us-ascii?Q?IEkH9nxnq31y119+CCXJw/q+8p0aA898LR+itaMUwIzd0CzPJ+ohOsUx0a9E?= =?us-ascii?Q?gblOx50VLfI77+97rsaXl7ZHSS6gup5G4KaIyhwEAyXkzAFYcg5ZtiQ4nrN+?= =?us-ascii?Q?baq+H26ZYNMeY1tJo5+T3a8z39yuTCwW7k0bG68Dhxrb6EV8mV8BOrCH19dJ?= =?us-ascii?Q?Yk0WJVwmgCKwcLJI6+gGDW9U0EKyroHHR/epKTA+kL8doIWPOxMCXd1LSZL3?= =?us-ascii?Q?HpnVZhIhkkShkeG39iLU2D3fbznvJOLPbOB5B8z1n3Nx+66cnO23bZOaTwNk?= =?us-ascii?Q?qnC8rLDDoesDyHRo2GGNAF0rWhSMiUr5Z7tBD8mdkPac0uAFcKOs2YkwYVmJ?= =?us-ascii?Q?lLKYDBCC2FaDlfBShdb2rxiDUl/zrg7BK9gHSYFJuzGIdIMjvMaipzep2n/p?= =?us-ascii?Q?rlYO6/yEZgOsM5SUasmhqmSjk+az6hy22y+fkI/Dw5iCAu8VXwaNaqDrvdhm?= =?us-ascii?Q?GvftPlGe6gwcNogLI8hPBz6WkFj0qsBSsJgpclME6BDTjecHlnEdaVvKabcS?= =?us-ascii?Q?zd1lIPscomycH1qiZtzd08pc6GKtHg8O6HzUyX+q9QUGRZVRpfKvoSK4d2rA?= =?us-ascii?Q?7r0Zs/xNQBtzk3IwSBmq7n79tGARqcD9ZZPQRFBlJyiUT1XrBqgu5Dz2r7MA?= =?us-ascii?Q?y6Fmbe/zgzmNkg+d1ca5I2NB1GQNzKlIUedazKJYeLr7RhxFOD2o7BkR656Z?= =?us-ascii?Q?M9fmk5nP3dFrQ0f/EeJkZP2ZnIqkytdaLUlXCvn2ldYYPiUWsk7e+0MYQVXI?= =?us-ascii?Q?f3/xB0QbDnHZfJjf4CNB2kCEVVxBBPDb3tzEZzx5aPdHJiiWxMCcmcuaEFEE?= =?us-ascii?Q?+lRbe6dXJki+xR3zx5yon8LuBwrU7C7Zdp6E17JiySplFP/q49Iwxgfilfcd?= =?us-ascii?Q?Lg5wjnpXYcv6xsxsOG+Xt7saXyi660hCQbc4vkFO+d3plqGvEDVCA2X1dvxV?= =?us-ascii?Q?HGjAAIE1Yd5qDXmrnxwj7oTHuanoiK7gCrrcLJdLPsOUKhVitxLJeTbBK0us?= =?us-ascii?Q?TVxCJLjVDqr9+sA7XGwh8MsUwpb1QFJWXTQA3kXvmtzAQNF8cygr3upif7F5?= =?us-ascii?Q?ITVzwwGL/utqqEggP5cqH9W7jtxWcrdc5J9wrOxS3JWp/U+pNGfa+lUxHdC/?= =?us-ascii?Q?h9Iofxi8R7HJcuz9ACaPSiW08NDk9enh3DTFwmTr48cirJ2E5zROjNq0xXJF?= =?us-ascii?Q?K9Dfd96Qy8Z3QC2JH+tGHFJU/oFn4BKSVLcJAqfhDtWjHlCEtuJKwDvc6XHe?= =?us-ascii?Q?BQ=3D=3D?= X-OriginatorOrg: cipunited.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92286160-4acf-4e4a-01f0-08db40154ddb X-MS-Exchange-CrossTenant-AuthSource: TYZPR04MB6117.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2023 14:00:45.1422 (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: vvBmL9JgsSNZ9hipVj/bMtVW5ORz9mdc0COlYef3EYX/2W65v+D039/MpZ7cVSbEumx9lj6ogO+u/tAQ2x0jYNwbjKBp/HICwf8U/o4oVqQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR04MB6674 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,KAM_NUMSUBJECT,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: If the triple is mipsisa32r6* or mipsisa64r6*, ld/as should output r6 objects by default. The triples with vendor `img` should do same. The examples include: as xx.s -o xx.o ld -r -b binary xx.dat -o xx.o --- bfd/config.bfd | 6 ++++++ bfd/elfxx-mips.c | 6 ++++++ gas/configure | 9 +++++++++ gas/configure.ac | 9 +++++++++ 4 files changed, 30 insertions(+) diff --git a/bfd/config.bfd b/bfd/config.bfd index 1e4bea191dd..78752994456 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -1535,3 +1535,9 @@ case "${targ_defvec} ${targ_selvecs}" in targ_archs="$targ_archs bfd_iamcu_arch" ;; esac + +case "${targ}" in + mipsisa32r6* | mipsisa64r6* | mips*-img-*) + targ_cflags="$targ_cflags -DMIPS_DEFAULT_R6=1" + ;; +esac diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 13a89953293..0b0ea11bfb5 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -12327,9 +12327,15 @@ mips_set_isa_flags (bfd *abfd) { default: if (ABI_N32_P (abfd) || ABI_64_P (abfd)) +#ifdef MIPS_DEFAULT_R6 + val = E_MIPS_ARCH_64R6; + else + val = E_MIPS_ARCH_32R6; +#else val = E_MIPS_ARCH_3; else val = E_MIPS_ARCH_1; +#endif break; case bfd_mach_mips3000: diff --git a/gas/configure b/gas/configure index 868f4a911a9..0daa80d5b4c 100755 --- a/gas/configure +++ b/gas/configure @@ -12211,6 +12211,15 @@ _ACEOF use_e_mips_abi_o32=1 ;; esac + # If Vendor is IMG, then MIPSr6 is used + case ${target} in + mips*64*-img-*) + mips_cpu=mips64r6 + ;; + mips*-img-*) + mips_cpu=mips32r6 + ;; + esac # Decide whether to generate 32-bit or 64-bit code by default. # Used to resolve -march=from-abi when an embedded ABI is selected. case ${target} in diff --git a/gas/configure.ac b/gas/configure.ac index 03728ffce4d..2b91f9ec616 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -380,6 +380,15 @@ changequote([,])dnl use_e_mips_abi_o32=1 ;; esac + # If Vendor is IMG, then MIPSr6 is used + case ${target} in + mips*64*-img-*) + mips_cpu=mips64r6 + ;; + mips*-img-*) + mips_cpu=mips32r6 + ;; + esac # Decide whether to generate 32-bit or 64-bit code by default. # Used to resolve -march=from-abi when an embedded ABI is selected. case ${target} in -- 2.30.2