Merged in RELEASE_11.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10516 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 60 insertions, 1 deletions

diff --git a/docs/CFEBuildInstrs.html b/docs/CFEBuildInstrs.html
index be844b9da8..d5d4eac048 100644
--- a/docs/CFEBuildInstrs.html
+++ b/docs/CFEBuildInstrs.html
@@ -14,6 +14,7 @@
 <ol>
   <li><a href="#cautionarynote">A Cautionary Note</a>
   <li><a href="#instructions">Instructions</a>
+  <li><a href="#license">License Information</a>
 </ol>
 
 <div class="doc_text">    
@@ -114,7 +115,23 @@ command line should like something like this:
    --enable-languages=c,c++ --host=sparcv9-sun-solaris2.8
  % gmake all-gcc
  % setenv LLVM_LIB_SEARCH_PATH `pwd`/gcc 
- % gmake all; gmake install
+ % gmake all
+</pre>
+
+<p>
+At this point, libstdc++ may fail to build because of wchar errors (look for
+errors that reference <tt>vfwscanf</tt> or <tt>wcstof</tt>).  If that happens,
+edit <tt>sparcv9-sun-solaris2.8/libstdc++-v3/config.h</tt> and comment out the
+line that defines <tt>_GLIBCXX_USE_WCHAR_T</tt>.
+</p>
+
+<p>
+Then, continue as below:
+</p>
+
+<pre>
+ % gmake all
+ % gmake install
 </pre>
 
  <p><b>Common Problem:</b> You may get error messages regarding the fact
@@ -197,6 +214,48 @@ following means:</p>
 </div>
 
 <!-- *********************************************************************** -->
+<div class="doc_section">
+  <a name="license">License Information</a>
+</div>
+
+<div class="doc_text">
+<p>
+The LLVM GCC frontend is licensed to you under the GNU General Public License
+and the GNU Lesser General Public License.  Please see the files COPYING and
+COPYING.LIB for more details.
+</p>
+
+<p>
+The software also has the following additional copyrights:
+</p>
+
+<pre>
+Copyright (c) 1994
+Hewlett-Packard Company
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.  Hewlett-Packard Company makes no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied warranty.
+
+Copyright (c) 1996, 1997, 1998, 1999
+Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.  Silicon Graphics makes no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied warranty.
+</pre>
+</div>
+
+<!-- *********************************************************************** -->
+<!-- *********************************************************************** -->
 
 <hr>
 <div class="doc_footer">