Apply mainline patches

	2013-02-25  Terry Guo  <terry.guo@arm.com>
	* config/tc-arm.c (arm_cpus): Add cortex-r7 entry.
	* doc/c-arm.texi: Add cortex-r7 and missing cortex-r5 to
	list of accepted CPUs.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 10e6adea4acaadd31fc01209c688712d20260634..8b3a9418ae236a6828e15c8ba9e469aa506b2fae 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-25  Terry Guo  <terry.guo@arm.com>
+
+       Apply mainline patche
+       2013-02-25  Terry Guo  <terry.guo@arm.com>
+       * config/tc-arm.c (arm_cpus): Add cortex-r7 entry.
+       * doc/c-arm.texi: Add cortex-r7 and missing cortex-r5 to
+       list of accepted CPUs.
+
 2013-02-15  Yufeng Zhang  <yufeng.zhang@arm.com>
 
        * config/tc-aarch64.c (md_begin): Change to check if 'name' is

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 92b1ce3857d6dac044039ad0b6baa6e63c8aecf7..48316a56649f6f68d22ef36e56fef6806518475f 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -23917,6 +23917,9 @@ static const struct arm_cpu_option_table arm_cpus[] =
                                                                  "Cortex-R4F"),
   ARM_CPU_OPT ("cortex-r5",    ARM_ARCH_V7R_IDIV,
                                                 FPU_NONE,        "Cortex-R5"),
+  ARM_CPU_OPT ("cortex-r7",    ARM_ARCH_V7R_IDIV,
+                                                FPU_ARCH_VFP_V3D16,
+                                                                 "Cortex-R7"),
   ARM_CPU_OPT ("cortex-m4",    ARM_ARCH_V7EM,   FPU_NONE,        "Cortex-M4"),
   ARM_CPU_OPT ("cortex-m3",    ARM_ARCH_V7M,    FPU_NONE,        "Cortex-M3"),
   ARM_CPU_OPT ("cortex-m1",    ARM_ARCH_V6SM,   FPU_NONE,        "Cortex-M1"),

diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index 7d622efb65cdc00f8cc5a9c5aa019974cfa6ad78..a46e08f4400ef64851828be4ab4df1046678699e 100644 (file)
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -122,6 +122,8 @@ recognized:
 @code{cortex-a15},
 @code{cortex-r4},
 @code{cortex-r4f},
+@code{cortex-r5},
+@code{cortex-r7},
 @code{cortex-m4},
 @code{cortex-m3},
 @code{cortex-m1},