aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Gretton-Dann <matthew.gretton-dann@arm.com>2010-09-20 16:33:24 +0000
committerMatthew Gretton-Dann <matthew.gretton-dann@arm.com>2010-09-20 16:33:24 +0000
commit4ff9b924719816f3974df97ef35b5347f83ecead (patch)
tree7b2dd116b328db68a10bdb854845ef1e201c6ae9
parentafdfce21090b36e764aa3e6ae41fa51f82322385 (diff)
downloadgdb-4ff9b924719816f3974df97ef35b5347f83ecead.zip
gdb-4ff9b924719816f3974df97ef35b5347f83ecead.tar.gz
gdb-4ff9b924719816f3974df97ef35b5347f83ecead.tar.bz2
* gas/config/tc-arm.c (arm_cpus): Correct canonical names for Cortex CPUs.
* gas/testsuite/gas/arm/attr-cpu-directive.d: Update test for change in canonical CPU name. * gas/testsuite/gas/arm/attr-mcpu.d: Likewise. * ld/testsuite/ld-arm/attr-merge-6.attr: Update tests for change in canonical CPU name. * ld/testsuite/ld-arm/attr-merge-7.attr: Likewise. * ld/testsuite/ld-arm/attr-merge-2.attr: Likewise. * ld/testsuite/ld-arm/attr-merge-arch-2.attr: Likewise.
Diffstat
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-arm.c23
-rw-r--r--gas/testsuite/ChangeLog6
-rw-r--r--gas/testsuite/gas/arm/attr-cpu-directive.d2
-rw-r--r--gas/testsuite/gas/arm/attr-mcpu.d2
-rw-r--r--ld/testsuite/ChangeLog8
-rw-r--r--ld/testsuite/ld-arm/attr-merge-6.attr2
-rw-r--r--ld/testsuite/ld-arm/attr-merge-7.attr2
-rw-r--r--ld/testsuite/ld-arm/attr-merge-arch-2.attr2
9 files changed, 35 insertions, 16 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 34c77ea..ba83ecb 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-20 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
+
+ * config/tc-arm.c (arm_cpus): Correct canonical names for Cortex CPUs.
+
2010-09-20 Richard Henderson <rth@redhat.com>
* config/tc-alpha.c (tc_gen_reloc): Remove hack around
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/ChangeLog b/gas/testsuite/ChangeLog
index 7a36216..0ebbc5a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2010-09-20 Richard Henderson <rth@redhat.com>
* gas/elf/elf.exp: Disable symtab test for alpha.
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/ChangeLog b/ld/testsuite/ChangeLog
index 038dd38..745743a 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,13 @@
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.
+
+2010-09-20 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
+
* ld-arm/script-type.ld: Update to generate symbols in a section.
2010-09-19 Richard Sandiford <rdsandiford@googlemail.com>
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
generated by cgit v1.1 at 2024-12-26 08:57:57 +0000