summaryrefslogtreecommitdiff
path: root/tools/llvm-nm
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2004-11-14 22:27:46 +0000
committerReid Spencer <rspencer@reidspencer.com>2004-11-14 22:27:46 +0000
commit63efb7798051f2634167eee1e807f0dc7c3f13cf (patch)
tree556d9b784aa085324dba99d5449cc785cbc04469 /tools/llvm-nm
parentd129664066db3466c4ecb78ad82b453af0d7ead9 (diff)
downloadllvm-63efb7798051f2634167eee1e807f0dc7c3f13cf.tar.gz
llvm-63efb7798051f2634167eee1e807f0dc7c3f13cf.tar.bz2
llvm-63efb7798051f2634167eee1e807f0dc7c3f13cf.tar.xz
*Fix usage of changed function prototype*Use Archive interface to symbol table for archives
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17795 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-nm')
-rw-r--r--tools/llvm-nm/llvm-nm.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index 1a2b40e9c9..daac355c0f 100644
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -18,6 +18,7 @@
#include "llvm/Module.h"
#include "llvm/Bytecode/Reader.h"
+#include "llvm/Bytecode/Archive.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/System/Signals.h"
@@ -132,11 +133,13 @@ void DumpSymbolNamesFromFile (std::string &Filename) {
std::cerr << ToolName << ": " << Filename << ": " << ErrorMessage << "\n";
return;
}
- } else if (IsArchive (Filename)) {
+ } else if (IsArchive(Filename)) {
+ Archive* archive = Archive::OpenAndLoad(sys::Path(Filename));
+ if (!archive)
+ std::cerr << ToolName << ": " << Filename << ": " << ErrorMessage << "\n";
std::vector<Module *> Modules;
- if (ReadArchiveFile (Filename, Modules, &ErrorMessage)) {
- std::cerr << ToolName << ": " << Filename << ": "
- << ErrorMessage << "\n";
+ if (archive->getAllModules(Modules,&ErrorMessage)) {
+ std::cerr << ToolName << ": " << Filename << ": " << ErrorMessage << "\n";
return;
}
MultipleFiles = true;