diff options
| -rw-r--r-- | docs/CommandGuide/llvm-link.pod | 4 | ||||
| -rw-r--r-- | tools/llvm-link/llvm-link.cpp | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/docs/CommandGuide/llvm-link.pod b/docs/CommandGuide/llvm-link.pod index 8a2a8c5d77..e1a1267c52 100644 --- a/docs/CommandGuide/llvm-link.pod +++ b/docs/CommandGuide/llvm-link.pod @@ -42,6 +42,10 @@ B<llvm-link> will write raw bitcode regardless of the output device. Specify the output file name. If F<filename> is C<->, then B<llvm-link> will write its output to standard output. +=item B<-S> + +Write output in LLVM intermediate language (instead of bitcode). + =item B<-d> If specified, B<llvm-link> prints a human-readable version of the output diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index cb741991bc..fae4d107b1 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -41,6 +41,10 @@ static cl::opt<bool> Force("f", cl::desc("Enable binary output on terminals")); static cl::opt<bool> +OutputAssembly("S", + cl::desc("Write output as LLVM assembly"), cl::Hidden); + +static cl::opt<bool> Verbose("v", cl::desc("Print information about actions taken")); static cl::opt<bool> @@ -116,7 +120,7 @@ int main(int argc, char **argv) { // TODO: Iterate over the -l list and link in any modules containing // global symbols that have not been resolved so far. - if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite.get(); + if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite; std::string ErrorInfo; std::auto_ptr<raw_ostream> @@ -132,13 +136,15 @@ int main(int argc, char **argv) { if (OutputFilename != "-") sys::RemoveFileOnSignal(sys::Path(OutputFilename)); - if (verifyModule(*Composite.get())) { + if (verifyModule(*Composite)) { errs() << argv[0] << ": linked module is broken!\n"; return 1; } if (Verbose) errs() << "Writing bitcode...\n"; - if (Force || !CheckBitcodeOutputToConsole(*Out, true)) + if (OutputAssembly) { + *Out << *Composite; + } else if (Force || !CheckBitcodeOutputToConsole(*Out, true)) WriteBitcodeToFile(Composite.get(), *Out); return 0; |