diff options
| author | Karl Schimpf <kschimpf@google.com> | 2013-06-05 09:34:46 -0700 |
|---|---|---|
| committer | Karl Schimpf <kschimpf@google.com> | 2013-06-05 09:34:46 -0700 |
| commit | 69a8e32d4f4451e11cda6d48b318ba4f7e01c683 (patch) | |
| tree | 4bfc77a36fa3e648b7d0d9b7a463c6b1180add47 /tools/llvm-as/llvm-as.cpp | |
| parent | 70fa5e76093e7566e92786d5cc25ef1792b7cea1 (diff) | |
Change CL flag -pnacl-freeze to -bitcode-format={llvm,pnacl}.
Also removes flag from llvm-as.cpp and LTOCodeGenerator.cpp
since one should call pnacl-finalize to
transform pexe's to PNaCl bitcode form.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3469
R=dschuff@chromium.org, jvoung@chromium.org
Review URL: https://codereview.chromium.org/16295014
Diffstat (limited to 'tools/llvm-as/llvm-as.cpp')
| -rw-r--r-- | tools/llvm-as/llvm-as.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index 57820a59bd..c9dda85c79 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -19,9 +19,6 @@ #include "llvm/Analysis/Verifier.h" #include "llvm/Assembly/Parser.h" #include "llvm/Bitcode/ReaderWriter.h" -// @LOCALMOD-BEGIN -#include "llvm/Bitcode/NaCl/NaClReaderWriter.h" -// @LOCALMOD-END #include "llvm/IR/Module.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ManagedStatic.h" @@ -53,13 +50,6 @@ static cl::opt<bool> DisableVerify("disable-verify", cl::Hidden, cl::desc("Do not run verifier on input LLVM (dangerous!)")); -// @LOCALMOD-BEGIN -static cl::opt<bool> -GeneratePNaClBitcode("pnacl-freeze", - cl::desc("Generate a pnacl-frozen bitcode file"), - cl::init(false)); -// @LOCALMOD-END - static void WriteOutputFile(const Module *M) { // Infer the output filename if needed. if (OutputFilename.empty()) { @@ -89,10 +79,7 @@ static void WriteOutputFile(const Module *M) { // @LOCALMOD-BEGIN if (Force || !CheckBitcodeOutputToConsole(Out->os(), true)) { - if (GeneratePNaClBitcode) - NaClWriteBitcodeToFile(M, Out->os()); - else - WriteBitcodeToFile(M, Out->os()); + WriteBitcodeToFile(M, Out->os()); } // @LOCALMOD-END |