From: Nick Clifton <nickc@redhat.com>
Date: Wed, 15 Jul 2009 15:08:55 +0000 (+0000)
Subject:         * doc/c-arm.texi (mauto-it): Removed old option.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=529707530657a333a304c651c808ea630c955223;p=binutils-gdb.git

    * doc/c-arm.texi (mauto-it): Removed old option.
        (mimplicit-it): Added right option.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 63a654d17b0..99a6350bba0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-15  Daniel Gutson  <dgutson@codesourcery.com>
+
+	* doc/c-arm.texi (mauto-it): Removed old option.
+	(mimplicit-it): Added right option.
+
 2009-07-14  Daniel Gutson  <dgutson@codesourcery.com>
 
 	* config/tc-arm.h (MAX_MEM_ALIGNMENT_BYTES): Define.
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index ab7540f29e8..e30a9389f12 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -227,10 +227,23 @@ instructions; that is, it should behave as though the file starts with a
 This option specifies that the output generated by the assembler should
 be marked as supporting interworking.
 
-@cindex @code{-mauto-it} command line option, ARM
-@item -mauto-it
-This option enables the automatic generation of IT instructions for
-conditional instructions not covered by an IT block.
+@cindex @code{-mimplicit-it} command line option, ARM
+@item -mimplicit-it=never
+@itemx -mimplicit-it=always
+@itemx -mimplicit-it=arm
+@itemx -mimplicit-it=thumb
+The @code{-mimplicit-it} option controls the behavior of the assembler when
+conditional instructions are not enclosed in IT blocks.
+There are four possible behaviors.
+If @code{never} is specified, such constructs cause a warning in ARM
+code and an error in Thumb-2 code.
+If @code{always} is specified, such constructs are accepted in both
+ARM and Thumb-2 code, where the IT instruction is added implicitly.
+If @code{arm} is specified, such constructs are accepted in ARM code
+and cause an error in Thumb-2 code.
+If @code{thumb} is specified, such constructs cause a warning in ARM
+code and are accepted in Thumb-2 code.  If you omit this option, the
+behavior is equivalent to @code{-mimplicit-it=arm}.
 
 @cindex @code{-mapcs} command line option, ARM
 @item -mapcs @code{[26|32]}