summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Gretton-Dann <matthew.gretton-dann@arm.com>2011-11-07 16:25:18 +0000
committerMatthew Gretton-Dann <matthew.gretton-dann@arm.com>2011-11-07 16:25:18 +0000
commit22bf3f9b50efca3e03f027f4ba47a7965265bcb8 (patch)
treeae6371a6aeeadb7d3a60d5f789b4d9fbfe7bee41
parentcda21aa211c77a85e724aba771cf824d4833f696 (diff)
downloadbinutils-gdb-22bf3f9b50efca3e03f027f4ba47a7965265bcb8.tar.gz
Apply mainline patches
2011-11-07 Matthew Gretton-Dann <matthew.gretton-dann@arm.com> * gas/config/tc-arm.c (arm_cpus): Add cortex-a7 entry. * gas/doc/c-arm.texi (ARM Options): Add cortex-a7 to list of accepted CPUs.
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/config/tc-arm.c3
-rw-r--r--gas/doc/c-arm.texi1
3 files changed, 12 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 50f9de8be6c..15fd7ed4183 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2011-11-07 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
+
+ Apply mainline patches
+ 2011-11-07 Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
+ * config/tc-arm.c (arm_cpus): Add cortex-a7 entry.
+ * doc/c-arm.texi (ARM Options): Add cortex-a7 to list of accepted
+ CPUs.
+
2011-10-25 Alan Modra <amodra@gmail.com>
Apply mainline patches
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 77606a3bb62..a6a85c513b4 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -22933,6 +22933,9 @@ static const struct arm_cpu_option_table arm_cpus[] =
{"arm1176jzf-s", ARM_ARCH_V6ZK, FPU_ARCH_VFP_V2, NULL},
{"cortex-a5", ARM_ARCH_V7A_MP_SEC,
FPU_NONE, "Cortex-A5"},
+ {"cortex-a7", ARM_ARCH_V7A_IDIV_MP_SEC_VIRT,
+ FPU_ARCH_NEON_VFP_V4,
+ "Cortex-A7"},
{"cortex-a8", ARM_ARCH_V7A_SEC,
ARM_FEATURE (0, FPU_VFP_V3
| FPU_NEON_EXT_V1),
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index 131f6ab5c09..a388c18121f 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -116,6 +116,7 @@ recognized:
@code{mpcore},
@code{mpcorenovfp},
@code{cortex-a5},
+@code{cortex-a7},
@code{cortex-a8},
@code{cortex-a9},
@code{cortex-a15},