diff options
author | Dan Gohman <gohman@apple.com> | 2010-09-01 14:20:41 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2010-09-01 14:20:41 +0000 |
commit | a2233f28014b92c31905f3bf9c084422d42fd648 (patch) | |
tree | 35e59993bf205438fe7bc9ce9fe14139ba4e1592 /llvm/tools/llvm-link | |
parent | e201c07d2305dc9a3609ba4feb95336000dc71e6 (diff) | |
download | bcm5719-llvm-a2233f28014b92c31905f3bf9c084422d42fd648.tar.gz bcm5719-llvm-a2233f28014b92c31905f3bf9c084422d42fd648.zip |
Make tool_output_file's raw_ostream instance a member variable instead
of a base class.
This makes it possible to unregister the file from FilesToRemove when
the file is done. Also, this eliminates the need for
formatted_tool_output_file.
llvm-svn: 112706
Diffstat (limited to 'llvm/tools/llvm-link')
-rw-r--r-- | llvm/tools/llvm-link/llvm-link.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp index f487d2452df..e55d0de0f9b 100644 --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -130,9 +130,9 @@ int main(int argc, char **argv) { if (Verbose) errs() << "Writing bitcode...\n"; if (OutputAssembly) { - Out << *Composite; - } else if (Force || !CheckBitcodeOutputToConsole(Out, true)) - WriteBitcodeToFile(Composite.get(), Out); + Out.os() << *Composite; + } else if (Force || !CheckBitcodeOutputToConsole(Out.os(), true)) + WriteBitcodeToFile(Composite.get(), Out.os()); // Declare success. Out.keep(); |