Print the tool name when an error comes from so that I can tell which
tool of a pipeline is having issues.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3167 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp
index 79bcc4c..ade03de 100644
--- a/tools/analyze/analyze.cpp
+++ b/tools/analyze/analyze.cpp
@@ -101,11 +101,11 @@
try {
CurMod = ParseBytecodeFile(InputFilename);
if (!CurMod && !(CurMod = ParseAssemblyFile(InputFilename))){
- std::cerr << "Input file didn't read correctly.\n";
+ std::cerr << argv[0] << ": input file didn't read correctly.\n";
return 1;
}
} catch (const ParseException &E) {
- std::cerr << E.getMessage() << "\n";
+ std::cerr << argv[0] << ": " << E.getMessage() << "\n";
return 1;
}
@@ -130,7 +130,8 @@
Passes.add(new ModulePassPrinter(Analysis));
} else
- cerr << "Cannot create pass: " << Analysis->getPassName() << "\n";
+ cerr << argv[0] << ": cannot create pass: "
+ << Analysis->getPassName() << "\n";
}
Passes.run(*CurMod);
diff --git a/tools/extract/extract.cpp b/tools/extract/extract.cpp
index cfadff0..e904bea 100644
--- a/tools/extract/extract.cpp
+++ b/tools/extract/extract.cpp
@@ -92,7 +92,7 @@
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
if (M.get() == 0) {
- std::cerr << "bytecode didn't read correctly.\n";
+ std::cerr << argv[0] << ": bytecode didn't read correctly.\n";
return 1;
}
diff --git a/tools/gccld/gccld.cpp b/tools/gccld/gccld.cpp
index 5649796..5113105 100644
--- a/tools/gccld/gccld.cpp
+++ b/tools/gccld/gccld.cpp
@@ -123,7 +123,7 @@
if (Verbose) cerr << "Linking in '" << InputFilenames[i] << "'\n";
if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) {
- cerr << "Error linking in '" << InputFilenames[i] << "': "
+ cerr << argv[0] << ": error linking in '" << InputFilenames[i] << "': "
<< ErrorMessage << "\n";
return 1;
}
@@ -165,7 +165,8 @@
// Add the pass that writes bytecode to the output file...
std::ofstream Out((OutputFilename+".bc").c_str());
if (!Out.good()) {
- cerr << "Error opening '" << OutputFilename << ".bc' for writing!\n";
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << ".bc' for writing!\n";
return 1;
}
Passes.add(new WriteBytecodePass(&Out)); // Write bytecode to file...
@@ -180,7 +181,8 @@
// Output the script to start the program...
std::ofstream Out2(OutputFilename.c_str());
if (!Out2.good()) {
- cerr << "Error opening '" << OutputFilename << "' for writing!\n";
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << "' for writing!\n";
return 1;
}
Out2 << "#!/bin/sh\nlli -q $0.bc $*\n";
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index f5ba08c..88f327d 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -153,7 +153,7 @@
// Load the module to be compiled...
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
if (M.get() == 0) {
- cerr << "bytecode didn't read correctly.\n";
+ cerr << argv[0] << ": bytecode didn't read correctly.\n";
return 1;
}
@@ -183,7 +183,8 @@
if (OutputFilename != "") { // Specified an output filename?
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
- cerr << "Error opening '" << OutputFilename << "': File exists!\n"
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists!\n"
<< "Use -f command line argument to force output\n";
return 1;
}
@@ -202,14 +203,15 @@
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
- cerr << "Error opening '" << OutputFilename << "': File exists!\n"
+ cerr << argv[0] << ": error opening '" << OutputFilename
+ << "': file exists!\n"
<< "Use -f command line argument to force output\n";
return 1;
}
Out = new std::ofstream(OutputFilename.c_str());
if (!Out->good()) {
- cerr << "Error opening " << OutputFilename << "!\n";
+ cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
delete Out;
return 1;
}
diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index cfadff0..e904bea 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -92,7 +92,7 @@
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
if (M.get() == 0) {
- std::cerr << "bytecode didn't read correctly.\n";
+ std::cerr << argv[0] << ": bytecode didn't read correctly.\n";
return 1;
}