* tc-arm.c (arm_cpus, arm_fpus): Allow <cpu>-s as well as <cpu>s

for synthesizable cores.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2c96af949835f0ee960f787421bc844a764c773d..142747bbf009d17f0548161e856e3e410668df19 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Richard Earnshaw < reanrsha@arm.com>
+
+       * tc-arm.c (arm_cpus, arm_fpus): Allow <cpu>-s as well as <cpu>s
+       for synthesizable cores.
+
 2004-08-25  Dmitry Diky  <diwil@spec.ru>
 
        * config/tc-msp430.c:   Clean-up the code.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 68faf1389d201504a23b563949ebbbe07329c2ac..29d5deb76bd3ffa0cb0e41a72d43e13f72454655 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -13280,6 +13280,7 @@ static struct arm_cpu_option_table arm_cpus[] =
   {"arm7500fe",                ARM_ARCH_V3,     FPU_ARCH_FPA},
   {"arm7t",            ARM_ARCH_V4T,    FPU_ARCH_FPA},
   {"arm7tdmi",         ARM_ARCH_V4T,    FPU_ARCH_FPA},
+  {"arm7tdmi-s",       ARM_ARCH_V4T,    FPU_ARCH_FPA},
   {"arm8",             ARM_ARCH_V4,     FPU_ARCH_FPA},
   {"arm810",           ARM_ARCH_V4,     FPU_ARCH_FPA},
   {"strongarm",                ARM_ARCH_V4,     FPU_ARCH_FPA},
@@ -13299,6 +13300,7 @@ static struct arm_cpu_option_table arm_cpus[] =
   {"arm9e",            ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm926ej",         ARM_ARCH_V5TEJ,  FPU_ARCH_VFP_V2},
   {"arm926ejs",                ARM_ARCH_V5TEJ,  FPU_ARCH_VFP_V2},
+  {"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},
   {"arm966e-r0",       ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2},
@@ -13309,8 +13311,11 @@ static struct arm_cpu_option_table arm_cpus[] =
   {"arm1020t",         ARM_ARCH_V5T,    FPU_ARCH_VFP_V1},
   {"arm1020e",         ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm1026ejs",       ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
+  {"arm1026ej-s",      ARM_ARCH_V5TE,   FPU_ARCH_VFP_V2},
   {"arm1136js",                ARM_ARCH_V6,     FPU_NONE},
+  {"arm1136j-s"                ARM_ARCH_V6,     FPU_NONE},
   {"arm1136jfs",       ARM_ARCH_V6,     FPU_ARCH_VFP_V2},
+  {"arm1136jf-s",      ARM_ARCH_V6,     FPU_ARCH_VFP_V2},
   /* ??? XSCALE is really an architecture.  */
   {"xscale",           ARM_ARCH_XSCALE, FPU_ARCH_VFP_V2},
   /* ??? iwmmxt is not a processor.  */
@@ -13399,6 +13404,7 @@ static struct arm_fpu_option_table arm_fpus[] =
   {"arm1020t",         FPU_ARCH_VFP_V1},
   {"arm1020e",         FPU_ARCH_VFP_V2},
   {"arm1136jfs",       FPU_ARCH_VFP_V2},
+  {"arm1136jf-s",      FPU_ARCH_VFP_V2},
   {"maverick",         FPU_ARCH_MAVERICK},
   {NULL, 0}
 };