From 22bf3f9b50efca3e03f027f4ba47a7965265bcb8 Mon Sep 17 00:00:00 2001 From: Matthew Gretton-Dann Date: Mon, 7 Nov 2011 16:25:18 +0000 Subject: Apply mainline patches 2011-11-07 Matthew Gretton-Dann * 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. --- gas/ChangeLog | 8 ++++++++ gas/config/tc-arm.c | 3 +++ gas/doc/c-arm.texi | 1 + 3 files changed, 12 insertions(+) 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 + + Apply mainline patches + 2011-11-07 Matthew Gretton-Dann + * 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 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}, -- cgit v1.2.1