backport: invoke.texi (RS/6000 and PowerPC Options): Document -mhtm and -mno-htm.

	Backport from mainline
	2016-06-07  Peter Bergner  <bergner@vnet.ibm.com>

	* doc/invoke.texi (RS/6000 and PowerPC Options): Document -mhtm and
	-mno-htm.

From-SVN: r237187

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 108ac653d4fc19a0392ba785237b1bc856bcf2ee..39b7bd561a7301a2fad9336d2c9a244c66255b5c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-06-07  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Backport from mainline
+       2016-06-07  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * doc/invoke.texi (RS/6000 and PowerPC Options): Document -mhtm and
+       -mno-htm.
+
 2016-06-07  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/71389

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index f310bf548be0d699bfdfd2fc4074cf290ec2f889..effebf7f56959d277906b04c0354ac89ecb57d6d 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -921,7 +921,7 @@ See RS/6000 and PowerPC Options.
 -mpointers-to-nested-functions -mno-pointers-to-nested-functions @gol
 -msave-toc-indirect -mno-save-toc-indirect @gol
 -mpower8-fusion -mno-mpower8-fusion -mpower8-vector -mno-power8-vector @gol
--mcrypto -mno-crypto -mdirect-move -mno-direct-move @gol
+-mcrypto -mno-crypto -mhtm -mno-htm -mdirect-move -mno-direct-move @gol
 -mquad-memory -mno-quad-memory @gol
 -mquad-memory-atomic -mno-quad-memory-atomic @gol
 -mcompat-align-parm -mno-compat-align-parm}
@@ -18990,7 +18990,7 @@ following options:
 -mpopcntb -mpopcntd  -mpowerpc64 @gol
 -mpowerpc-gpopt  -mpowerpc-gfxopt  -msingle-float -mdouble-float @gol
 -msimple-fpu -mstring  -mmulhw  -mdlmzb  -mmfpgpr -mvsx @gol
--mcrypto -mdirect-move -mpower8-fusion -mpower8-vector @gol
+-mcrypto -mdirect-move -mhtm -mpower8-fusion -mpower8-vector @gol
 -mquad-memory -mquad-memory-atomic}
 
 The particular options set for any particular CPU varies between
@@ -19157,6 +19157,14 @@ Generate code that uses (does not use) the instructions to move data
 between the general purpose registers and the vector/scalar (VSX)
 registers that were added in version 2.07 of the PowerPC ISA.
 
+@item -mhtm
+@itemx -mno-htm
+@opindex mhtm
+@opindex mno-htm
+Enable (disable) the use of the built-in functions that allow direct
+access to the Hardware Transactional Memory (HTM) instructions that
+were added in version 2.07 of the PowerPC ISA.
+
 @item -mpower8-fusion
 @itemx -mno-power8-fusion
 @opindex mpower8-fusion