diff options
author | Kevin Enderby <enderby@apple.com> | 2012-02-17 19:18:29 +0000 |
---|---|---|
committer | Kevin Enderby <enderby@apple.com> | 2012-02-17 19:18:29 +0000 |
commit | fc0d7400bc44b52d0446933290dfeef2f9586293 (patch) | |
tree | 06621707f41ae62c4d99f09c46330e98fa3633ca /lib | |
parent | 8c3b87cf19df5631125254784d57446b80e12397 (diff) | |
download | external_llvm-fc0d7400bc44b52d0446933290dfeef2f9586293.zip external_llvm-fc0d7400bc44b52d0446933290dfeef2f9586293.tar.gz external_llvm-fc0d7400bc44b52d0446933290dfeef2f9586293.tar.bz2 |
Put back the initializing the targets in the disassembler API with a comment as
to why this is needed. This broke the darwin's otool(1) program. This change
was made in r144385.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150832 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/MC/MCDisassembler/Disassembler.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/MC/MCDisassembler/Disassembler.cpp b/lib/MC/MCDisassembler/Disassembler.cpp index dee576e..c6c67c5 100644 --- a/lib/MC/MCDisassembler/Disassembler.cpp +++ b/lib/MC/MCDisassembler/Disassembler.cpp @@ -18,6 +18,7 @@ #include "llvm/MC/MCRegisterInfo.h" #include "llvm/Support/MemoryObject.h" #include "llvm/Support/TargetRegistry.h" +#include "llvm/Support/TargetSelect.h" #include "llvm/Support/ErrorHandling.h" namespace llvm { @@ -35,6 +36,18 @@ using namespace llvm; LLVMDisasmContextRef LLVMCreateDisasm(const char *TripleName, void *DisInfo, int TagType, LLVMOpInfoCallback GetOpInfo, LLVMSymbolLookupCallback SymbolLookUp) { + // Initialize targets and assembly printers/parsers. + // FIXME: Clients are responsible for initializing the targets. And this + // would be done by calling routines in "llvm-c/Target.h" which are static + // line functions. But the current use of LLVMCreateDisasm() is to dynamically + // load libLTO with ldopen() and then lookup the symbols using dlsym(). + // And since these initialize routines are static that does not work which + // is why the call to them in this 'C' library API was added back. + llvm::InitializeAllTargetInfos(); + llvm::InitializeAllTargetMCs(); + llvm::InitializeAllAsmParsers(); + llvm::InitializeAllDisassemblers(); + // Get the target. std::string Error; const Target *TheTarget = TargetRegistry::lookupTarget(TripleName, Error); |