maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 966
This commit is contained in:
Chris Lattner 2001-10-23 20:44:55 +00:00
parent b046867a97
commit ebaa78852c
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/tools/link/link.cpp
View File

@ -4,6 +4,9 @@
// This utility may be invoked in the following manner:
// 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"
@ -21,6 +24,7 @@ cl::StringList InputFilenames("", "Load <arg> files, linking them together",
cl::OneOrMore);
cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "-");
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);
@ -28,6 +32,10 @@ int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
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]));
if (Composite.get() == 0) {
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) {
if (Verbose) cerr << "Loading '" << InputFilenames[i] << "'\n";
auto_ptr<Module> M(ParseBytecodeFile(InputFilenames[i]));
if (M.get() == 0) {
cerr << "Error opening bytecode file: '" << InputFilenames[i] << "'\n";
return 1;
}
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
string ErrorMessage;
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
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);
if (Out != &cout) delete Out;

14
llvm/tools/llvm-link/llvm-link.cpp
View File

@ -4,6 +4,9 @@
// This utility may be invoked in the following manner:
// 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"
@ -21,6 +24,7 @@ cl::StringList InputFilenames("", "Load <arg> files, linking them together",
cl::OneOrMore);
cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "-");
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);
@ -28,6 +32,10 @@ int main(int argc, char **argv) {
cl::ParseCommandLineOptions(argc, argv, " llvm linker\n");
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]));
if (Composite.get() == 0) {
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) {
if (Verbose) cerr << "Loading '" << InputFilenames[i] << "'\n";
auto_ptr<Module> M(ParseBytecodeFile(InputFilenames[i]));
if (M.get() == 0) {
cerr << "Error opening bytecode file: '" << InputFilenames[i] << "'\n";
return 1;
}
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
string ErrorMessage;
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
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);
if (Out != &cout) delete Out;