2001-06-18 Philip Blundell <philb@gnu.org>

	* config/tc-arm.c (do_msr): Remove restriction on usage of
	immediate operands.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1d0930d362f0d9153758eb81739b17dc03bd4d42..6d9ad98362767c0a910eb6ba0589e59ac4c2fc54 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-18  Philip Blundell  <philb@gnu.org>
+
+       * config/tc-arm.c (do_msr): Remove restriction on usage of
+       immediate operands.
+
 2001-06-13  Philip Blundell  <philb@gnu.org>
 
        * config/tc-arm.c (thumb_shift): Improve wording of error message.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 82ac65d0c1e3a48ce2f038ec8c4755a13f484910..99aff8ef31307494bc2519d2255b3d6b46e54fc0 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -2289,12 +2289,17 @@ do_msr (str, flags)
       return;
     }
 
+#if 0  /* The first edition of the ARM architecture manual stated that
+         writing anything other than the flags with an immediate operation
+         had UNPREDICTABLE effects.  This constraint was removed in the
+         second edition of the specification.  */
   if ((cpu_variant & ARM_EXT_V5) != ARM_EXT_V5
       && inst.instruction & ((PSR_c | PSR_x | PSR_s) << PSR_SHIFT))
     {
       inst.error = _("immediate value cannot be used to set this field");
       return;
     }
+#endif
 
   flags |= INST_IMMEDIATE;