aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-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
4 files changed, 11 insertions, 3 deletions
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