From: Chris Lattner <sabre@nondot.org>
Date: Tue, 4 May 2010 18:15:33 +0000 (+0000)
Subject: update instructions for llvm-gcc4, the brave new world!  PR7037
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=860e0b4c950285fcaaefc3c218c9d7276fb609e8;p=oota-llvm.git

update instructions for llvm-gcc4, the brave new world!  PR7037


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

diff --git a/docs/FAQ.html b/docs/FAQ.html
index 337866cd9dd..ad97be16b23 100644
--- a/docs/FAQ.html
+++ b/docs/FAQ.html
@@ -632,22 +632,22 @@ Stop.
 <p>Use commands like this:</p>
 
 <ol>
-  <li><p>Compile your program as normal with llvm-g++:</p>
+  <li><p>Compile your program with llvm-g++:</p>
 
 <pre class="doc_code">
-% llvm-g++ x.cpp -o program
+% llvm-g++ -emit-llvm x.cpp -o program.bc -c
 </pre>
 
       <p>or:</p>
 
 <pre class="doc_code">
-% llvm-g++ a.cpp -c
-% llvm-g++ b.cpp -c
-% llvm-g++ a.o b.o -o program
+% llvm-g++ a.cpp -c -emit-llvm
+% llvm-g++ b.cpp -c -emit-llvm
+% llvm-ld a.o b.o -o program
 </pre>
 
-      <p>With llvm-gcc3, this will generate program and program.bc.  The .bc
-         file is the LLVM version of the program all linked together.</p></li>
+   <p>This will generate program and program.bc.  The .bc
+      file is the LLVM version of the program all linked together.</p></li>
 
   <li><p>Convert the LLVM code to C code, using the LLC tool with the C
       backend:</p>