summaryrefslogtreecommitdiff
path: root/tools/llvm-ld
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
commit17e9edc4a7bbeadf756494cf39fcacc9eff72202 (patch)
tree9aace188da0c44dfbbedde8b592702b9dcbc2cc0 /tools/llvm-ld
parent1d7fb4eae53c7ec5f9c5c18d603b50dfb9425862 (diff)
downloadllvm-17e9edc4a7bbeadf756494cf39fcacc9eff72202.tar.gz
llvm-17e9edc4a7bbeadf756494cf39fcacc9eff72202.tar.bz2
llvm-17e9edc4a7bbeadf756494cf39fcacc9eff72202.tar.xz
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). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79807 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ld')
-rw-r--r--tools/llvm-ld/llvm-ld.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 17035e2a31..f789b15d3a 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -229,8 +229,8 @@ void GenerateBitcode(Module* M, const std::string& FileName) {
// Create the output file.
std::string ErrorInfo;
- raw_fd_ostream Out(FileName.c_str(), /*Binary=*/true, /*Force=*/true,
- ErrorInfo);
+ raw_fd_ostream Out(FileName.c_str(), ErrorInfo,
+ raw_fd_ostream::F_Force | raw_fd_ostream::F_Binary);
if (!ErrorInfo.empty())
PrintAndExit(ErrorInfo);
@@ -427,8 +427,8 @@ static void EmitShellScript(char **argv) {
// Output the script to start the program...
std::string ErrorInfo;
- raw_fd_ostream Out2(OutputFilename.c_str(), /*Binary=*/false, /*Force=*/true,
- ErrorInfo);
+ raw_fd_ostream Out2(OutputFilename.c_str(), ErrorInfo,
+ llvm::raw_fd_ostream::F_Force);
if (!ErrorInfo.empty())
PrintAndExit(ErrorInfo);