2005-09-27 Paul Brook <paul@codesourcery.com>

	* config/arm.c (arm_cpus): Add more cpu names.
	* doc/c-arm.texi: Document them.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index fac836a2b59eb0a4aff83f636b37265e4f0ee8f6..314bcf06854fbeb507468c38277866427a013370 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-27  Paul Brook  <paul@codesourcery.com>
+
+       * config/arm.c (arm_cpus): Add more cpu names.
+       * doc/c-arm.texi: Document them.
+
 2005-09-21  Alan Modra  <amodra@bigpond.net.au>
 
        * read.c (pseudo_set): Don't set undefined symbols to expr_section.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 8d327eb0cf2ae702397c169d072af02a24f5ed5e..c3cc0b471d2750b099b892a4ad1601133fd5b0ba 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -12681,13 +12681,18 @@ static struct arm_cpu_option_table arm_cpus[] =
   {"arm926ej-s",       ARM_ARCH_V5TEJ,  FPU_ARCH_VFP_V2},
   {"arm946e-r0",       ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2},
   {"arm946e",          ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
+  {"arm946e-s",                ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm966e-r0",       ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2},
   {"arm966e",          ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
+  {"arm966e-s",                ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
+  {"arm968e-s",                ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm10t",           ARM_ARCH_V5T,    FPU_ARCH_VFP_V1},
+  {"arm10tdmi",                ARM_ARCH_V5T,    FPU_ARCH_VFP_V1},
   {"arm10e",           ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm1020",          ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm1020t",         ARM_ARCH_V5T,    FPU_ARCH_VFP_V1},
   {"arm1020e",         ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
+  {"arm1022e",         ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm1026ejs",       ARM_ARCH_V5TEJ,  FPU_ARCH_VFP_V2},
   {"arm1026ej-s",      ARM_ARCH_V5TEJ,  FPU_ARCH_VFP_V2},
   {"arm1136js",                ARM_ARCH_V6,     FPU_NONE},
@@ -12696,6 +12701,8 @@ static struct arm_cpu_option_table arm_cpus[] =
   {"arm1136jf-s",      ARM_ARCH_V6,     FPU_ARCH_VFP_V2},
   {"mpcore",           ARM_ARCH_V6K,    FPU_ARCH_VFP_V2},
   {"mpcorenovfp",      ARM_ARCH_V6K,    FPU_NONE},
+  {"arm1156t2-s",      ARM_ARCH_V6T2,   FPU_NONE},
+  {"arm1156t2f-s",     ARM_ARCH_V6T2,   FPU_ARCH_VFP_V2},
   {"arm1176jz-s",      ARM_ARCH_V6ZK,   FPU_NONE},
   {"arm1176jzf-s",     ARM_ARCH_V6ZK,   FPU_ARCH_VFP_V2},
   /* ??? XSCALE is really an architecture.  */

diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index eb51b06e5b08d40735289268feb30185a6ca033e..97ab9bebf25f6c86ca3670f464e0cf78733535e6 100644 (file)
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -86,16 +86,23 @@ recognized:
 @code{arm926ej-s},
 @code{arm946e-r0},
 @code{arm946e},
+@code{arm946e-s},
 @code{arm966e-r0},
 @code{arm966e},
+@code{arm966e-s},
+@code{arm968e-s},
 @code{arm10t},
+@code{arm10tdmi},
 @code{arm10e},
 @code{arm1020},
 @code{arm1020t},
 @code{arm1020e},
+@code{arm1022e},
 @code{arm1026ej-s},
 @code{arm1136j-s},
 @code{arm1136jf-s},
+@code{arm1156t2-s},
+@code{arm1156t2f-s},
 @code{arm1176jz-s},
 @code{arm1176jzf-s},
 @code{mpcore},