diff options
| author | Dan Gohman <gohman@apple.com> | 2009-08-25 15:34:52 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2009-08-25 15:34:52 +0000 |
| commit | baa26395ccf17fc988bb9cf62d6659ca8415ece9 (patch) | |
| tree | af3d61a2611ae0c26bb7d9b8ac261976592ec108 /tools/opt | |
| parent | cf48efcf3dc6c825a113448105763fab9de9aa53 (diff) | |
| download | llvm-baa26395ccf17fc988bb9cf62d6659ca8415ece9.tar.gz llvm-baa26395ccf17fc988bb9cf62d6659ca8415ece9.tar.bz2 llvm-baa26395ccf17fc988bb9cf62d6659ca8415ece9.tar.xz | |
Make LLVM command-line tools overwrite their output files without -f.
This is conventional command-line tool behavior. -f now just means
"enable binary output on terminals".
Add a -f option to llvm-extract and llvm-link, for consistency.
Remove F_Force from raw_fd_ostream and enable overwriting and
truncating by default. Introduce an F_Excl flag to permit users to
enable a failure when the file already exists. This flag is
currently unused.
Update Makefiles and documentation accordingly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79990 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/opt')
| -rw-r--r-- | tools/opt/GraphPrinters.cpp | 2 | ||||
| -rw-r--r-- | tools/opt/opt.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/opt/GraphPrinters.cpp b/tools/opt/GraphPrinters.cpp index c38469cc12..1ae6be253f 100644 --- a/tools/opt/GraphPrinters.cpp +++ b/tools/opt/GraphPrinters.cpp @@ -29,7 +29,7 @@ static void WriteGraphToFile(std::ostream &O, const std::string &GraphName, std::string Filename = GraphName + ".dot"; O << "Writing '" << Filename << "'..."; std::string ErrInfo; - raw_fd_ostream F(Filename.c_str(), ErrInfo, raw_fd_ostream::F_Force); + raw_fd_ostream F(Filename.c_str(), ErrInfo); if (ErrInfo.empty()) WriteGraph(F, GT); diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 7753c21fa1..6effa48000 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -55,7 +55,7 @@ OutputFilename("o", cl::desc("Override output filename"), cl::value_desc("filename"), cl::init("-")); static cl::opt<bool> -Force("f", cl::desc("Overwrite output files")); +Force("f", cl::desc("Enable binary output on terminals")); static cl::opt<bool> PrintEachXForm("p", cl::desc("Print module after each transformation")); @@ -367,12 +367,9 @@ int main(int argc, char **argv) { if (OutputFilename != "-") { std::string ErrorInfo; Out = new raw_fd_ostream(OutputFilename.c_str(), ErrorInfo, - raw_fd_ostream::F_Binary | - (Force ? raw_fd_ostream::F_Force : 0)); + raw_fd_ostream::F_Binary); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; - if (!Force) - errs() << "Use -f command line argument to force output\n"; delete Out; return 1; } |