* config/arm/arm-arches.def: Add armv6s-m.

        * config/arm/arm-tables.opt: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178998 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f2a714..c58a093 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-20  Terry Guo  <terry.guo@arm.com>
+
+       * config/arm/arm-arches.def: Add armv6s-m.
+       * config/arm/arm-tables.opt: Regenerate.
+
 2011-09-20  Wei Guozhi  <carrot@google.com>
 
        PR rtl-optimization/49452

diff --git a/gcc/config/arm/arm-arches.def b/gcc/config/arm/arm-arches.def
index 1086233..3123426 100644 (file)
--- a/gcc/config/arm/arm-arches.def
+++ b/gcc/config/arm/arm-arches.def
@@ -49,6 +49,7 @@ ARM_ARCH("armv6z",  arm1176jzs, 6Z,  FL_CO_PROC |             FL_FOR_ARCH6Z)
 ARM_ARCH("armv6zk", arm1176jzs, 6ZK, FL_CO_PROC |             FL_FOR_ARCH6ZK)
 ARM_ARCH("armv6t2", arm1156t2s, 6T2, FL_CO_PROC |             FL_FOR_ARCH6T2)
 ARM_ARCH("armv6-m", cortexm1,  6M,                           FL_FOR_ARCH6M)
+ARM_ARCH("armv6s-m", cortexm1, 6M,                           FL_FOR_ARCH6M)
 ARM_ARCH("armv7",   cortexa8,  7,   FL_CO_PROC |             FL_FOR_ARCH7)
 ARM_ARCH("armv7-a", cortexa8,  7A,  FL_CO_PROC |             FL_FOR_ARCH7A)
 ARM_ARCH("armv7-r", cortexr4,  7R,  FL_CO_PROC |             FL_FOR_ARCH7R)

diff --git a/gcc/config/arm/arm-tables.opt b/gcc/config/arm/arm-tables.opt
index d86e376..23339c7 100644 (file)
--- a/gcc/config/arm/arm-tables.opt
+++ b/gcc/config/arm/arm-tables.opt
@@ -323,28 +323,31 @@ EnumValue
 Enum(arm_arch) String(armv6-m) Value(16)
 
 EnumValue
-Enum(arm_arch) String(armv7) Value(17)
+Enum(arm_arch) String(armv6s-m) Value(17)
 
 EnumValue
-Enum(arm_arch) String(armv7-a) Value(18)
+Enum(arm_arch) String(armv7) Value(18)
 
 EnumValue
-Enum(arm_arch) String(armv7-r) Value(19)
+Enum(arm_arch) String(armv7-a) Value(19)
 
 EnumValue
-Enum(arm_arch) String(armv7-m) Value(20)
+Enum(arm_arch) String(armv7-r) Value(20)
 
 EnumValue
-Enum(arm_arch) String(armv7e-m) Value(21)
+Enum(arm_arch) String(armv7-m) Value(21)
 
 EnumValue
-Enum(arm_arch) String(ep9312) Value(22)
+Enum(arm_arch) String(armv7e-m) Value(22)
 
 EnumValue
-Enum(arm_arch) String(iwmmxt) Value(23)
+Enum(arm_arch) String(ep9312) Value(23)
 
 EnumValue
-Enum(arm_arch) String(iwmmxt2) Value(24)
+Enum(arm_arch) String(iwmmxt) Value(24)
+
+EnumValue
+Enum(arm_arch) String(iwmmxt2) Value(25)
 
 Enum
 Name(arm_fpu) Type(int)