Merged in RELEASE_12.

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

7 files changed, 73 insertions, 26 deletions

diff --git a/docs/CommandGuide/analyze.html b/docs/CommandGuide/analyze.html
index cd66ce5e0d..ff61808f2b 100644
--- a/docs/CommandGuide/analyze.html
+++ b/docs/CommandGuide/analyze.html
@@ -53,11 +53,6 @@ language.
 	list of available analysis passes.
 	<p>
 
-	<li> -dsa-track-integers
-	<br>
-	Track integers as potential pointers.
-	<p>
-
 	<li> -profile-info-file &lt;filename&gt;
 	<br>
 	Specify the name of the file loaded by the -profile-loader option.
diff --git a/docs/CommandGuide/bugpoint.html b/docs/CommandGuide/bugpoint.html
index c6ac7abd10..62e5787f86 100644
--- a/docs/CommandGuide/bugpoint.html
+++ b/docs/CommandGuide/bugpoint.html
@@ -190,6 +190,16 @@ non-obvious ways.  Here are some hints and tips:<p>
     when attempting to reduce test programs.  If you're trying to find
     a bug in one of these passes, <tt>bugpoint</tt> may crash.<p>
 
+	<li><tt>-enable-correct-eh-support</tt><br>
+    Make the -lowerinvoke pass insert expensive, but correct, exception
+    handling code.<p>
+
+	<li><tt>-internalize-public-api-file &lt;filename&gt;</tt><br>
+    Preserve the symbols listed in the file <tt>filename</tt>.<p>
+
+	<li><tt>-internalize-public-api-list &lt;list&gt;</tt><br>
+    Preserve the symbols listed in <tt>list</tt>.<p>
+
 	<li> <tt>-help</tt><br>
 	Print a summary of command line options.<p>
 
@@ -215,6 +225,9 @@ non-obvious ways.  Here are some hints and tips:<p>
     <tt>bugpoint</tt> will attempt to generate a reference output by
     compiling the program with the C backend and running it.<p>
 
+	<li><tt>-profile-info-file &lt;filename&gt;</tt><br>
+    Profile file loaded by -profile-loader.<p>
+
 	<a name="opt_run-"><li><tt>-run-{int,jit,llc,cbe}</tt><br>
     Whenever the test program is compiled, <tt>bugpoint</tt> should generate
     code for it using the specified code generator.  These options allow
diff --git a/docs/CommandGuide/opt.html b/docs/CommandGuide/opt.html
index 4bf67a49c2..2e531a9202 100644
--- a/docs/CommandGuide/opt.html
+++ b/docs/CommandGuide/opt.html
@@ -53,11 +53,6 @@ writes its output to the standard output.
 	Specify the output filename.
 	<p>
 
-	<li> -dsa-track-integers
-	<br>
-	Track integers as potential pointers.
-	<p>
-
 	<li> -profile-info-file &lt;filename&gt;
 	<br>
 	Specify the name of the file loaded by the -profile-loader option.
diff --git a/docs/FAQ.html b/docs/FAQ.html
index 87e6c13f35..74f0ea40f4 100644
--- a/docs/FAQ.html
+++ b/docs/FAQ.html
@@ -49,6 +49,8 @@
   <li>I've built LLVM and am testing it, but the tests freeze.</li>
   <li>Why do test results differ when I perform different types of builds?</li>
   <li>Compiling LLVM with GCC 3.3.2 fails, what should I do?</li>
+  <li>When I use the test suite, all of the C Backend tests fail.  What is
+      wrong?</li>
   </ol></li>
 
   <li><a href="#cfe">Using the GCC Front End</a>
@@ -341,6 +343,31 @@ build.</p>
    affects projects other than LLVM.  Try upgrading or downgrading your GCC.</p>
 </div>
 
+<div class="question">
+<p>
+When I use the test suite, all of the C Backend tests fail.  What is
+wrong?
+</p>
+</div>
+
+<div class="answer">
+<p>
+If you build LLVM and the C Backend tests fail in <tt>llvm/test/Programs</tt>,
+then chances are good that the directory pointed to by the LLVM_LIB_SEARCH_PATH
+environment variable does not contain the libcrtend.a library.
+</p>
+
+<p>
+To fix it, verify that LLVM_LIB_SEARCH_PATH points to the correct directory
+and that libcrtend.a is inside.  For pre-built LLVM GCC front ends, this
+should be the absolute path to
+<tt>cfrontend/&lt;<i>platform</i>&gt;/llvm-gcc/bytecode-libs</tt>.  If you've
+built your own LLVM GCC front end, then ensure that you've built and installed
+the libraries in <tt>llvm/runtime</tt> and have LLVM_LIB_SEARCH_PATH pointing
+to the <tt>LLVMGCCDIR/bytecode-libs</tt> subdirectory.
+</p>
+</div>
+
 <!-- *********************************************************************** -->
 <div class="doc_section">
   <a name="cfe">Using the GCC Front End</a>
diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html
index 6490c0cf28..04cd682012 100644
--- a/docs/GettingStarted.html
+++ b/docs/GettingStarted.html
@@ -183,10 +183,10 @@ software you will need.</p>
 
   <li>Linux on x86 (Pentium and above)
   <ul>
-    <li>Approximately 918 MB of Free Disk Space
+    <li>Approximately 1.02 GB of Free Disk Space
     <ul>
-      <li>Source code: 28 MB</li>
-      <li>Object code: 850 MB</li>
+      <li>Source code: 45 MB</li>
+      <li>Object code: 956 MB</li>
       <li>GCC front end: 40 MB</li>
     </ul></li>
   </ul>
@@ -194,10 +194,10 @@ software you will need.</p>
 
   <li>Solaris on SparcV9 (Ultrasparc)
   <ul>
-    <li>Approximately 1.52 GB of Free Disk Space
+    <li>Approximately 1.75 GB of Free Disk Space
       <ul>
-        <li>Source code: 28 MB</li>
-        <li>Object code: 1470 MB</li>
+        <li>Source code: 45 MB</li>
+        <li>Object code: 1705 MB</li>
         <li>GCC front end: 50 MB</li>
       </ul></li>
   </ul>
@@ -205,9 +205,9 @@ software you will need.</p>
 
   <li>FreeBSD on x86 (Pentium and above)
   <ul>
-    <li>Approximately 918 MB of Free Disk Space
+    <li>Approximately 935 MB of Free Disk Space
     <ul>
-      <li>Source code: 28 MB</li>
+      <li>Source code: 45 MB</li>
       <li>Object code: 850 MB</li>
       <li>GCC front end: 40 MB</li>
     </ul></li>
@@ -217,9 +217,9 @@ software you will need.</p>
   <li>MacOS X on PowerPC
   <ul>
     <li>No native code generation
-    <li>Approximately 1.20 GB of Free Disk Space
+    <li>Approximately 1.25 GB of Free Disk Space
       <ul>
-        <li>Source code: 28 MB</li>
+        <li>Source code: 45 MB</li>
         <li>Object code: 1160 MB</li>
         <li>GCC front end: 40 MB</li>
       </ul></li>
@@ -275,10 +275,23 @@ LLVM:</p>
       automake from 1.4p5 on should work; we only use aclocal from that
       package.</p></li>
 
-  <li><A href="http://www.codesourcery.com/qm/qmtest">QMTest</A></li>
+  <li><A href="http://www.codesourcery.com/qm/qmtest">QMTest 2.0.3</A></li>
   <li><A href="http://www.python.org">Python</A>
 
-      <p>These are needed to use the LLVM test suite.</p></li>
+      <p>
+      These are needed to use the LLVM test suite.  Please note that newer
+      versions of QMTest may not work with the LLVM test suite.  QMTest 2.0.3
+      can be retrieved from the QMTest CVS repository using the following
+      commands:
+      <ul>
+        <li><tt>cvs -d :pserver:anoncvs@cvs.codesourcery.com:/home/qm/Repository login</tt>
+        </li>
+        <li>When prompted, use <tt>anoncvs</tt> as the password.
+        </li>
+        <li><tt>cvs -d :pserver:anoncvs@cvs.codesourcery.com:/home/qm/Repository co -r release-2-0-3 qm</tt>
+        </li>
+      </ul>
+      </p></li>
 
 </ul>
 
@@ -888,7 +901,7 @@ different <a href="#tools">tools</a>.</p>
 
   <dt><tt>llvm/lib/Target/</tt><dd> This directory contains files that
   describe various target architectures for code generation.  For example,
-  the llvm/lib/Target/Sparc directory holds the Sparc machine
+  the llvm/lib/Target/SparcV9 directory holds the Sparc machine
   description.<br>
     
   <dt><tt>llvm/lib/CodeGen/</tt><dd> This directory contains the major parts
diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index 1b8eb1570b..7e7b2d6298 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -121,12 +121,12 @@ href="http://llvm.cs.uiuc.edu/PR203">RPM package generation</a>.</li>
 </ul>
 </li>
 <li><a href="http://llvm.cs.uiuc.edu/PR253">LLVM now no longer depends on the boost library</a>.</li>
-<li>The X86 backend now generates <b>substantially</b> better native code, and is faster.</li>
+<li>The X86 backend now generates <b>substantially</b> better native code and is faster.</li>
 <li>The C backend has been turned moved from the "llvm-dis" tool to the "llc"
 tool.  You can activate it with "<tt>llc -march=c foo.bc -o foo.c</tt>".</li>
 <li>LLVM includes a new interprocedural optimization that marks global variables
 "constant" when they are provably never written to.</li>
-<li>LLVM now includes a new interprocedural optimization that converts small "by reference" arguments to "by value" arguments, which is often improve the performance of C++ programs substantially.</li>
+<li>LLVM now includes a new interprocedural optimization that converts small "by reference" arguments to "by value" arguments, which often improves the performance of C++ programs substantially.</li>
 <li>Bugpoint can now do a better job reducing miscompilation problems by
 reducing programs down to a particular loop nest, instead of just the function
 being miscompiled.</li>
@@ -145,7 +145,7 @@ In this release, the following missing features were implemented:
 <ol>
 <li><a href="http://llvm.cs.uiuc.edu/PR16">Exception handling in the X86
 &amp; Sparc native code generators</a> is now supported</li>
-<li>The C/C++ front-end now support the GCC <tt>__builtin_return_address</tt> and <tt>__builtin_frame_address</tt> extensions.  These are also supported by the X86 backend and by the C backend.</li>
+<li>The C/C++ front-end now supports the GCC <tt>__builtin_return_address</tt> and <tt>__builtin_frame_address</tt> extensions.  These are also supported by the X86 backend and by the C backend.</li>
 <li><a href="http://llvm.cs.uiuc.edu/PR249">[X86] Missing cast from ULong -> Double, cast FP -> bool and support for -9223372036854775808</a></li>
 <li>The C/C++ front-end <a href="http://llvm.cs.uiuc.edu/PR273">now supports</a>
 the "<a href="http://gcc.gnu.org/onlinedocs/gcc/Labels-as-Values.html#Labels%20as%20Values">labels as values</a>" GCC extension, often used to build "threaded interpreters".</a></li>
diff --git a/test/Makefile b/test/Makefile
index ad9c6ecbd4..f52f543795 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -34,6 +34,10 @@ ifeq ($(OS),SunOS)
 QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr
 endif
 
+ifeq ($(OS),Darwin)
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.darwin.qmr
+endif
+
 #
 # This is configuration information used by the test suite.  In QM Test, it's
 # called a 'context.'