summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-link/llvm-link.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-08-23 02:51:22 +0000
committerChris Lattner <sabre@nondot.org>2009-08-23 02:51:22 +0000
commit9e6f1f160ab6810625629fd1e2dc8a809db83565 (patch)
tree1165e8689cce0feb59958dfe42477fa586042971 /llvm/tools/llvm-link/llvm-link.cpp
parent622ddae92b84022892d31e64de88a643e988a707 (diff)
downloadbcm5719-llvm-9e6f1f160ab6810625629fd1e2dc8a809db83565.tar.gz
bcm5719-llvm-9e6f1f160ab6810625629fd1e2dc8a809db83565.zip
Change raw_fd_ostream to take flags as an optional bitmask
instead of as two bools. Use this to add a F_Append flag which has the obvious behavior. Other unrelated changes conflated into this patch: 1. REmove EH stuff from llvm-dis and llvm-as, the try blocks are dead. 2. Simplify the filename inference code in llvm-as/llvm-dis, because raw_fd_ostream does the right thing with '-'. 3. Switch machine verifier to use raw_ostream instead of ostream (Which is the thing that needed append in the first place). llvm-svn: 79807
Diffstat (limited to 'llvm/tools/llvm-link/llvm-link.cpp')
-rw-r--r--llvm/tools/llvm-link/llvm-link.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp
index a287c479a74..3d10ee3c4d8 100644
--- a/llvm/tools/llvm-link/llvm-link.cpp
+++ b/llvm/tools/llvm-link/llvm-link.cpp
@@ -122,8 +122,9 @@ int main(int argc, char **argv) {
raw_ostream *Out = &outs(); // Default to printing to stdout...
if (OutputFilename != "-") {
std::string ErrorInfo;
- Out = new raw_fd_ostream(OutputFilename.c_str(), /*Binary=*/true,
- Force, ErrorInfo);
+ Out = new raw_fd_ostream(OutputFilename.c_str(), ErrorInfo,
+ raw_fd_ostream::F_Binary |
+ (Force ? raw_fd_ostream::F_Force : 0));
if (!ErrorInfo.empty()) {
errs() << ErrorInfo << '\n';
if (!Force)
OpenPOWER on IntegriCloud