Merge to upstream r231255.

Change-Id: Ia8ee1801b42943464b99f28b6a83647458f3efb5

3 files changed, 64 insertions, 26 deletions

diff --git a/www/index.html b/www/index.html
index 59c7f51c5..c608183f0 100644
--- a/www/index.html
+++ b/www/index.html
@@ -124,7 +124,7 @@
 
    <p>libc++ is a 100% complete C++11 implementation on Apple's OS X. </p>
    <p>LLVM and Clang can self host in C++ and C++11 mode with libc++ on Linux.</p>
-   <p>libc++ is also a 100% complete C++14 implementation. A list of new features and changes for 
+   <p>libc++ is also a 100% complete C++14 implementation. A list of new features and changes for
       C++14 can be found <a href="cxx1y_status.html">here</a>.</p>
    <p>A list of features and changes for the next C++ standard, known here as
       "C++1z" (probably to be C++17) can be found <a href="cxx1z_status.html">here</a>.</p>
@@ -137,7 +137,7 @@
    </p>
 
    <!--======================================================================-->
-   <h2 id="dir-structure">Build Bots</h2>
+   <h2 id="buildbots">Build Bots</h2>
    <!--======================================================================-->
    <p>The latest libc++ build results can be found at the following locations.</p>
    <ul>
@@ -318,18 +318,18 @@
   <h2>Bug reports and patches</h2>
   <!--=====================================================================-->
 
-<p>
-If you think you've found a bug in libc++, please report it using 
-the <a href="http://llvm.org/bugs">LLVM Bugzilla</a>. If you're not sure, you
-can post a message to the <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a> 
-mailing list or on IRC. Please include "libc++" in your subject.
-</p>
+  <p>
+  If you think you've found a bug in libc++, please report it using
+  the <a href="http://llvm.org/bugs">LLVM Bugzilla</a>. If you're not sure, you
+  can post a message to the <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev">cfe-dev</a> 
+  mailing list or on IRC. Please include "libc++" in your subject.
+  </p>
 
-<p>
-If you want to contribute a patch to libc++, the best place for that is the
-<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">cfe-commits</a> 
-mailing list. Please include "libc++" and "PATCH" in your subject.
-</p>
+  <p>
+  If you want to contribute a patch to libc++, the best place for that is
+  <a href="http://llvm.org/docs/Phabricator.html">Phabricator</a>. Please
+  include [libc++] in the subject and add cfe-commits as a subscriber.
+  </p>
 
   <!--=====================================================================-->
   <h2 id="libsupcxx">Build on Linux using CMake and libsupc++.</h2>
@@ -338,13 +338,13 @@ mailing list. Please include "libc++" and "PATCH" in your subject.
   <p>
      You will need libstdc++ in order to provide libsupc++.
   </p>
-  
+
   <p>
      Figure out where the libsupc++ headers are on your system. On Ubuntu this
      is <code>/usr/include/c++/&lt;version&gt;</code> and
      <code>/usr/include/c++/&lt;version&gt;/&lt;target-triple&gt;</code>
   </p>
-  
+
   <p>
      You can also figure this out by running
      <pre>
@@ -367,7 +367,7 @@ End of search list.
       Note the first two entries happen to be what we are looking for. This
       may not be correct on other platforms.
   </p>
-  
+
   <p>
      We can now run CMake:
      <ul>
@@ -402,7 +402,7 @@ End of search list.
      on your build machine and your copy of the libcxxrt shared library must
      be placed where your linker will find it.
   </p>
- 
+
   <p>
      We can now run CMake:
      <ul>
diff --git a/www/lit_usage.html b/www/lit_usage.html
index 91d753730..c6bfbae35 100644
--- a/www/lit_usage.html
+++ b/www/lit_usage.html
@@ -132,6 +132,26 @@ Note: This does not use the installed headers.
 </p>
 
 <p>
+<h3 class="lit-option">use_lit_shell=&lt;bool&gt;</h3>
+<blockquote class="lit-option-desc">
+Enable or disable the use of LIT's internal shell in ShTests. If the enviroment
+variable <code>LIT_USE_INTERNAL_SHELL</code> is present then that is used as the
+default value. Otherwise the default value is <code>True</code> on Windows and
+<code>False</code> on every other platform.
+</blockquote>
+</p>
+
+<p>
+<h3 class="lit-option">no_default_flags=&lt;bool&gt;</h3>
+<blockquote class="lit-option-desc">
+<b>Default: </b><code>False</code></br>
+Disable all default compile and link flags from being added. When this option is
+used only flags specified using the <code>compile_flags</code> and
+<code>link_flags</code> will be used.
+</blockquote>
+</p>
+
+<p>
 <h3 class="lit-option">compile_flags="&lt;list-of-args&gt;"</h3>
 <blockquote class="lit-option-desc">
 Specify additional compile flags as a space delimited string.
@@ -155,6 +175,15 @@ Change the standard version used when building the tests.
 </p>
 
 <p>
+<h3 class="lit-option">debug_level=&lt;level&gt;</h3>
+<blockquote class="lit-option-desc">
+<b>Values: </b><code>0, 1</code></br>
+Enable the use of debug mode. Level 0 enables assertions and level 1 enables
+assertions and debugging of iterator misuse.
+</blockquote>
+</p>
+
+<p>
 <h3 class="lit-option">use_sanitizer=&lt;sanitizer name&gt;</h3>
 <blockquote class="lit-option-desc">
 <b>Values: </b><code>Memory, MemoryWithOrigins, Address, Undefined</code></br>
@@ -163,6 +192,16 @@ was given when building libc++ then that sanitizer will be used by default.
 </blockquote>
 </p>
 
+<p>
+<h3 class="lit-option">color_diagnostics</h3>
+<blockquote class="lit-option-desc">
+Enable the use of colorized compile diagnostics. If the
+<code>color_diagnostics</code> option is specified or the enviroment variable
+<code>LIBCXX_COLOR_DIAGNOSTICS</code> is present then color diagnostics will be
+enabled.
+</blockquote>
+</p>
+
 </div>
 </body>
 </html>
diff --git a/www/ts1z_status.html b/www/ts1z_status.html
index 95880b913..d3d29c20f 100644
--- a/www/ts1z_status.html
+++ b/www/ts1z_status.html
@@ -4,7 +4,7 @@
 <html>
 <head>
   <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>libc++ C++1Y Status</title>
+  <title>libc++ Fundamentals TS Status</title>
   <link type="text/css" rel="stylesheet" href="menu.css">
   <link type="text/css" rel="stylesheet" href="content.css">
 </head>
@@ -66,20 +66,19 @@
 	<tr><td>Additions to std::promise</td><td>Not started</td></tr>
 	<tr><td>Additions to std::packaged_task</td><td>Not started</td></tr>
   <tr><td></td><td></td></tr>
-	<tr><td>Class erased_type</td><td>Initial implementation complete</td></tr>
-	<tr><td>Calling a function with a tuple of arguments</td><td>Not started</td></tr>
+	<tr><td>Class erased_type</td><td>Complete</td></tr>
+	<tr><td>Calling a function with a tuple of arguments</td><td>Implementation in progress</td></tr>
 	<tr><td>Other type transformations</td><td>Not started</td></tr>
-	<tr><td>Compile-time Rational Arithmetic</td><td>Not started</td></tr>
-	<tr><td>Time Utilities</td><td>Not started</td></tr>
-	<tr><td>System Error Support</td><td>Not started</td></tr>
+	<tr><td>Compile-time Rational Arithmetic</td><td>Implementation in progress</td></tr>
+	<tr><td>Time Utilities</td><td>Complete</td></tr>
+	<tr><td>System Error Support</td><td>Complete</td></tr>
   <tr><td></td><td></td></tr>
 	<tr><td>Searchers</td><td>Not started</td></tr>
 	<tr><td>Optional Objects</td><td>Initial implementation complete</td></tr>
-	<tr><td>class any</td><td>Not started</td></tr>
+	<tr><td>class any</td><td>Implementation in progress</td></tr>
 	<tr><td>string_view</td><td>Implementation in progress</td></tr>
-	<tr><td>memory</td><td>Not started</td></tr>
+	<tr><td>memory</td><td>Implementation in progress</td></tr>
 	<tr><td>Algorithms library</td><td>Not started</td></tr>
-	<tr><td>Networking</td><td>Not started</td></tr>
 
   </table>