From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2128.outbound.protection.outlook.com [40.107.255.128]) by sourceware.org (Postfix) with ESMTPS id D87A83870C10 for ; Fri, 17 Nov 2023 09:03:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D87A83870C10 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-Filter: OpenARC Filter v1.0.0 sourceware.org D87A83870C10 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.255.128 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1700211824; cv=pass; b=QdkGBy/H3TrQABg8RlDSWU6zue4YBXN72f6Kr6dBt9GsJHSd4aQzGm4EcBVZ/AwSv6wVELmNzZGcloV4wrJEIeXOQGt29+QGztOv7KTpxdyU68h2s+biA/YrNCKh8mOJcjRX/RPEtd5t39mTNCYF11HQ4XHLC15ncV81FY73TN0= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1700211824; c=relaxed/simple; bh=NH7L0wQch7OQ84OE4fVufjSFuSD86Zeaz+FUoK9H2qw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=kjpFFJqPLupIgn/VX5os9mEbi3L6ZxfolXrtlyEKKLH0oHs8S6mWu7tGD1ZJEi8CydpibohA/VjlFYFe+QbymZjoU35Hyi5T4TqA383VHNA9WljBN7IJbuEFwBGJwBQwxLJnfLoPxQ1rr16/ZdTDVGsX09nvy9tOVdSwqYphXuw= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VsyEUqij8G57ulRTgTmvowRzSHAmmlUqRiK5gCKfNBmKZlbgdJQPDmL+JnhOSeiRnhgoYgfNMslYWJA3Wm6wY3UPooAfUYtfRVgdxHyV/7Ul7X84lPuwlf872fAvDZftArvsZwIwoyE5u4GLJ5bCCiF9SrvWjgqmxnMLpe7cN8ubQhBtOMDIh8ME7znh7HoRL6mURRfncJO0+UK57x7loefnNsbZOAlgbGAEhpOdnHviG4uxkTWtoaY/3yOzsLM01dRWaJy5NKf7pEpLTJ6We1jsZxhS56aCMbfbeTZzfYDZ4Jjbn/w50rdYbjxY/CqOTv4MKClzIPlz0xVG0fP8rA== 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=nEjZ6Q8celSis9d5gibxP1x3AnBx1okWkdOfmCmvLHg=; b=FnQ7iSwFpUc5PeNXCYZZBnemX+3dqA321Qf8K0815suU9v8GdI0QEfrQ4hlGQtheopzjWDz96CB6BxnYxf3vOpMXD/vuBprwCFUnPVJjiDuRpHN/8I+LttjdkXf/QkZLv32f+sH4vRG2BP8beRXV+MYCFX6Ec+vtmeuFjWWQfyvndvlChv4so7Nh24BL3uzLLil3ENZmfl8s1e1rU0feuU+bvXZbGWCRBjT8vVatHbkdW/gKroklBQvInwbWtTuBuedprulaMsPumNfPg0Y+sKg/1ysSIFeLvd/cdqkL8esTgumSJSVgC4bP8lHATlUjTKzPlvX9/U04JfZIy03dDg== 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=nEjZ6Q8celSis9d5gibxP1x3AnBx1okWkdOfmCmvLHg=; b=AOk53ww9AVFLJVmdj/DbLGgRNWH4TDz0mmxmejEzFGHtxHOht4rNvdu4UosVJtBVNxr6usgGTcGFsQX+Xq1hzCa4T9QmHacDmKUQisrjdef/lOvXvcMZ9R9C19HkJTULQ7xcTAJkD2lHcybIY/Krj3RXDA3bdc4PKfcjNj6jt1Q= 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 PUZPR04MB6090.apcprd04.prod.outlook.com (2603:1096:301:e3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.23; Fri, 17 Nov 2023 09:03:34 +0000 Received: from TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::41df:8aa2:5d9c:5f88]) by TYZPR04MB6117.apcprd04.prod.outlook.com ([fe80::41df:8aa2:5d9c:5f88%5]) with mapi id 15.20.7002.022; Fri, 17 Nov 2023 09:03:33 +0000 From: YunQiang Su To: nickc@redhat.com Cc: binutils@sourceware.org, YunQiang Su Subject: [PATCH v4] MIPS: Use 64-bit a ABI by default for `mipsisa64*-*-linux*' targets Date: Fri, 17 Nov 2023 17:03:10 +0800 Message-Id: <20231117090310.3014726-1-yunqiang.su@cipunited.com> X-Mailer: git-send-email 2.39.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) To TYZPR04MB6117.apcprd04.prod.outlook.com (2603:1096:400:25a::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR04MB6117:EE_|PUZPR04MB6090:EE_ X-MS-Office365-Filtering-Correlation-Id: 97366a43-f468-4c81-7dd5-08dbe74c137f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V0v4VkfQLlgl8cvf5vDe5S7JAgEr0QoSfs0Raj7A3/vVZqKicCxZnrzLvlQqSVLxqWvU/R7baQDkG9JXYJSy8vKRaiTbuzmwU/I09UpmxUFna+u2EJejRDHkye8xcIyO/Dzw2/Kiw+kuynQJW2U2AzKPAo0cdUO1GWcts6okXyzOy6El/8569ffueWMo92vzNHG45HINGVhjcyipvoK8BrZ4K9+Gq5A9NzDNNv9qzRV77fgjW2ifVJMOQdN64PbNqW/JdP58GX16pxUczqMaTwvtBxHpRUcWVVTfp1FRPHN1xzW2cX+jXurjM+OefLgI3aqafoeRY0Z2ach3gz1D+22CzRMCbF4vSWcxJgl/fGWqY2QOVYwSmbSBwNEvHlC1x5/ZBTcCt+5hcYZZp8zNFVh8yJOpmVQ3PVh5y3iLstocELMH9PuzXLFvEu/DtcgxIHYn9XOrTUXsC0DaZGZEQkTr2Tt5lByxTWmR8ad1mMOJerE/CXEjPVc4Tz6rPj/e2NOVbGYcGVlO3CZ63VOqjv5hisNevBCa3xegKrgJQxakp5iCUhzkPbLF4mw1qFPvPTxAx4roniUDJv6XQ7eoyzJvcuc9AkYHj1G5qnilk26+Goiq6KWWYIZH7voukMRe7/DBPDG5REb4aKVY5a61kA== 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:(13230031)(396003)(366004)(346002)(39830400003)(136003)(376002)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(52116002)(478600001)(107886003)(83380400001)(2616005)(6666004)(6512007)(6506007)(1076003)(26005)(6486002)(66476007)(66946007)(6916009)(66556008)(8936002)(8676002)(316002)(2906002)(5660300002)(38100700002)(86362001)(38350700005)(4326008)(41300700001)(36756003)(81973001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ilyO9sS2WnV/rGlLWM7aRCE4f1S1qy749d6fAtNqp0zF7x7bqZUU+hBBBu4T?= =?us-ascii?Q?L0BSO8PrFeuBNoisiHWc5rnInO2xeZtsg98SMYkmXcFZh5Q7nu9eVOprOkON?= =?us-ascii?Q?ku+Bhz1919Dykga/9AZUBVabrU9WMLFHhM6fteKblqwx1HkfnVdUILyCtFI5?= =?us-ascii?Q?oYZDWWLYznloOqTe0S4/5ubw7qX2NCJ1sh91Eb4zkN6l6Jcv4e1OKEd2pdiZ?= =?us-ascii?Q?GdJ7PxcnUgv+zPJZkJS6VnN17ClUk3s+8oeUQjzlI+qI6mRVv2BjTEH5YTOs?= =?us-ascii?Q?M8SKDq6LR8C3E2UHbHytNTQBFDkAsQJ5etOjOJuAWBrjqu1M/aWTVQCt6GDC?= =?us-ascii?Q?5JaUicCgcxB0r6gD+iGt5UP5ZufZvHhF0xytaYluvThy0Cn5KDSVAWtQeGzZ?= =?us-ascii?Q?xTPf1f3B8pn7b+WGVWpCIBKwmzq7psiG2XAtiGsk7sMnBYbHDDOMMROhP1Yc?= =?us-ascii?Q?7VKlKX7mAJG/CXI+Wtlu4AOfaHomIE+mL+hesexyHrikGHAFuNHSOWDRxVH9?= =?us-ascii?Q?cTRPyJ7rABesOC/k3B1Yq7phzUiql6TuLeqb/Mpmqry7DJEY1T6gRDyJ55XP?= =?us-ascii?Q?AcYc4L2ErgRd+yUA8igCNpfS3ikoRPZA9qEv61ibrr03KPfrs1yxgOQqJ5Mu?= =?us-ascii?Q?tS9VHmh3tW00yiTe3TJ32qoc00EyGvEuACMypjYfp5NHKU5hoGnaBe7tVFri?= =?us-ascii?Q?SGeiZYCYXSclIOHfp4xNI7V9gn6Av3wcS/CmWE/yXo5p/nm6izcS14jbMc/E?= =?us-ascii?Q?ggn8cJ0FdYgz+1phV6XyIVbCVWgYciTZGj9cDFo5zpHeU750MWcX0cW+swaD?= =?us-ascii?Q?kftw1+mCyKt+iwFPh+Zt+F0jM09H2n/yRY1Kjw9FqmbM+4Azt6A+yemZ6DVd?= =?us-ascii?Q?ODmpbY5Ce3yztkUCGELIu9YpMVzQI516vWGnZ4AEDoQ3mwnPm2SlJpJVKnMJ?= =?us-ascii?Q?rydGSbNFsLtf/FkPo/5CGUn/af5NZyR7MmckV2df/HUuUsTmkfP5AGDe+t3o?= =?us-ascii?Q?Os9yeAykU0FXdZaY2nf11YkZcd1Q/hUC4PetDJZD8hNzAA7pTrvZsDZJT3XS?= =?us-ascii?Q?qXfIjfgNbaXSZ1V5H6C4393KEfrogMe5Z+pPnuU+cZcbeEC8lIjU6kCxBgLG?= =?us-ascii?Q?475SCVCT+27HBszXpUmFatizQFfmwKrNc7uvO/HHXe6t1WWD5GSHFUBjdvzq?= =?us-ascii?Q?CCilQ+itgZy8A3LFdSfqsQ06Nqyrif2NeFiWfvGhYg8grFdqISENJvDah+9W?= =?us-ascii?Q?Hl35O4e06e1PKubsryXb/I1liUgMQe2xhkND9vfhVmtEZeyesNmcueIdUgex?= =?us-ascii?Q?dMaAS7+mjt4E83ugxk2rbrx0UEW6jxh39WhnglfB4sQGlRK70dWpAgc5QGLR?= =?us-ascii?Q?aLBe/kz1q6mtgPAJqpcpqrG2a/UJ/GUhplaMkIb02nqlMWIH6AeOWNhGVYUh?= =?us-ascii?Q?rxiGvUVWvzY4XwSz0flsLdsRvbGbtFFEkP/f26395RB9gXsPYP6k1yYH7RpX?= =?us-ascii?Q?902/9vmlRbsuk2rPJURskcouH3Nq0h45q98wllYhyu1P5Em0sQLUvNURfRWq?= =?us-ascii?Q?N8IIXOMaMEysBt84TiP5kB4Oby5jO++mun2cXKyg0jMSV9Ew7A9d7ShGlRyt?= =?us-ascii?Q?lQ=3D=3D?= X-OriginatorOrg: cipunited.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97366a43-f468-4c81-7dd5-08dbe74c137f X-MS-Exchange-CrossTenant-AuthSource: TYZPR04MB6117.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2023 09:03:33.6732 (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: sdGwDGm2BN6N42zRO6IhsFfDYN0aWfCEHiPBTW0/Mx2OdI7OSYdKLU+ZhwmdoopopIa+zC3yT1njhWOazv+A/7pXZdItfdhgjvZjRREHoFI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR04MB6090 X-Spam-Status: No, score=-13.2 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: Following the arrangement in GCC select a 64-bit ABI by default, either n32 or n64, rather than o32 for `mipsisa64*-*-linux*' targets, just as with the corresponding `mips64*-*-linux*' targets. --- bfd/config.bfd | 8 ++++---- binutils/testsuite/binutils-all/mips/mips.exp | 3 ++- binutils/testsuite/binutils-all/objcopy.exp | 2 +- binutils/testsuite/binutils-all/remove-relocs-01.d | 2 +- binutils/testsuite/binutils-all/remove-relocs-04.d | 2 +- binutils/testsuite/binutils-all/remove-relocs-05.d | 2 +- binutils/testsuite/binutils-all/remove-relocs-06.d | 2 +- gas/configure | 6 +++--- gas/configure.ac | 6 +++--- gas/testsuite/gas/mips/compact-eh-eb-7.d | 2 +- gas/testsuite/gas/mips/compact-eh-el-7.d | 2 +- ld/configure.tgt | 10 ++++++---- 12 files changed, 25 insertions(+), 22 deletions(-) diff --git a/bfd/config.bfd b/bfd/config.bfd index 08129e6a8cb..55fd02e787c 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -956,21 +956,21 @@ case "${targ}" in targ_defvec=mips_elf32_be_vec targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" ;; - mips64*el-*-linux*-gnuabi64) + mips64*el-*-linux*-gnuabi64 | mipsisa64*el-*-linux*-gnuabi64) targ_defvec=mips_elf64_trad_le_vec targ_selvecs="mips_elf64_trad_be_vec mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec" want64=true ;; - mips64*el-*-linux*) + mips64*el-*-linux* | mipsisa64*el-*-linux*) targ_defvec=mips_elf32_ntrad_le_vec targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec" ;; - mips64*-*-linux*-gnuabi64) + mips64*-*-linux*-gnuabi64 | mipsisa64*-*-linux*-gnuabi64) targ_defvec=mips_elf64_trad_be_vec targ_selvecs="mips_elf64_trad_le_vec mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec" want64=true ;; - mips64*-*-linux*) + mips64*-*-linux* | mipsisa64*-*-linux*) targ_defvec=mips_elf32_ntrad_be_vec targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" ;; diff --git a/binutils/testsuite/binutils-all/mips/mips.exp b/binutils/testsuite/binutils-all/mips/mips.exp index fdab97180e3..dc4450db74a 100644 --- a/binutils/testsuite/binutils-all/mips/mips.exp +++ b/binutils/testsuite/binutils-all/mips/mips.exp @@ -121,7 +121,8 @@ set abi_ldflags(eabi) "" # Override as needed. if {[istarget *-*-openbsd*] } { set irixemul 0 -} elseif { [istarget mips64*-*-linux*] } { +} elseif { [istarget mips64*-*-linux*] \ + || [istarget mipsisa64*-*-linux*] } { if [istarget *el-*-*] { set abi_asflags(o32) -32 set abi_ldflags(o32) -melf32ltsmip diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index 34a9b3ff5b2..e9b5eb4e3a7 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -1276,7 +1276,7 @@ if [is_elf_format] { run_dump_test "strip-12" if { [istarget "mips64*-*-openbsd*"] \ - || [istarget "mips64*-*-*-gnuabi64"] } { + || [istarget "mipsisa64*-*-*-gnuabi64"] } { set reloc_format mips64 } # A relocation type not supported by any target diff --git a/binutils/testsuite/binutils-all/remove-relocs-01.d b/binutils/testsuite/binutils-all/remove-relocs-01.d index aeceba117d1..1ef10374232 100644 --- a/binutils/testsuite/binutils-all/remove-relocs-01.d +++ b/binutils/testsuite/binutils-all/remove-relocs-01.d @@ -2,7 +2,7 @@ #source: remove-relocs-01.s #objcopy: --remove-relocations=.data.relocs.01 #readelf: -r -#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 +#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 mipsisa64*-*-*-gnuabi64 Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries: .* diff --git a/binutils/testsuite/binutils-all/remove-relocs-04.d b/binutils/testsuite/binutils-all/remove-relocs-04.d index 4ae7a90f0f1..3037423a911 100644 --- a/binutils/testsuite/binutils-all/remove-relocs-04.d +++ b/binutils/testsuite/binutils-all/remove-relocs-04.d @@ -2,7 +2,7 @@ #source: remove-relocs-01.s #objcopy: --remove-relocations=.data.relocs.0\[12\] #readelf: -r -#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 +#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 mipsisa64*-*-*-gnuabi64 Relocation section '\.rela?\.data\.relocs\.03' at offset 0x[0-9a-f]+ contains 3 entries: .* diff --git a/binutils/testsuite/binutils-all/remove-relocs-05.d b/binutils/testsuite/binutils-all/remove-relocs-05.d index 0f3591786b3..847f39f3b25 100644 --- a/binutils/testsuite/binutils-all/remove-relocs-05.d +++ b/binutils/testsuite/binutils-all/remove-relocs-05.d @@ -2,7 +2,7 @@ #source: remove-relocs-01.s #objcopy: --remove-section=.rela.data.relocs.01 --remove-section=.rel.data.relocs.01 #readelf: -r -#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 +#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 mipsisa64*-*-*-gnuabi64 Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries: .* diff --git a/binutils/testsuite/binutils-all/remove-relocs-06.d b/binutils/testsuite/binutils-all/remove-relocs-06.d index f530d300087..363b0934a65 100644 --- a/binutils/testsuite/binutils-all/remove-relocs-06.d +++ b/binutils/testsuite/binutils-all/remove-relocs-06.d @@ -2,7 +2,7 @@ #source: remove-relocs-01.s #objcopy: --remove-relocations=.data.relocs.* --remove-relocations=!.data.relocs.02 #readelf: -r -#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 +#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 mipsisa64*-*-*-gnuabi64 Relocation section '\.rela?\.data\.relocs\.02' at offset 0x[0-9a-f]+ contains 3 entries: .* diff --git a/gas/configure b/gas/configure index 6a2f56f928a..9c692119083 100755 --- a/gas/configure +++ b/gas/configure @@ -12276,11 +12276,11 @@ _ACEOF esac # Decide which ABI to target by default. case ${target} in - mips64*-openbsd* | mips64*-linux-gnuabi64) + mips64*-openbsd* | mips64*-linux-gnuabi64 | mipsisa64*-linux-gnuabi64) mips_default_abi=N64_ABI ;; - mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ - | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) + mips64*-linux* | mipsisa64*-linux* | mips-sgi-irix6* \ + | mips64*-freebsd* | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) mips_default_abi=N32_ABI ;; mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu) diff --git a/gas/configure.ac b/gas/configure.ac index d0b4cfb0310..d756974e0c2 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -394,11 +394,11 @@ changequote([,])dnl esac # Decide which ABI to target by default. case ${target} in - mips64*-openbsd* | mips64*-linux-gnuabi64) + mips64*-openbsd* | mips64*-linux-gnuabi64 | mipsisa64*-linux-gnuabi64) mips_default_abi=N64_ABI ;; - mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \ - | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) + mips64*-linux* | mipsisa64*-linux* | mips-sgi-irix6* \ + | mips64*-freebsd* | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*) mips_default_abi=N32_ABI ;; mips*-linux* | mips*-freebsd* | mips*-kfreebsd*-gnu) diff --git a/gas/testsuite/gas/mips/compact-eh-eb-7.d b/gas/testsuite/gas/mips/compact-eh-eb-7.d index 973e69fe31a..4e53e57e626 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-7.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-7.d @@ -2,7 +2,7 @@ #name: Compact EH EB #7 with personality id and fallback FDE #source: compact-eh-7.s #as: -EB -mno-pdr -#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 +#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 mipsisa64*-*-*-gnuabi64 .*: file format.* diff --git a/gas/testsuite/gas/mips/compact-eh-el-7.d b/gas/testsuite/gas/mips/compact-eh-el-7.d index fb7dde9252f..e83e133f9d4 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-7.d +++ b/gas/testsuite/gas/mips/compact-eh-el-7.d @@ -2,7 +2,7 @@ #name: Compact EH EL #7 with personality id and fallback FDE #source: compact-eh-7.s #as: -EL -mno-pdr -#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 +#notarget: mips64*-*-openbsd* mips64*-*-*-gnuabi64 mipsisa64*-*-*-gnuabi64 .*: file format.* diff --git a/ld/configure.tgt b/ld/configure.tgt index 3aa595ef130..1a0b88f3f63 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -587,21 +587,23 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvxworks ;; mips*-*-windiss) targ_emul=elf32mipswindiss ;; -mips64*el-*-linux-gnuabi64) +mips64*el-*-linux-gnuabi64 | mipsisa64*el-*-linux-gnuabi64) targ_emul=elf64ltsmip targ_extra_emuls="elf64btsmip elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 +mips64*el-*-linux-* | mipsisa64*el-*-linux-*) + targ_emul=elf32ltsmipn32 targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips64*-*-linux-gnuabi64) +mips64*-*-linux-gnuabi64 | mipsisa64*-*-linux-gnuabi64) targ_emul=elf64btsmip targ_extra_emuls="elf64ltsmip elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip" targ_extra_libpath=$targ_extra_emuls ;; -mips64*-*-linux-*) targ_emul=elf32btsmipn32 +mips64*-*-linux-* | mipsisa64*-*-linux-*) + targ_emul=elf32btsmipn32 targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" targ_extra_libpath=$targ_extra_emuls ;; -- 2.39.2