diff --git a/gas/ChangeLog b/gas/ChangeLog
index 32168ca727..ee8abb228b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-arm.c (aeabi_set_public_attributes): Use selected_cpu
+	instead of mcpu_cpu_opt.
+
 2005-10-27  Sterling Augustine  <sterling@tensilica.com>
 
 	* config/tc-xtensa.c (find_vinsn_conflicts): Change error messages to
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 2f090b555f..9df9e0eb9a 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -13274,7 +13274,7 @@ aeabi_set_public_attributes (void)
 
   /* Choose the architecture based on the capabilities of the requested cpu
      (if any) and/or the instructions actually used.  */
-  flags = mcpu_cpu_opt | arm_arch_used | thumb_arch_used;
+  flags = selected_cpu | mfpu_opt | arm_arch_used | thumb_arch_used;
   if (flags & ARM_EXT_V6T2)
     arch = 8;
   else if (flags & ARM_EXT_V6Z)