This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH ARM] Correct the canonical names of ARM CPUs
- From: Matthew Gretton-Dann <matthew dot gretton-dann at arm dot com>
- To: binutils at sourceware dot org
- Date: Mon, 20 Sep 2010 16:37:50 +0100
- Subject: [PATCH ARM] Correct the canonical names of ARM CPUs
All,
Please can someone review and approve the attached patch which improves
ABI compatibility by making sure that we output the correct canonical
CPU name in Tag_CPU_name in the attributes section.
Tested on arm-none-eabi.
gas/ChangeLog:
2010-09-20 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
* config/tc-arm.c (arm_cpus): Correct canonical names for
Cortex CPUs.
gas/testsuite/ChangeLog:
2010-09-20 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
* gas/arm/attr-cpu-directive.d: Update test for change in
canonical CPU name.
* gas/arm/attr-mcpu.d: Likewise.
ld/testsuite/ChangeLog:
2010-09-20 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
* ld-arm/attr-merge-6.attr: Update test for change in canonical
CPU name.
* ld-arm/attr-merge-7.attr: Likewise.
* ld-arm/attr-merge-2.attr: Likewise.
* ld-arm/attr-merge-arch-2.attr: Likewise.
Thanks,
Matt
--
Matthew Gretton-Dann
Principal Engineer - PDSW Tools
ARM Ltd
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index deb78ce..136e04e 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -22364,27 +22364,28 @@ static const struct arm_cpu_option_table arm_cpus[] =
{"arm1136j-s", ARM_ARCH_V6, FPU_NONE, NULL},
{"arm1136jfs", ARM_ARCH_V6, FPU_ARCH_VFP_V2, "ARM1136JF-S"},
{"arm1136jf-s", ARM_ARCH_V6, FPU_ARCH_VFP_V2, NULL},
- {"mpcore", ARM_ARCH_V6K, FPU_ARCH_VFP_V2, NULL},
- {"mpcorenovfp", ARM_ARCH_V6K, FPU_NONE, NULL},
+ {"mpcore", ARM_ARCH_V6K, FPU_ARCH_VFP_V2, "MPCore"},
+ {"mpcorenovfp", ARM_ARCH_V6K, FPU_NONE, "MPCore"},
{"arm1156t2-s", ARM_ARCH_V6T2, FPU_NONE, NULL},
{"arm1156t2f-s", ARM_ARCH_V6T2, FPU_ARCH_VFP_V2, NULL},
{"arm1176jz-s", ARM_ARCH_V6ZK, FPU_NONE, NULL},
{"arm1176jzf-s", ARM_ARCH_V6ZK, FPU_ARCH_VFP_V2, NULL},
- {"cortex-a5", ARM_ARCH_V7A, FPU_NONE, NULL},
+ {"cortex-a5", ARM_ARCH_V7A, FPU_NONE, "Cortex-A5"},
{"cortex-a8", ARM_ARCH_V7A, ARM_FEATURE (0, FPU_VFP_V3
| FPU_NEON_EXT_V1),
- NULL},
+ "Cortex-A8"},
{"cortex-a9", ARM_ARCH_V7A, ARM_FEATURE (0, FPU_VFP_V3
| FPU_NEON_EXT_V1),
- NULL},
+ "Cortex-A9"},
{"cortex-a15", ARM_ARCH_V7A, FPU_ARCH_NEON_VFP_V4,
"Cortex-A15"},
- {"cortex-r4", ARM_ARCH_V7R, FPU_NONE, NULL},
- {"cortex-r4f", ARM_ARCH_V7R, FPU_ARCH_VFP_V3D16, NULL},
- {"cortex-m4", ARM_ARCH_V7EM, FPU_NONE, NULL},
- {"cortex-m3", ARM_ARCH_V7M, FPU_NONE, NULL},
- {"cortex-m1", ARM_ARCH_V6M, FPU_NONE, NULL},
- {"cortex-m0", ARM_ARCH_V6M, FPU_NONE, NULL},
+ {"cortex-r4", ARM_ARCH_V7R, FPU_NONE, "Cortex-R4"},
+ {"cortex-r4f", ARM_ARCH_V7R, FPU_ARCH_VFP_V3D16,
+ "Cortex-R4F"},
+ {"cortex-m4", ARM_ARCH_V7EM, FPU_NONE, "Cortex-M4"},
+ {"cortex-m3", ARM_ARCH_V7M, FPU_NONE, "Cortex-M3"},
+ {"cortex-m1", ARM_ARCH_V6M, FPU_NONE, "Cortex-M1"},
+ {"cortex-m0", ARM_ARCH_V6M, FPU_NONE, "Cortex-M0"},
/* ??? XSCALE is really an architecture. */
{"xscale", ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2, NULL},
/* ??? iwmmxt is not a processor. */
diff --git a/gas/testsuite/gas/arm/attr-cpu-directive.d b/gas/testsuite/gas/arm/attr-cpu-directive.d
index 4e884ef..5a6a81d 100644
--- a/gas/testsuite/gas/arm/attr-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-cpu-directive.d
@@ -7,7 +7,7 @@
Attribute Section: aeabi
File Attributes
- Tag_CPU_name: "CORTEX-A8"
+ Tag_CPU_name: "Cortex-A8"
Tag_CPU_arch: v7
Tag_CPU_arch_profile: Application
Tag_ARM_ISA_use: Yes
diff --git a/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d
index 86c8fe7..7280f6a 100644
--- a/gas/testsuite/gas/arm/attr-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-mcpu.d
@@ -7,7 +7,7 @@
Attribute Section: aeabi
File Attributes
- Tag_CPU_name: "CORTEX-A8"
+ Tag_CPU_name: "Cortex-A8"
Tag_CPU_arch: v7
Tag_CPU_arch_profile: Application
Tag_ARM_ISA_use: Yes
diff --git a/ld/testsuite/ld-arm/attr-merge-6.attr b/ld/testsuite/ld-arm/attr-merge-6.attr
index 02d2705..67bbd6c 100644
--- a/ld/testsuite/ld-arm/attr-merge-6.attr
+++ b/ld/testsuite/ld-arm/attr-merge-6.attr
@@ -1,6 +1,6 @@
Attribute Section: aeabi
File Attributes
- Tag_CPU_name: "CORTEX-A9"
+ Tag_CPU_name: "Cortex-A9"
Tag_CPU_arch: v7
Tag_CPU_arch_profile: Application
Tag_ARM_ISA_use: Yes
diff --git a/ld/testsuite/ld-arm/attr-merge-7.attr b/ld/testsuite/ld-arm/attr-merge-7.attr
index 02d2705..67bbd6c 100644
--- a/ld/testsuite/ld-arm/attr-merge-7.attr
+++ b/ld/testsuite/ld-arm/attr-merge-7.attr
@@ -1,6 +1,6 @@
Attribute Section: aeabi
File Attributes
- Tag_CPU_name: "CORTEX-A9"
+ Tag_CPU_name: "Cortex-A9"
Tag_CPU_arch: v7
Tag_CPU_arch_profile: Application
Tag_ARM_ISA_use: Yes
diff --git a/ld/testsuite/ld-arm/attr-merge-arch-2.attr b/ld/testsuite/ld-arm/attr-merge-arch-2.attr
index 4f9c905..ab8916b 100644
--- a/ld/testsuite/ld-arm/attr-merge-arch-2.attr
+++ b/ld/testsuite/ld-arm/attr-merge-arch-2.attr
@@ -1,7 +1,7 @@
Attribute Section: aeabi
File Attributes
Tag_CPU_raw_name: "arch_v6k"
- Tag_CPU_name: "MPCORE"
+ Tag_CPU_name: "MPCore"
Tag_CPU_arch: v6K
Tag_ARM_ISA_use: Yes
Tag_THUMB_ISA_use: Thumb-1