Fixed library dependencies between the X86 disassembler and
X86 codegen that were causing circular symbol dependencies.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91871 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/Disassembler/X86Disassembler.cpp b/lib/Target/X86/Disassembler/X86Disassembler.cpp
index 4bb9075..17dbd7f 100644
--- a/lib/Target/X86/Disassembler/X86Disassembler.cpp
+++ b/lib/Target/X86/Disassembler/X86Disassembler.cpp
@@ -14,11 +14,8 @@
//
//===----------------------------------------------------------------------===//
-#if 0
-
#include "X86Disassembler.h"
#include "X86DisassemblerDecoder.h"
-#include "X86InstrInfo.h"
#include "llvm/MC/MCDisassembler.h"
#include "llvm/MC/MCDisassembler.h"
@@ -27,6 +24,9 @@
#include "llvm/Support/MemoryObject.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
+
+#include "../X86GenRegisterNames.inc"
+
using namespace llvm;
using namespace llvm::X86Disassembler;
@@ -46,6 +46,8 @@
};
}
+extern Target TheX86_32Target, TheX86_64Target;
+
}
static void translateInstruction(MCInst &target,
@@ -461,8 +463,3 @@
TargetRegistry::RegisterMCDisassembler(TheX86_64Target,
createX86_64Disassembler);
}
-
-#endif
-
-extern "C" void LLVMInitializeX86Disassembler() {
-}