2006-12-13 Paul Brook <paul@codesourcery.com>
Backport from mainline.
gas/
* config/tc-arm.c (arm_arch_option_table): Add v7-{a,r,m}.
* doc/c-arm.texi: Fix spelling of ARMv7 profile variants.
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 87edd04e0..8d3656f 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-12-13 Paul Brook <paul@codesourcery.com>
+
+ Backport from mainline.
+ gas/
+ * config/tc-arm.c (arm_arch_option_table): Add v7-{a,r,m}.
+ * doc/c-arm.texi: Fix spelling of ARMv7 profile variants.
+
2006-12-01 Paul Brook <paul@codesourcery.com>
Backport from mainline.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index dfaa643..755e91d 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -19735,9 +19735,14 @@
{"armv6zt2", ARM_ARCH_V6ZT2, FPU_ARCH_VFP},
{"armv6zkt2", ARM_ARCH_V6ZKT2, FPU_ARCH_VFP},
{"armv7", ARM_ARCH_V7, FPU_ARCH_VFP},
+ /* The official spelling of the ARMv7 profile variants is the dashed form.
+ Accept the non-dashed form for compatibility with old toolchains. */
{"armv7a", ARM_ARCH_V7A, FPU_ARCH_VFP},
{"armv7r", ARM_ARCH_V7R, FPU_ARCH_VFP},
{"armv7m", ARM_ARCH_V7M, FPU_ARCH_VFP},
+ {"armv7-a", ARM_ARCH_V7A, FPU_ARCH_VFP},
+ {"armv7-r", ARM_ARCH_V7R, FPU_ARCH_VFP},
+ {"armv7-m", ARM_ARCH_V7M, FPU_ARCH_VFP},
{"xscale", ARM_ARCH_XSCALE, FPU_ARCH_VFP},
{"iwmmxt", ARM_ARCH_IWMMXT, FPU_ARCH_VFP},
{"iwmmxt2", ARM_ARCH_IWMMXT2,FPU_ARCH_VFP},
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index fd74179..ad7c93e 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -155,9 +155,9 @@
@code{armv6z},
@code{armv6zk},
@code{armv7},
-@code{armv7a},
-@code{armv7r},
-@code{armv7m},
+@code{armv7-a},
+@code{armv7-r},
+@code{armv7-m},
@code{iwmmxt}
and
@code{xscale}.
