From 7bf9d9b1da8a48b2068510ab57f0e8e545f6f835 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@hanshq.net>
Date: Fri, 13 Jul 2012 12:47:15 +0000
Subject: [PATCH] Mention -ftls-model in release notes and manual.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160169 91177308-0d34-0410-b5e6-96231b3b80d8
---
 docs/ReleaseNotes.html |  6 ++++++
 docs/UsersManual.html  | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index b820e8dc3f..2108909c97 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -196,6 +196,12 @@ model can be used.
   function names, file names and line numbers (by such tools as gdb or addr2line).
   Debug info for variables or function parameters is not produced, which reduces
   the size of the resulting binary.
+
+  <li><tt>-ftls-model</tt> controls which TLS model to use for thread-local
+  variables. This can be overridden per variable using the
+  <a href="#tlsmodel"><tt>tls_model</tt> attribute</a> mentioned above.
+  For more details, see the <a href="UsersManual.html#opt_ftls-model">User's
+  Manual</a>.</li>
 </ul>
 
 <!-- = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -->
diff --git a/docs/UsersManual.html b/docs/UsersManual.html
index 0ca0e5377f..130fcefde0 100644
--- a/docs/UsersManual.html
+++ b/docs/UsersManual.html
@@ -913,6 +913,16 @@ generator will always lower the builtin to a call to the specified function
 regardless of whether the target ISA has a trap instruction. This option is
 useful for environments (e.g. deeply embedded) where a trap cannot be properly
 handled, or when some custom behavior is desired.</dd>
+
+<dt id="opt_ftls-model"><b>-ftls-model=[model]</b>: Select which TLS model to
+use.</dt>
+<dd>Valid values are: <tt>global-dynamic</tt>, <tt>local-dynamic</tt>,
+<tt>initial-exec</tt> and <tt>local-exec</tt>. The default value is
+<tt>global-dynamic</tt>. The compiler may use a different model if the selected
+model is not supported by the target, or if a more efficient model can be used.
+The TLS model can be overridden per variable using the <tt>tls_model</tt>
+attribute.
+</dd>
 </dl>
 
 <!-- = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = -->
-- 
2.40.0