* 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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 34c77eacf6ddbac6e144e69c4d968c2e7dcb2e4a..ba83ecb57934a9899d0a8c0f6c89f5a53bc8027f 100644 (file)
--- 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 deb78cefa5639db21422e68d762eccae50131cb7..136e04e4b6addc9d5b5fbc9c11ff3a30c648bde8 100644 (file)
--- 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 7a3621683e9668bb090664786d6faf439d51be64..0ebbc5a08a95dc21174c52b25b10835cfd4b672a 100644 (file)
--- 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 4e884ef6c40cf1c84b9fbe4cc1cfab54a47042c5..5a6a81d66445e4a27fb963afc37eefd64321ff61 100644 (file)
--- 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 86c8fe73d68a2e0270e0af1d478255d8c3c83d54..7280f6a9f65ba5061bdc0ee7edd2de72c4e43913 100644 (file)
--- 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 038dd3810ed1f4ac4cabc1e6243367a2854809e0..745743af43573309221cf9d1c6e929e24d5c34bb 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/ld/testsuite/ld-arm/attr-merge-6.attr b/ld/testsuite/ld-arm/attr-merge-6.attr
index 02d270599525178a40415ab5ca5dc614dde60aec..67bbd6cbaf9330eeca33eea8b3890c3356db0241 100644 (file)
--- 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 02d270599525178a40415ab5ca5dc614dde60aec..67bbd6cbaf9330eeca33eea8b3890c3356db0241 100644 (file)
--- 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 4f9c90548e4107a2fdbabc1049086f06dd2ec24b..ab8916ba7061ddb862bb8215a338bad94ac0ed93 100644 (file)
--- 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