From patchwork Thu May 28 11:23:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sivan Shani X-Patchwork-Id: 135914 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C87524BA2E18 for ; Thu, 28 May 2026 11:25:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C87524BA2E18 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=WBpOTwpx; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=WBpOTwpx X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11013032.outbound.protection.outlook.com [52.101.72.32]) by sourceware.org (Postfix) with ESMTPS id D0EFB4BA2E06 for ; Thu, 28 May 2026 11:25:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0EFB4BA2E06 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D0EFB4BA2E06 Authentication-Results: sourceware.org; arc=pass smtp.remote-ip=52.101.72.32 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1779967509; cv=pass; b=vCLsGzuTqjYQ0E4JT+ANBUkfULuW9ni7oZjkbZt2YJIlW7e+t/XqDt8ltStzQONI2Rai0ygX41nn7kTdpK6PCozNF8cJQJpLv2JFyI2dGZZt9p+Cm8J6nrZkp1ZqzlY0qTE6FoK85xtrTDmG2o3e/Esgf1UZHybSQq2Q7q0d190= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1779967509; c=relaxed/simple; bh=E3/VefcZgmTHgGKSI4K+bW55OBkZxFQ1oHGVRXxY0XY=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=JqrV/I7Hm2wk4LI6BLDrY0Q3fBnhW9A5MBDNL+D4mZ++MHn+1nudE6gK8tkzSr3H4uzS0Fd+bdj/d+O+ooDFIhpc0wwKGCW+MVICB6eZaJ2D3nThEu13xefyYihHrrk6jOMLpuRMG0pzvKC3qHTHZVOFWhFbr6fSQgGH5Lhcs7I= ARC-Authentication-Results: i=3; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=WBpOTwpx; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=WBpOTwpx DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D0EFB4BA2E06 ARC-Seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=qYS08sKRCX1kP5u3Uq50g30EgXev+0LQeimUXe/3WP2NSWLYx5N/EiFrjOaVqjdiYwRwPYCWH6rc5dlMIDtwJiXiCzTa7odzfrtNG4tMwInoFQkvFxWYH/Un0sg2AG775/rfC1caKsyCF+8YWHpysfQ8+dBqMv2Rnvfw6SvTg3Qr+gpeUSxwIec/KA5eVpuWlRRP5FneAQg3ZhVgm700GpkdZ65HRGTvcMnwm7JB/xbypj1B8/ggwfNOf5FXQ3QBoImalqi/QHdKGIkc3Ac7JTtUrRze2R7SirdgpxJyvEXw2h8mZXReiYTDR0W6wbUPnhB0Kvgy486BwkMjVlADgA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=303T/T2KaLFIpO6m7r1jAzTthgD4DeTTOx3Pf0CXz3s=; b=Brs+kX+HW8nrlHMhm7kKHosksOj2Et9I88F7VC3ncFyfWBdTPsa7ttKdNrN1d9vGzA5Ezxv+pRkhvunnlBcN0y1zcTK2FrwFyIEJJ8ukqElrt7YM2biW5NajwOlWECOXgH19oYE5a3Dz9Uyi9fdjWPpujVcQqJzy3nwih0MNlpntY4DP7UPvuy+Xf1kbT0OXGC4usLBqfAO7G1/FvjHeP7/X4w8IczzwW4Xr5Z2NezvsSNmpIqr3cR7EULf4xeQy78Byaw9TBAv+mTjK5/QyFJ4vqXVML0dTQ19KMMksYEd0EedLcNVhMD5LrbbGiAYk5n9/4sSX/xkOWdOZxtNuQQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 4.158.2.129) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=arm.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=303T/T2KaLFIpO6m7r1jAzTthgD4DeTTOx3Pf0CXz3s=; b=WBpOTwpxcZt3XBrFa6g4Ea4SEr+zwvsJwdnwV8sGM2Xs3vq1RACH911W+v62zWlbtANPlD0q18xn2FRPMjAUpbHiofJgiPtGLd07bbKUbz3h+iaGClh4VFlM9ZPlCqDgNK2ekmijCUH4mt61hl9be17VLZcxewpC0nct4PY+bfE= Received: from DB9PR01CA0022.eurprd01.prod.exchangelabs.com (2603:10a6:10:1d8::27) by GVXPR08MB11744.eurprd08.prod.outlook.com (2603:10a6:150:316::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.12; Thu, 28 May 2026 11:24:56 +0000 Received: from DU6PEPF00009525.eurprd02.prod.outlook.com (2603:10a6:10:1d8:cafe::87) by DB9PR01CA0022.outlook.office365.com (2603:10a6:10:1d8::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.71.13 via Frontend Transport; Thu, 28 May 2026 11:24:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 4.158.2.129) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=arm.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 4.158.2.129 as permitted sender) receiver=protection.outlook.com; client-ip=4.158.2.129; helo=outbound-uk1.az.dlp.m.darktrace.com; pr=C Received: from outbound-uk1.az.dlp.m.darktrace.com (4.158.2.129) by DU6PEPF00009525.mail.protection.outlook.com (10.167.8.6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.71.7 via Frontend Transport; Thu, 28 May 2026 11:24:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ysPtNY7u7VT7jMpSdhdIywY0BlvvvrMuilJ2pm577bls/tvm878iOjps/GQdU7Rj8atGRZrnLwBCSLdoxymBVSihFn5Upr2Ti6YP+02ePI1irShAfF2r8vMbCaQQmlo/JZpOGxZAqzGhEDVH/8HTfJip/Z4E/SERuqy1EWxGXlILdII+ONEOf5Af/UKfNs9XL0R3SSFrqlornlCG4SXFgemXY06AsrjabBZ1/5fP7Q+lSPerLPuCzPrvpmAEDdGlmUvpZrUyx4VzICzFHnnPO8ZRoWwVP+xS2tdtjdFAjcrHTnEfkAG4UptkpZMSykKlBwBP0uLbLhShyYwFVLgQPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=303T/T2KaLFIpO6m7r1jAzTthgD4DeTTOx3Pf0CXz3s=; b=KFfJZWmiWnCDgsyiYz028Az1TcLDQ1r7VYVPpxCncYV6yjEJxr49qNtjv/KsxeosXTyDNz+rPEiOCtuiLFwy74mHAmqwrGDK7IxlrM3U0vOtPV9Oydk8tjrCZJxYQMXwluoRjyxnhPoZYs4O0guHSmMBl0wCi+8J/aOQSLLjX+lH+hmqNwtSssfNEkZhFjw/vBt0AJAOodHOiJjnbGSq6O6s8O8ZhQqum3OGOqGq8N1EgGZhfLdsRR0zy6lA9KpkrY1cVP8jhI2bPgscdlr1lELc/VLLysKK7ToPwF2wkx1SVVEAzimTQ0sWY7wHuqnYHH0c9b2oVpW2ij/4B02tZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 172.205.89.229) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=303T/T2KaLFIpO6m7r1jAzTthgD4DeTTOx3Pf0CXz3s=; b=WBpOTwpxcZt3XBrFa6g4Ea4SEr+zwvsJwdnwV8sGM2Xs3vq1RACH911W+v62zWlbtANPlD0q18xn2FRPMjAUpbHiofJgiPtGLd07bbKUbz3h+iaGClh4VFlM9ZPlCqDgNK2ekmijCUH4mt61hl9be17VLZcxewpC0nct4PY+bfE= Received: from AS4P190CA0034.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d1::10) by DU4PR08MB11271.eurprd08.prod.outlook.com (2603:10a6:10:61c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.14; Thu, 28 May 2026 11:23:49 +0000 Received: from AMS0EPF000001AA.eurprd05.prod.outlook.com (2603:10a6:20b:5d1:cafe::7d) by AS4P190CA0034.outlook.office365.com (2603:10a6:20b:5d1::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.71.14 via Frontend Transport; Thu, 28 May 2026 11:23:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 172.205.89.229) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 172.205.89.229 as permitted sender) receiver=protection.outlook.com; client-ip=172.205.89.229; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (172.205.89.229) by AMS0EPF000001AA.mail.protection.outlook.com (10.167.16.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.7 via Frontend Transport; Thu, 28 May 2026 11:23:48 +0000 Received: from AZ-NEU-EX04.Arm.com (10.240.25.138) by AZ-NEU-EX03.Arm.com (10.240.25.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Thu, 28 May 2026 11:23:47 +0000 Received: from ip-10-249-56-69.eu-west-1.compute.internal (10.249.56.69) by mail.arm.com (10.240.25.138) with Microsoft SMTP Server id 15.2.2562.29 via Frontend Transport; Thu, 28 May 2026 11:23:47 +0000 From: Sivan Shani To: Subject: [PATCH] gas, bfd, gold: Rename Arm v8/v9 architecture tags Date: Thu, 28 May 2026 11:23:20 +0000 Message-ID: <20260528112347.105400-1-sivan.shani@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: AMS0EPF000001AA:EE_|DU4PR08MB11271:EE_|DU6PEPF00009525:EE_|GVXPR08MB11744:EE_ X-MS-Office365-Filtering-Correlation-Id: 5564cea1-a8b5-460a-df02-08debcabbe62 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; ARA:13230040|82310400026|36860700016|376014|1800799024|18002099003|22082099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info-Original: N4ZSkM/TlisserSKkqnD1jsafNMWqkq8L1XtL4O2gdxwumIQRMQ9TfqZjY362LlWbnZE12Bdfi848opWv3kjzivawr6A5EUKoGl+W89ewNsNd4YOBGyWZvnWFgVlG1O17QdzUSOOnTGrzwWWXMzC98uy44TP7BQTC4XdBs1Tbeg6drYsMlcVMLSLTtlRZYnX7hZ6HBQgoftjLhJFDkScueQ59rg0by4bIXNRHRnEf1FMujEnm0JSWH4QJONqofEO3zmnyz1QtmPgZADF6fBzjeQ/nT7J31DF1RL/u2mxZDxlZrj2oxpvM15FAiq+44/0LJJW6h3jJWXw3Io5VSgnXvpC7JsOZfsETz64Yj/Mu488DrApB0HYdABgQWColFC2APRF4t6LNuJz5UidezLiLl/JsLztTlNMPIO0hEr1u6xt4IR+DOj1jIAHoq+xdYHvJ7Ln+Y76vweIAtSMK95d5kXuI9Ijt9c05AmxCIGiU5flPnyE0wSPfXvmB3eunxYn7posJ5p067u/GQUIdteHfPGHm1zE+hMaXN010SIOqVLCH34I/2FGk7FylgcGZ8C1HUoEjbzqj0DBxhsxl8l1K648NP9ZgsGEj5+Nk4Tz/+Wt3UP+ZPYdJNtwDq+hd/WLifmDU3waUUEHtsUgK3AX7pNb2KdZhVNmiNCGNoO60kLpiwWATNPB9prd+Ji2eEZrqr8gx+oJXwvdfhedCk9USbBUqJ5FJwRMRnY1Xg4lac4= X-Forefront-Antispam-Report-Untrusted: CIP:172.205.89.229; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700016)(376014)(1800799024)(18002099003)(22082099003)(11063799006)(56012099006); DIR:OUT; SFP:1101; X-Exchange-RoutingPolicyChecked: AfMofSWsb4JQ8DRBpRmMYNEXU9xNWiMTrIiHXL/5VRjfr7WAHazF9qda1l30rH1Is6MOI4Rl5pQoJ6ceT/9WkCqxXuB+w6d7BwRpDKQTQ7YtMg5tkUhe0bWBAjqC5JXj2buhJZx3W8s6ADtICT/6lb/h6n1MZHDIPV41yo0mQd/VxhiuFwzhbLpUMANayk/m9/Rp/Pb47H1NV0LGig1i/ETrbTszvERmG49wupMePisGxfQrWBx0neWJNgU+fYFW2TN71isezvjDViYAeHaoWCJ2mskU41QWWta+31j/u2WLZIWHQoQxOJmOkFjZVwukKZWR+oFtAbloaE9lGjxp7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR08MB11271 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DU6PEPF00009525.eurprd02.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 97a97fdc-6b75-41c3-103c-08debcab9681 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|35042699022|82310400026|14060799003|36860700016|1800799024|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: umdzi+yErlB0lCFO/3uGjyvqlYZfj2niIbtwil2D3f5Mq6NCYUoMjE8qfrmolBkpaOoKxYJzHX4TH8rHADpM60QAy87kG+vzAtw8SGOWAHHz1HOrwz0jR9PX3vm+bvS+ITrySmOOwg4S7AR2NC+1fiLiAgbNNfr8wmBCQNZqVBtoAx1d3D6C6Lfklhr2nsJof5N1dNfkq5Wot36CGmlNjTrYNLRt4cH/gK6mvcFrKdfeq4wWEGDJFAmo8qKgITkvRr7zqjUTTQm8lIW0fOnLmszAQuB9CycJ/qH5Y4waHvTodpIDDuKw/tknp0K/x+l6B+fIQ8JCnGGylvcbAn4W4ZzINoEqwOitqYjaakwsBRktYSpJQWIci9GO7Enjgh92fukUe3VW+OQIkjW8wet90pLr9PY/rrCjHOLDXvUO906o7dO9iUQg6o+fd41+jwi9ziSApq5+pLL5O7NAJhL8cAMJ1pDruOkJHOS6k/30/p4bzgobY6Y2g+MzLkw5RMEZwUgqGfZ9QkuBIxVAq2vEAtveC5MRnnOzL3TgkRCqyl94lDm6qJrPJJb2z2d3WK85jaeprx5/aGb8YKO2+gGzq1+W1UFV59UA3MEQCDzTqL4iMOUT4BTggLkUOP3wVvwthyRqJDsiLEwHZry1/qa26KgN2OYfD/Ym10Osdz1vpv+bQuvEHmcwr7Edx7h1pAkBJWoTvt0T7XBdzVqgaFLthhgHYaxIHObOz7FaPRVYhZ4= X-Forefront-Antispam-Report: CIP:4.158.2.129; CTRY:GB; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:outbound-uk1.az.dlp.m.darktrace.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(35042699022)(82310400026)(14060799003)(36860700016)(1800799024)(56012099006)(11063799006)(18002099003)(22082099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lmOFOGdcS/p9ll1naTr2WF5bD2eViOM4aq3YzATICscduT7JU4OoaqeiRV6NuyUHC8yaHnpUTUE9U+quzgsjOx5nYdw8zWyRvEHLBoa4kz6yOwSt2xLUitcX03aBpLxRHifuO9VVgKJx6IP/cVFqBM37OINpbYqCJTDu1AXtIQ0PSHjvCfYT3tF0ZvhbwXPJexPnzKbyWjR/FIEgyFnyz0aCO8gFezQJcFSDF6pa+mhWo/HyWo5xv88ha2zs7k/Q9/zekJphgfbXeJG6STFayje8PyaUqmOg+rhXy86gk5KgugI+KCEDiNkKYlX+fJ2bWeinNPFDbRes4RwxAco9Qyu28JtxRnc+9XbSFp4IQ3OP6eI3eCiWzfAJCiF7zlNExS9kqCIOcWMagz4KALxyn+iA+tRJJ7hywKpKnf5UmgBFmioUxAL3Hy0GpqVGE8zh X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2026 11:24:55.2330 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5564cea1-a8b5-460a-df02-08debcabbe62 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[4.158.2.129]; Helo=[outbound-uk1.az.dlp.m.darktrace.com] X-MS-Exchange-CrossTenant-AuthSource: DU6PEPF00009525.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB11744 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, URIBL_BLOCKED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org Rename the Arm AEABI CPU architecture tag constants and macro definitions to include the profile suffix for A-profile architectures. This makes the naming consistent with existing v8-R and v8-M tag names, while preserving the existing numeric tag values. Update BFD, GAS and Gold usage accordingly, including attribute combination tables, architecture checks, and mach selection. Thanks, formatting fixed. --- bfd/archures.c | 4 +- bfd/bfd-in2.h | 4 +- bfd/cpu-arm.c | 46 ++++++++--------- bfd/elf32-arm.c | 120 ++++++++++++++++++++++---------------------- elfcpp/arm.h | 12 ++--- gas/config/tc-arm.c | 38 +++++++------- gold/arm.cc | 32 ++++++------ include/elf/arm.h | 12 ++--- opcodes/arm-dis.c | 4 +- 9 files changed, 136 insertions(+), 136 deletions(-) diff --git a/bfd/archures.c b/bfd/archures.c index 8cfc81eebb9..0e919246673 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -327,12 +327,12 @@ DESCRIPTION .#define bfd_mach_arm_6M 20 .#define bfd_mach_arm_6SM 21 .#define bfd_mach_arm_7EM 22 -.#define bfd_mach_arm_8 23 +.#define bfd_mach_arm_8A 23 .#define bfd_mach_arm_8R 24 .#define bfd_mach_arm_8M_BASE 25 .#define bfd_mach_arm_8M_MAIN 26 .#define bfd_mach_arm_8_1M_MAIN 27 -.#define bfd_mach_arm_9 28 +.#define bfd_mach_arm_9A 28 . bfd_arch_nds32, {* Andes NDS32. *} .#define bfd_mach_n1 1 .#define bfd_mach_n1h 2 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 4d157611217..e177b2a4023 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1571,12 +1571,12 @@ enum bfd_architecture #define bfd_mach_arm_6M 20 #define bfd_mach_arm_6SM 21 #define bfd_mach_arm_7EM 22 -#define bfd_mach_arm_8 23 +#define bfd_mach_arm_8A 23 #define bfd_mach_arm_8R 24 #define bfd_mach_arm_8M_BASE 25 #define bfd_mach_arm_8M_MAIN 26 #define bfd_mach_arm_8_1M_MAIN 27 -#define bfd_mach_arm_9 28 +#define bfd_mach_arm_9A 28 bfd_arch_nds32, /* Andes NDS32. */ #define bfd_mach_n1 1 #define bfd_mach_n1h 2 diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c index dba7ad4c5ce..a97f3070f6e 100644 --- a/bfd/cpu-arm.c +++ b/bfd/cpu-arm.c @@ -139,20 +139,20 @@ processors[] = { bfd_mach_arm_7, "cortex-a12" }, { bfd_mach_arm_7, "cortex-a15" }, { bfd_mach_arm_7, "cortex-a17" }, - { bfd_mach_arm_8, "cortex-a32" }, - { bfd_mach_arm_8, "cortex-a35" }, - { bfd_mach_arm_8, "cortex-a53" }, - { bfd_mach_arm_8, "cortex-a55" }, - { bfd_mach_arm_8, "cortex-a57" }, - { bfd_mach_arm_8, "cortex-a72" }, - { bfd_mach_arm_8, "cortex-a73" }, - { bfd_mach_arm_8, "cortex-a75" }, - { bfd_mach_arm_8, "cortex-a76" }, - { bfd_mach_arm_8, "cortex-a76ae" }, - { bfd_mach_arm_8, "cortex-a77" }, - { bfd_mach_arm_8, "cortex-a78" }, - { bfd_mach_arm_8, "cortex-a78ae" }, - { bfd_mach_arm_8, "cortex-a78c" }, + { bfd_mach_arm_8A, "cortex-a32" }, + { bfd_mach_arm_8A, "cortex-a35" }, + { bfd_mach_arm_8A, "cortex-a53" }, + { bfd_mach_arm_8A, "cortex-a55" }, + { bfd_mach_arm_8A, "cortex-a57" }, + { bfd_mach_arm_8A, "cortex-a72" }, + { bfd_mach_arm_8A, "cortex-a73" }, + { bfd_mach_arm_8A, "cortex-a75" }, + { bfd_mach_arm_8A, "cortex-a76" }, + { bfd_mach_arm_8A, "cortex-a76ae" }, + { bfd_mach_arm_8A, "cortex-a77" }, + { bfd_mach_arm_8A, "cortex-a78" }, + { bfd_mach_arm_8A, "cortex-a78ae" }, + { bfd_mach_arm_8A, "cortex-a78c" }, { bfd_mach_arm_6SM, "cortex-m0" }, { bfd_mach_arm_6SM, "cortex-m0plus" }, { bfd_mach_arm_6SM, "cortex-m1" }, @@ -166,13 +166,13 @@ processors[] = { bfd_mach_arm_7, "cortex-r4f" }, { bfd_mach_arm_7, "cortex-r5" }, { bfd_mach_arm_8R, "cortex-r52" }, - { bfd_mach_arm_8R, "cortex-r52plus" }, + { bfd_mach_arm_8R, "cortex-r52plus" }, { bfd_mach_arm_7, "cortex-r7" }, { bfd_mach_arm_7, "cortex-r8" }, - { bfd_mach_arm_8, "cortex-x1" }, - { bfd_mach_arm_8, "cortex-x1c" }, + { bfd_mach_arm_8A, "cortex-x1" }, + { bfd_mach_arm_8A, "cortex-x1c" }, { bfd_mach_arm_4T, "ep9312" }, - { bfd_mach_arm_8, "exynos-m1" }, + { bfd_mach_arm_8A, "exynos-m1" }, { bfd_mach_arm_4, "fa526" }, { bfd_mach_arm_5TE, "fa606te" }, { bfd_mach_arm_5TE, "fa616te" }, @@ -192,9 +192,9 @@ processors[] = { bfd_mach_arm_4, "strongarm1100" }, { bfd_mach_arm_4, "strongarm1110" }, { bfd_mach_arm_XScale, "xscale" }, - { bfd_mach_arm_8, "xgene1" }, - { bfd_mach_arm_8, "xgene2" }, - { bfd_mach_arm_9, "cortex-a710" }, + { bfd_mach_arm_8A, "xgene1" }, + { bfd_mach_arm_8A, "xgene2" }, + { bfd_mach_arm_9A, "cortex-a710" }, { bfd_mach_arm_iWMMXt, "iwmmxt" }, { bfd_mach_arm_iWMMXt2, "iwmmxt2" }, { bfd_mach_arm_unknown, "arm_any" } @@ -262,12 +262,12 @@ static const bfd_arch_info_type arch_info_struct[] = N (bfd_mach_arm_6M, "armv6-m", false, & arch_info_struct[19]), N (bfd_mach_arm_6SM, "armv6s-m", false, & arch_info_struct[20]), N (bfd_mach_arm_7EM, "armv7e-m", false, & arch_info_struct[21]), - N (bfd_mach_arm_8, "armv8-a", false, & arch_info_struct[22]), + N (bfd_mach_arm_8A, "armv8-a", false, & arch_info_struct[22]), N (bfd_mach_arm_8R, "armv8-r", false, & arch_info_struct[23]), N (bfd_mach_arm_8M_BASE, "armv8-m.base", false, & arch_info_struct[24]), N (bfd_mach_arm_8M_MAIN, "armv8-m.main", false, & arch_info_struct[25]), N (bfd_mach_arm_8_1M_MAIN, "armv8.1-m.main", false, & arch_info_struct[26]), - N (bfd_mach_arm_9, "armv9-a", false, & arch_info_struct[27]), + N (bfd_mach_arm_9A, "armv9-a", false, & arch_info_struct[27]), N (bfd_mach_arm_unknown, "arm_any", false, NULL) }; diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index bb0a24127ab..0447d60de7b 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -3876,7 +3876,7 @@ using_thumb2 (struct elf32_arm_link_hash_table *globals) return (arch == TAG_CPU_ARCH_V6T2 || arch == TAG_CPU_ARCH_V7 || arch == TAG_CPU_ARCH_V7E_M - || arch == TAG_CPU_ARCH_V8 + || arch == TAG_CPU_ARCH_V8A || arch == TAG_CPU_ARCH_V8R || arch == TAG_CPU_ARCH_V8M_MAIN || arch == TAG_CPU_ARCH_V8_1M_MAIN); @@ -3891,7 +3891,7 @@ using_thumb2_bl (struct elf32_arm_link_hash_table *globals) bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC, Tag_CPU_arch); /* Force return logic to be reviewed for each new architecture. */ - BFD_ASSERT (arch <= TAG_CPU_ARCH_V9); + BFD_ASSERT (arch <= TAG_CPU_ARCH_V9A); /* Architecture was introduced after ARMv6T2 (eg. ARMv6-M). */ return (arch == TAG_CPU_ARCH_V6T2 @@ -4032,14 +4032,14 @@ arch_has_arm_nop (struct elf32_arm_link_hash_table *globals) Tag_CPU_arch); /* Force return logic to be reviewed for each new architecture. */ - BFD_ASSERT (arch <= TAG_CPU_ARCH_V9); + BFD_ASSERT (arch <= TAG_CPU_ARCH_V9A); return (arch == TAG_CPU_ARCH_V6T2 || arch == TAG_CPU_ARCH_V6K || arch == TAG_CPU_ARCH_V7 - || arch == TAG_CPU_ARCH_V8 + || arch == TAG_CPU_ARCH_V8A || arch == TAG_CPU_ARCH_V8R - || arch == TAG_CPU_ARCH_V9); + || arch == TAG_CPU_ARCH_V9A); } static bool @@ -13767,8 +13767,8 @@ bfd_arm_get_mach_from_attributes (bfd * abfd) return bfd_mach_arm_6SM; case TAG_CPU_ARCH_V7E_M: return bfd_mach_arm_7EM; - case TAG_CPU_ARCH_V8: - return bfd_mach_arm_8; + case TAG_CPU_ARCH_V8A: + return bfd_mach_arm_8A; case TAG_CPU_ARCH_V8R: return bfd_mach_arm_8R; case TAG_CPU_ARCH_V8M_BASE: @@ -13777,8 +13777,8 @@ bfd_arm_get_mach_from_attributes (bfd * abfd) return bfd_mach_arm_8M_MAIN; case TAG_CPU_ARCH_V8_1M_MAIN: return bfd_mach_arm_8_1M_MAIN; - case TAG_CPU_ARCH_V9: - return bfd_mach_arm_9; + case TAG_CPU_ARCH_V9A: + return bfd_mach_arm_9A; default: /* Force entry to be added for any new known Tag_CPU_arch value. */ @@ -14111,28 +14111,28 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, }; static const int v8[] = { - T(V8), /* PRE_V4. */ - T(V8), /* V4. */ - T(V8), /* V4T. */ - T(V8), /* V5T. */ - T(V8), /* V5TE. */ - T(V8), /* V5TEJ. */ - T(V8), /* V6. */ - T(V8), /* V6KZ. */ - T(V8), /* V6T2. */ - T(V8), /* V6K. */ - T(V8), /* V7. */ - T(V8), /* V6_M. */ - T(V8), /* V6S_M. */ - T(V8), /* V7E_M. */ - T(V8), /* V8. */ - T(V8), /* V8-R. */ - T(V8), /* V8-M.BASE. */ - T(V8), /* V8-M.MAIN. */ - T(V8), /* V8.1. */ - T(V8), /* V8.2. */ - T(V8), /* V8.3. */ - T(V8), /* V8.1-M.MAIN. */ + T(V8A), /* PRE_V4. */ + T(V8A), /* V4. */ + T(V8A), /* V4T. */ + T(V8A), /* V5T. */ + T(V8A), /* V5TE. */ + T(V8A), /* V5TEJ. */ + T(V8A), /* V6. */ + T(V8A), /* V6KZ. */ + T(V8A), /* V6T2. */ + T(V8A), /* V6K. */ + T(V8A), /* V7. */ + T(V8A), /* V6_M. */ + T(V8A), /* V6S_M. */ + T(V8A), /* V7E_M. */ + T(V8A), /* V8A. */ + T(V8A), /* V8-R. */ + T(V8A), /* V8-M.BASE. */ + T(V8A), /* V8-M.MAIN. */ + T(V8A), /* V8.1. */ + T(V8A), /* V8.2. */ + T(V8A), /* V8.3. */ + T(V8A), /* V8.1-M.MAIN. */ }; static const int v8r[] = { @@ -14150,7 +14150,7 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, T(V8R), /* V6_M. */ T(V8R), /* V6S_M. */ T(V8R), /* V7E_M. */ - T(V8), /* V8. */ + T(V8A), /* V8A. */ T(V8R), /* V8R. */ }; static const int v8m_baseline[] = @@ -14169,7 +14169,7 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, T(V8M_BASE), /* V6_M. */ T(V8M_BASE), /* V6S_M. */ -1, /* V7E_M. */ - -1, /* V8. */ + -1, /* V8A. */ -1, /* V8R. */ T(V8M_BASE) /* V8-M BASELINE. */ }; @@ -14189,7 +14189,7 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, T(V8M_MAIN), /* V6_M. */ T(V8M_MAIN), /* V6S_M. */ T(V8M_MAIN), /* V7E_M. */ - -1, /* V8. */ + -1, /* V8A. */ -1, /* V8R. */ T(V8M_MAIN), /* V8-M BASELINE. */ T(V8M_MAIN) /* V8-M MAINLINE. */ @@ -14210,7 +14210,7 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, T(V8_1M_MAIN), /* V6_M. */ T(V8_1M_MAIN), /* V6S_M. */ T(V8_1M_MAIN), /* V7E_M. */ - -1, /* V8. */ + -1, /* V8A. */ -1, /* V8R. */ T(V8_1M_MAIN), /* V8-M BASELINE. */ T(V8_1M_MAIN), /* V8-M MAINLINE. */ @@ -14221,29 +14221,29 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, }; static const int v9[] = { - T(V9), /* PRE_V4. */ - T(V9), /* V4. */ - T(V9), /* V4T. */ - T(V9), /* V5T. */ - T(V9), /* V5TE. */ - T(V9), /* V5TEJ. */ - T(V9), /* V6. */ - T(V9), /* V6KZ. */ - T(V9), /* V6T2. */ - T(V9), /* V6K. */ - T(V9), /* V7. */ - T(V9), /* V6_M. */ - T(V9), /* V6S_M. */ - T(V9), /* V7E_M. */ - T(V9), /* V8. */ - T(V9), /* V8-R. */ - T(V9), /* V8-M.BASE. */ - T(V9), /* V8-M.MAIN. */ - T(V9), /* V8.1. */ - T(V9), /* V8.2. */ - T(V9), /* V8.3. */ - T(V9), /* V8.1-M.MAIN. */ - T(V9), /* V9. */ + T(V9A), /* PRE_V4. */ + T(V9A), /* V4. */ + T(V9A), /* V4T. */ + T(V9A), /* V5T. */ + T(V9A), /* V5TE. */ + T(V9A), /* V5TEJ. */ + T(V9A), /* V6. */ + T(V9A), /* V6KZ. */ + T(V9A), /* V6T2. */ + T(V9A), /* V6K. */ + T(V9A), /* V7. */ + T(V9A), /* V6_M. */ + T(V9A), /* V6S_M. */ + T(V9A), /* V7E_M. */ + T(V9A), /* V8A. */ + T(V9A), /* V8-R. */ + T(V9A), /* V8-M.BASE. */ + T(V9A), /* V8-M.MAIN. */ + T(V9A), /* V8.1. */ + T(V9A), /* V8.2. */ + T(V9A), /* V8.3. */ + T(V9A), /* V8.1-M.MAIN. */ + T(V9A), /* V9A. */ }; static const int v4t_plus_v6_m[] = { @@ -14261,7 +14261,7 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, T(V6_M), /* V6_M. */ T(V6S_M), /* V6S_M. */ T(V7E_M), /* V7E_M. */ - T(V8), /* V8. */ + T(V8A), /* V8A. */ -1, /* V8R. */ T(V8M_BASE), /* V8-M BASELINE. */ T(V8M_MAIN), /* V8-M MAINLINE. */ @@ -14269,7 +14269,7 @@ tag_cpu_arch_combine (bfd *ibfd, int oldtag, int *secondary_compat_out, -1, /* Unused (19). */ -1, /* Unused (20). */ T(V8_1M_MAIN), /* V8.1-M MAINLINE. */ - T(V9), /* V9. */ + T(V9A), /* V9A. */ T(V4T_PLUS_V6_M) /* V4T plus V6_M. */ }; static const int *const comb[] = diff --git a/elfcpp/arm.h b/elfcpp/arm.h index 86f9ab0ed51..6f1c595af0e 100644 --- a/elfcpp/arm.h +++ b/elfcpp/arm.h @@ -253,16 +253,16 @@ enum TAG_CPU_ARCH_V6_M, TAG_CPU_ARCH_V6S_M, TAG_CPU_ARCH_V7E_M, - TAG_CPU_ARCH_V8, + TAG_CPU_ARCH_V8A, TAG_CPU_ARCH_V8R, TAG_CPU_ARCH_V8M_BASE, TAG_CPU_ARCH_V8M_MAIN, - TAG_CPU_ARCH_8_1A, - TAG_CPU_ARCH_8_2A, - TAG_CPU_ARCH_8_3A, + TAG_CPU_ARCH_V8_1A, + TAG_CPU_ARCH_V8_2A, + TAG_CPU_ARCH_V8_3A, TAG_CPU_ARCH_V8_1M_MAIN, - TAG_CPU_ARCH_V9, - MAX_TAG_CPU_ARCH = TAG_CPU_ARCH_V9, + TAG_CPU_ARCH_V9A, + MAX_TAG_CPU_ARCH = TAG_CPU_ARCH_V9A, // Pseudo-architecture to allow objects to be compatible with the subset of // armv4t and armv6-m. This value should never be stored in object files. TAG_CPU_ARCH_V4T_PLUS_V6_M = (MAX_TAG_CPU_ARCH + 1) diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 392ae8d761d..3ff29542411 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -32100,26 +32100,26 @@ static const cpu_arch_ver_table cpu_arch_ver[] = {TAG_CPU_ARCH_V7, ARM_ARCH_V7M}, {TAG_CPU_ARCH_V7, ARM_ARCH_V7VE}, {TAG_CPU_ARCH_V7E_M, ARM_ARCH_V7EM}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_1A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_2A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_3A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_1A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_2A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_3A}, {TAG_CPU_ARCH_V8M_BASE, ARM_ARCH_V8M_BASE}, {TAG_CPU_ARCH_V8M_MAIN, ARM_ARCH_V8M_MAIN}, {TAG_CPU_ARCH_V8R, ARM_ARCH_V8R}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_4A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_5A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_4A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_5A}, {TAG_CPU_ARCH_V8_1M_MAIN, ARM_ARCH_V8_1M_MAIN}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_6A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_7A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_8A}, - {TAG_CPU_ARCH_V8, ARM_ARCH_V8_9A}, - {TAG_CPU_ARCH_V9, ARM_ARCH_V9A}, - {TAG_CPU_ARCH_V9, ARM_ARCH_V9_1A}, - {TAG_CPU_ARCH_V9, ARM_ARCH_V9_2A}, - {TAG_CPU_ARCH_V9, ARM_ARCH_V9_3A}, - {TAG_CPU_ARCH_V9, ARM_ARCH_V9_4A}, - {TAG_CPU_ARCH_V9, ARM_ARCH_V9_5A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_6A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_7A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_8A}, + {TAG_CPU_ARCH_V8A, ARM_ARCH_V8_9A}, + {TAG_CPU_ARCH_V9A, ARM_ARCH_V9A}, + {TAG_CPU_ARCH_V9A, ARM_ARCH_V9_1A}, + {TAG_CPU_ARCH_V9A, ARM_ARCH_V9_2A}, + {TAG_CPU_ARCH_V9A, ARM_ARCH_V9_3A}, + {TAG_CPU_ARCH_V9A, ARM_ARCH_V9_4A}, + {TAG_CPU_ARCH_V9A, ARM_ARCH_V9_5A}, {-1, ARM_ARCH_NONE} }; @@ -32207,9 +32207,9 @@ get_aeabi_cpu_arch_from_fset (const arm_feature_set *arch_ext_fset, if (ARM_FEATURE_EQUAL (*arch_ext_fset, arm_arch_any)) { /* Force revisiting of decision for each new architecture. */ - gas_assert (MAX_TAG_CPU_ARCH <= TAG_CPU_ARCH_V9); + gas_assert (MAX_TAG_CPU_ARCH <= TAG_CPU_ARCH_V9A); *profile = 'A'; - return TAG_CPU_ARCH_V9; + return TAG_CPU_ARCH_V9A; } ARM_CLEAR_FEATURE (arch_fset, *arch_ext_fset, *ext_fset); @@ -32485,7 +32485,7 @@ aeabi_set_public_attributes (void) by the base architecture. For new architectures we will have to check these tests. */ - gas_assert (arch <= TAG_CPU_ARCH_V9); + gas_assert (arch <= TAG_CPU_ARCH_V9A); if (ARM_CPU_HAS_FEATURE (flags, arm_ext_v8) || ARM_CPU_HAS_FEATURE (flags, arm_ext_v8m)) aeabi_set_attribute_int (Tag_DIV_use, 0); diff --git a/gold/arm.cc b/gold/arm.cc index b2a73d67291..86abd6de0ad 100644 --- a/gold/arm.cc +++ b/gold/arm.cc @@ -11065,21 +11065,21 @@ Target_arm::tag_cpu_arch_combine( }; static const int v8[] = { - T(V8), // PRE_V4. - T(V8), // V4. - T(V8), // V4T. - T(V8), // V5T. - T(V8), // V5TE. - T(V8), // V5TEJ. - T(V8), // V6. - T(V8), // V6KZ. - T(V8), // V6T2. - T(V8), // V6K. - T(V8), // V7. - T(V8), // V6_M. - T(V8), // V6S_M. - T(V8), // V7E_M. - T(V8) // V8. + T(V8A), // PRE_V4. + T(V8A), // V4. + T(V8A), // V4T. + T(V8A), // V5T. + T(V8A), // V5TE. + T(V8A), // V5TEJ. + T(V8A), // V6. + T(V8A), // V6KZ. + T(V8A), // V6T2. + T(V8A), // V6K. + T(V8A), // V7. + T(V8A), // V6_M. + T(V8A), // V6S_M. + T(V8A), // V7E_M. + T(V8A) // V8. }; static const int v4t_plus_v6_m[] = { @@ -11097,7 +11097,7 @@ Target_arm::tag_cpu_arch_combine( T(V6_M), // V6_M. T(V6S_M), // V6S_M. T(V7E_M), // V7E_M. - T(V8), // V8. + T(V8A), // V8. T(V4T_PLUS_V6_M) // V4T plus V6_M. }; static const int* comb[] = diff --git a/include/elf/arm.h b/include/elf/arm.h index 091eea5d5d8..2b7af723968 100644 --- a/include/elf/arm.h +++ b/include/elf/arm.h @@ -108,16 +108,16 @@ #define TAG_CPU_ARCH_V6_M 11 #define TAG_CPU_ARCH_V6S_M 12 #define TAG_CPU_ARCH_V7E_M 13 -#define TAG_CPU_ARCH_V8 14 +#define TAG_CPU_ARCH_V8A 14 #define TAG_CPU_ARCH_V8R 15 #define TAG_CPU_ARCH_V8M_BASE 16 #define TAG_CPU_ARCH_V8M_MAIN 17 -#define TAG_CPU_ARCH_8_1A 18 -#define TAG_CPU_ARCH_8_2A 19 -#define TAG_CPU_ARCH_8_3A 20 +#define TAG_CPU_ARCH_V8_1A 18 +#define TAG_CPU_ARCH_V8_2A 19 +#define TAG_CPU_ARCH_V8_3A 20 #define TAG_CPU_ARCH_V8_1M_MAIN 21 -#define TAG_CPU_ARCH_V9 22 -#define MAX_TAG_CPU_ARCH TAG_CPU_ARCH_V9 +#define TAG_CPU_ARCH_V9A 22 +#define MAX_TAG_CPU_ARCH TAG_CPU_ARCH_V9A /* Pseudo-architecture to allow objects to be compatible with the subset of armv4t and armv6-m. This value should never be stored in object files. */ #define TAG_CPU_ARCH_V4T_PLUS_V6_M (MAX_TAG_CPU_ARCH + 1) diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index aa8167d37e7..ef4d3835d95 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -12301,7 +12301,7 @@ select_arm_features (unsigned long mach, case bfd_mach_arm_6M: ARM_SET_FEATURES (ARM_ARCH_V6M); break; case bfd_mach_arm_6SM: ARM_SET_FEATURES (ARM_ARCH_V6SM); break; case bfd_mach_arm_7EM: ARM_SET_FEATURES (ARM_ARCH_V7EM); break; - case bfd_mach_arm_8: + case bfd_mach_arm_8A: { /* Add bits for extensions that Armv8.6-A recognizes. */ arm_feature_set armv8_6_ext_fset @@ -12320,7 +12320,7 @@ select_arm_features (unsigned long mach, ARM_MERGE_FEATURE_SETS (arch_fset, arch_fset, mve_all); force_thumb = 1; break; - case bfd_mach_arm_9: ARM_SET_FEATURES (ARM_ARCH_V9A); break; + case bfd_mach_arm_9A: ARM_SET_FEATURES (ARM_ARCH_V9A); break; /* If the machine type is unknown allow all architecture types and all extensions, with the exception of MVE as that clashes with NEON. */ case bfd_mach_arm_unknown: