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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 50f9de8be6c0377f313b3c2ace8b96fab5a5ca76..15fd7ed418398a890e262384efe2ac663659e5f1 100644 (file)
--- 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 77606a3bb6282bdf9f8140076919bd3a1b9ddb11..a6a85c513b44edc5c58190354646bd68ad94ed5b 100644 (file)
--- 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 131f6ab5c09c2e518326cb0f487e7f30f0a292e5..a388c18121fd87bbd70e7745815b6cd2bb5ba6aa 100644 (file)
--- 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},