projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
To simplify the upcoming context-on-type change, switch all command line tools to...
[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 e2fbf7d55d53fca93b9e898270a633fb638e3dd7..dffe3ada5f10c03593861b8ea77967a742dbd24e 100644
(file)
--- a/
tools/llvm-ranlib/llvm-ranlib.cpp
+++ b/
tools/llvm-ranlib/llvm-ranlib.cpp
@@
-2,8
+2,8
@@
//
// The LLVM Compiler Infrastructure
//
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by Reid Spencer and is distributed under th
e
-//
University of Illinois Open Source
License. See LICENSE.TXT for details.
+// This file
is distributed under the University of Illinois Open Sourc
e
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
//
@@
-11,12
+11,17
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
+#include "llvm/LLVMContext.h"
#include "llvm/Module.h"
#include "llvm/Module.h"
-#include "llvm/B
yte
code/Archive.h"
+#include "llvm/B
it
code/Archive.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/System/Signals.h"
#include <iostream>
#include <iomanip>
#include "llvm/System/Signals.h"
#include <iostream>
#include <iomanip>
+#include <memory>
using namespace llvm;
using namespace llvm;
@@
-40,18
+45,21
@@
void printSymbolTable(Archive* TheArchive) {
}
int main(int argc, char **argv) {
}
int main(int argc, char **argv) {
+ // 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.
cl::ParseCommandLineOptions(argc, argv,
// Have the command line options parsed and handle things
// like --help and --version.
cl::ParseCommandLineOptions(argc, argv,
- "
LLVM Archive Index Generator (llvm-ranlib)\n\n"
- " This program adds or updates an index of b
yte
code symbols\n"
+ "LLVM Archive Index Generator (llvm-ranlib)\n\n"
+ " This program adds or updates an index of b
it
code symbols\n"
" 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".
@@
-59,7
+67,7
@@
int main(int argc, char **argv) {
// Check the path name of the archive
sys::Path ArchivePath;
// Check the path name of the archive
sys::Path ArchivePath;
- if (!ArchivePath.set
File
(ArchiveName))
+ if (!ArchivePath.set(ArchiveName))
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
@@
-68,24
+76,25
@@
int main(int argc, char **argv) {
std::string err_msg;
std::auto_ptr<Archive>
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;
- TheArchive->writeToDisk(true, false, false );
+ if (TheArchive->writeToDisk(true, false, false, &err_msg ))
+ throw err_msg;
if (Verbose)
printSymbolTable(TheArchive);
if (Verbose)
printSymbolTable(TheArchive);
- } catch (const char*msg) {
-
std::cerr
<< argv[0] << ": " << msg << "\n\n";
+ } catch (const char*
msg) {
+
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;