Index: config/tc-arm.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-arm.c,v
retrieving revision 1.506
diff -p -u -r1.506 tc-arm.c
--- config/tc-arm.c	25 Nov 2011 15:17:35 -0000	1.506
+++ config/tc-arm.c	5 Dec 2011 10:01:01 -0000
@@ -23652,6 +23652,13 @@ aeabi_set_public_attributes (void)
   ARM_MERGE_FEATURE_SETS (flags, arm_arch_used, thumb_arch_used);
   ARM_MERGE_FEATURE_SETS (flags, flags, *mfpu_opt);
   ARM_MERGE_FEATURE_SETS (flags, flags, selected_cpu);
+
+  if (ARM_CPU_HAS_FEATURE (arm_arch_used, arm_arch_any))
+    ARM_MERGE_FEATURE_SETS (flags, flags, arm_ext_v1);
+
+  if (ARM_CPU_HAS_FEATURE (thumb_arch_used, arm_arch_any))
+    ARM_MERGE_FEATURE_SETS (flags, flags, arm_ext_v4t);
+
   /*Allow the user to override the reported architecture.  */
   if (object_arch)
     {
Index: testsuite/gas/arm/attr-any-armv4t.d
===================================================================
RCS file: testsuite/gas/arm/attr-any-armv4t.d
diff -N testsuite/gas/arm/attr-any-armv4t.d
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/gas/arm/attr-any-armv4t.d	5 Dec 2011 10:01:04 -0000
@@ -0,0 +1,13 @@
+# name: attributes for 'any' cpu v4t ARM insn
+# source: attr-any-armv4t.s
+# as:
+# readelf: -A
+# This test is only valid on EABI based ports.
+# target: *-*-*eabi
+
+Attribute Section: aeabi
+File Attributes
+  Tag_CPU_arch: v4T
+  Tag_ARM_ISA_use: Yes
+  Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
Index: testsuite/gas/arm/attr-any-armv4t.s
===================================================================
RCS file: testsuite/gas/arm/attr-any-armv4t.s
diff -N testsuite/gas/arm/attr-any-armv4t.s
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/gas/arm/attr-any-armv4t.s	5 Dec 2011 10:01:04 -0000
@@ -0,0 +1 @@
+	bx	lr
Index: testsuite/gas/arm/attr-any-thumbv6.d
===================================================================
RCS file: testsuite/gas/arm/attr-any-thumbv6.d
diff -N testsuite/gas/arm/attr-any-thumbv6.d
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/gas/arm/attr-any-thumbv6.d	5 Dec 2011 10:01:04 -0000
@@ -0,0 +1,12 @@
+# name: attributes for 'any' cpu v6 thumb insn
+# source: attr-any-thumbv6.s
+# as:
+# readelf: -A
+# This test is only valid on EABI based ports.
+# target: *-*-*eabi
+
+Attribute Section: aeabi
+File Attributes
+  Tag_CPU_arch: v6
+  Tag_THUMB_ISA_use: Thumb-1
+  Tag_DIV_use: Not allowed
Index: testsuite/gas/arm/attr-any-thumbv6.s
===================================================================
RCS file: testsuite/gas/arm/attr-any-thumbv6.s
diff -N testsuite/gas/arm/attr-any-thumbv6.s
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/gas/arm/attr-any-thumbv6.s	5 Dec 2011 10:01:04 -0000
@@ -0,0 +1,2 @@
+	.thumb
+	cpy	r0, r1