Add '-v' option to enable verbose output from the linker

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@966 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2001-10-23 20:44:55 +00:00
parent c2d774b6c1
commit b81adf14fb
2 changed files with 26 additions and 2 deletions

View File

@ -4,6 +4,9 @@
// This utility may be invoked in the following manner: // This utility may be invoked in the following manner:
// link a.bc b.bc c.bc -o x.bc // link a.bc b.bc c.bc -o x.bc
// //
// Alternatively, this can be used as an 'ar' tool as well. If invoked as
// either 'ar' or 'llvm-ar', it accepts a 'cr' parameter as well.
//
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/Transforms/Linker.h" #include "llvm/Transforms/Linker.h"
@ -21,6 +24,7 @@ cl::StringList InputFilenames("", "Load <arg> files, linking them together",
cl::OneOrMore); cl::OneOrMore);
cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "-");
cl::Flag Force ("f", "Overwrite output files", cl::NoFlags, false); cl::Flag Force ("f", "Overwrite output files", cl::NoFlags, false);
cl::Flag Verbose ("v", "Print information about actions taken");
cl::Flag DumpAsm ("d", "Print assembly as linked", cl::Hidden, false); cl::Flag DumpAsm ("d", "Print assembly as linked", cl::Hidden, false);
@ -28,6 +32,10 @@ int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
assert(InputFilenames.size() > 0 && "OneOrMore is not working"); assert(InputFilenames.size() > 0 && "OneOrMore is not working");
// TODO: TEST argv[0]
if (Verbose) cerr << "Loading '" << InputFilenames[0] << "'\n";
std::auto_ptr<Module> Composite(ParseBytecodeFile(InputFilenames[0])); std::auto_ptr<Module> Composite(ParseBytecodeFile(InputFilenames[0]));
if (Composite.get() == 0) { if (Composite.get() == 0) {
cerr << "Error opening bytecode file: '" << InputFilenames[0] << "'\n"; cerr << "Error opening bytecode file: '" << InputFilenames[0] << "'\n";
@ -35,12 +43,15 @@ int main(int argc, char **argv) {
} }
for (unsigned i = 1; i < InputFilenames.size(); ++i) { for (unsigned i = 1; i < InputFilenames.size(); ++i) {
if (Verbose) cerr << "Loading '" << InputFilenames[i] << "'\n";
auto_ptr<Module> M(ParseBytecodeFile(InputFilenames[i])); auto_ptr<Module> M(ParseBytecodeFile(InputFilenames[i]));
if (M.get() == 0) { if (M.get() == 0) {
cerr << "Error opening bytecode file: '" << InputFilenames[i] << "'\n"; cerr << "Error opening bytecode file: '" << InputFilenames[i] << "'\n";
return 1; return 1;
} }
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
string ErrorMessage; string ErrorMessage;
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
cerr << "Error linking in '" << InputFilenames[i] << "': " cerr << "Error linking in '" << InputFilenames[i] << "': "
@ -62,6 +73,7 @@ int main(int argc, char **argv) {
} }
} }
if (Verbose) cerr << "Writing bytecode...\n";
WriteBytecodeToFile(Composite.get(), *Out); WriteBytecodeToFile(Composite.get(), *Out);
if (Out != &cout) delete Out; if (Out != &cout) delete Out;

View File

@ -4,6 +4,9 @@
// This utility may be invoked in the following manner: // This utility may be invoked in the following manner:
// link a.bc b.bc c.bc -o x.bc // link a.bc b.bc c.bc -o x.bc
// //
// Alternatively, this can be used as an 'ar' tool as well. If invoked as
// either 'ar' or 'llvm-ar', it accepts a 'cr' parameter as well.
//
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/Transforms/Linker.h" #include "llvm/Transforms/Linker.h"
@ -21,6 +24,7 @@ cl::StringList InputFilenames("", "Load <arg> files, linking them together",
cl::OneOrMore); cl::OneOrMore);
cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "-"); cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "-");
cl::Flag Force ("f", "Overwrite output files", cl::NoFlags, false); cl::Flag Force ("f", "Overwrite output files", cl::NoFlags, false);
cl::Flag Verbose ("v", "Print information about actions taken");
cl::Flag DumpAsm ("d", "Print assembly as linked", cl::Hidden, false); cl::Flag DumpAsm ("d", "Print assembly as linked", cl::Hidden, false);
@ -28,6 +32,10 @@ int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
assert(InputFilenames.size() > 0 && "OneOrMore is not working"); assert(InputFilenames.size() > 0 && "OneOrMore is not working");
// TODO: TEST argv[0]
if (Verbose) cerr << "Loading '" << InputFilenames[0] << "'\n";
std::auto_ptr<Module> Composite(ParseBytecodeFile(InputFilenames[0])); std::auto_ptr<Module> Composite(ParseBytecodeFile(InputFilenames[0]));
if (Composite.get() == 0) { if (Composite.get() == 0) {
cerr << "Error opening bytecode file: '" << InputFilenames[0] << "'\n"; cerr << "Error opening bytecode file: '" << InputFilenames[0] << "'\n";
@ -35,12 +43,15 @@ int main(int argc, char **argv) {
} }
for (unsigned i = 1; i < InputFilenames.size(); ++i) { for (unsigned i = 1; i < InputFilenames.size(); ++i) {
if (Verbose) cerr << "Loading '" << InputFilenames[i] << "'\n";
auto_ptr<Module> M(ParseBytecodeFile(InputFilenames[i])); auto_ptr<Module> M(ParseBytecodeFile(InputFilenames[i]));
if (M.get() == 0) { if (M.get() == 0) {
cerr << "Error opening bytecode file: '" << InputFilenames[i] << "'\n"; cerr << "Error opening bytecode file: '" << InputFilenames[i] << "'\n";
return 1; return 1;
} }
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
string ErrorMessage; string ErrorMessage;
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
cerr << "Error linking in '" << InputFilenames[i] << "': " cerr << "Error linking in '" << InputFilenames[i] << "': "
@ -62,6 +73,7 @@ int main(int argc, char **argv) {
} }
} }
if (Verbose) cerr << "Writing bytecode...\n";
WriteBytecodeToFile(Composite.get(), *Out); WriteBytecodeToFile(Composite.get(), *Out);
if (Out != &cout) delete Out; if (Out != &cout) delete Out;