aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2003-12-18 05:45:13 +0000
committerMark Mitchell <mark@codesourcery.com>2003-12-18 05:45:13 +0000
commit1ddd7f43f3a8fe8e380ed13394e222563d9a7eee (patch)
tree3730ff029f3ea500cc79b63d8179cc5c39e3b618
parentcd0d3a42b4daa6d326f61a5ffddec8ea835e7421 (diff)
downloadbinutils-1ddd7f43f3a8fe8e380ed13394e222563d9a7eee.zip
binutils-1ddd7f43f3a8fe8e380ed13394e222563d9a7eee.tar.gz
binutils-1ddd7f43f3a8fe8e380ed13394e222563d9a7eee.tar.bz2
* config/tc-arm.c (arm_archs): Change "armv6" to "armv6j".
* doc/c-arm.texi (ARM Options): Likewise.
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-arm.c2
-rw-r--r--gas/doc/c-arm.texi2
3 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b1add1e..2ee1c91 100644
--- 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 e07185e..3e3daac 100644
--- 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 766ac33..8bd8fed 100644
--- 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}.