* config/tc-arm.c (arm_archs): Change "armv6" to "armv6j".

	* doc/c-arm.texi (ARM Options): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b1add1e2162081227c22dcc340c40c4600c6cb07..2ee1c9105a210f2cf78c96d8d29f576adcc2c60f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-17  Mark Mitchell  <mark@codesourcery.com>
+
+       * config/tc-arm.c (arm_archs): Change "armv6" to "armv6j".
+       * doc/c-arm.texi (ARM Options): Likewise.
+
 2003-12-17  Nick Clifton  <nickc@redhat.com>
 
        * config/tc-m32r.c (error_explicit_parallel_conflicts): Rename

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index e07185e77e99edc80605e320a426cbe64fd27a31..3e3daac74ae6aba536d1f02cdd9b14ef0f9c9e4e 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -13340,7 +13340,7 @@ static struct arm_arch_option_table arm_archs[] =
   {"armv5te",          ARM_ARCH_V5TE,   FPU_ARCH_VFP},
   {"armv5texp",                ARM_ARCH_V5TExP, FPU_ARCH_VFP},
   {"armv5tej",         ARM_ARCH_V5TEJ,  FPU_ARCH_VFP},
-  {"armv6",             ARM_ARCH_V6,     FPU_ARCH_VFP},
+  {"armv6j",            ARM_ARCH_V6,     FPU_ARCH_VFP},
   {"xscale",           ARM_ARCH_XSCALE, FPU_ARCH_VFP},
   {"iwmmxt",           ARM_ARCH_IWMMXT, FPU_ARCH_VFP},
   {NULL, 0, 0}

diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index 766ac331717e61eb9fc6ebaf3add483743ad270b..8bd8fed49ead233305cb27c8b3512f1a75e26fa2 100644 (file)
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -131,7 +131,7 @@ names are recognized:
 @code{armv5txm},
 @code{armv5te},
 @code{armv5texp},
-@code{armv6},
+@code{armv6j},
 @code{iwmmxt}
 and
 @code{xscale}.