projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix register printing in disassembling of push/pop of segment registers and in/out...
[oota-llvm.git]
/
tools
/
llvm-ranlib
/
llvm-ranlib.cpp
diff --git
a/tools/llvm-ranlib/llvm-ranlib.cpp
b/tools/llvm-ranlib/llvm-ranlib.cpp
index cd17be890a2413f9559e944f16b20806b1326c8b..64f795f7f63d5ff4a0a88f113cf2b81d38a2de55 100644
(file)
--- a/
tools/llvm-ranlib/llvm-ranlib.cpp
+++ b/
tools/llvm-ranlib/llvm-ranlib.cpp
@@
-11,15
+11,17
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
+#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
#include "llvm/Bitcode/Archive.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Module.h"
#include "llvm/Bitcode/Archive.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileSystem.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/ManagedStatic.h"
-#include "llvm/System/Signals.h"
-#include <iostream>
-#include <iomanip>
+#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Format.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/Signals.h"
#include <memory>
#include <memory>
-
using namespace llvm;
// llvm-ar operation code and modifier flags
using namespace llvm;
// llvm-ar operation code and modifier flags
@@
-32,17
+34,22
@@
Verbose("verbose",cl::Optional,cl::init(false),
// printSymbolTable - print out the archive's symbol table.
void printSymbolTable(Archive* TheArchive) {
// printSymbolTable - print out the archive's symbol table.
void printSymbolTable(Archive* TheArchive) {
-
std::cout
<< "\nArchive Symbol Table:\n";
+
outs()
<< "\nArchive Symbol Table:\n";
const Archive::SymTabType& symtab = TheArchive->getSymbolTable();
for (Archive::SymTabType::const_iterator I=symtab.begin(), E=symtab.end();
I != E; ++I ) {
unsigned offset = TheArchive->getFirstFileOffset() + I->second;
const Archive::SymTabType& symtab = TheArchive->getSymbolTable();
for (Archive::SymTabType::const_iterator I=symtab.begin(), E=symtab.end();
I != E; ++I ) {
unsigned offset = TheArchive->getFirstFileOffset() + I->second;
-
std::cout << " " << std::setw(9) << offset
<< "\t" << I->first <<"\n";
+
outs() << " " << format("%9u", offset)
<< "\t" << I->first <<"\n";
}
}
int main(int argc, char **argv) {
}
}
int main(int argc, char **argv) {
- llvm_shutdown_obj X; // Call llvm_shutdown() on exit.
+ // Print a stack trace if we signal out.
+ llvm::sys::PrintStackTraceOnErrorSignal();
+ llvm::PrettyStackTraceProgram X(argc, argv);
+
+ LLVMContext &Context = getGlobalContext();
+ llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
// Have the command line options parsed and handle things
// like --help and --version.
// Have the command line options parsed and handle things
// like --help and --version.
@@
-52,9
+59,6
@@
int main(int argc, char **argv) {
" to an LLVM archive file."
);
" to an LLVM archive file."
);
- // Print a stack trace if we signal out.
- sys::PrintStackTraceOnErrorSignal();
-
int exitCode = 0;
// Make sure we don't exit with "unhandled exception".
int exitCode = 0;
// Make sure we don't exit with "unhandled exception".
@@
-66,12
+70,13
@@
int main(int argc, char **argv) {
throw std::string("Archive name invalid: ") + ArchiveName;
// Make sure it exists, we don't create empty archives
throw std::string("Archive name invalid: ") + ArchiveName;
// Make sure it exists, we don't create empty archives
- if (!ArchivePath.exists())
+ bool Exists;
+ if (llvm::sys::fs::exists(ArchivePath.str(), Exists) || !Exists)
throw std::string("Archive file does not exist");
std::string err_msg;
std::auto_ptr<Archive>
throw std::string("Archive file does not exist");
std::string err_msg;
std::auto_ptr<Archive>
- AutoArchive(Archive::OpenAndLoad(ArchivePath,&err_msg));
+ AutoArchive(Archive::OpenAndLoad(ArchivePath,
Context,
&err_msg));
Archive* TheArchive = AutoArchive.get();
if (!TheArchive)
throw err_msg;
Archive* TheArchive = AutoArchive.get();
if (!TheArchive)
throw err_msg;
@@
-83,13
+88,13
@@
int main(int argc, char **argv) {
printSymbolTable(TheArchive);
} catch (const char* msg) {
printSymbolTable(TheArchive);
} catch (const char* msg) {
-
std::cerr
<< argv[0] << ": " << msg << "\n\n";
+
errs()
<< argv[0] << ": " << msg << "\n\n";
exitCode = 1;
} catch (const std::string& msg) {
exitCode = 1;
} catch (const std::string& msg) {
-
std::cerr
<< argv[0] << ": " << msg << "\n";
+
errs()
<< argv[0] << ": " << msg << "\n";
exitCode = 2;
} catch (...) {
exitCode = 2;
} catch (...) {
-
std::cerr
<< argv[0] << ": An unexpected unknown exception occurred.\n";
+
errs()
<< argv[0] << ": An unexpected unknown exception occurred.\n";
exitCode = 3;
}
return exitCode;
exitCode = 3;
}
return exitCode;