From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 29 Nov 2011 00:06:58 +0000 (+0000)
Subject: edis: Don't do the target initialization in EDGetDisassembler, this is contrary
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=36e1ac7fffc2a0035ce61750efd6ee7d59100575;p=oota-llvm.git

edis: Don't do the target initialization in EDGetDisassembler, this is contrary
to the way we currently expect target selection to work -- clients are supposed
to have control over what targets are available.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145331 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/edis/EDMain.cpp b/tools/edis/EDMain.cpp
index 14a17d66e63..3bf2585a21a 100644
--- a/tools/edis/EDMain.cpp
+++ b/tools/edis/EDMain.cpp
@@ -17,23 +17,12 @@
 #include "../../lib/MC/MCDisassembler/EDInst.h"
 #include "../../lib/MC/MCDisassembler/EDOperand.h"
 #include "../../lib/MC/MCDisassembler/EDToken.h"
-#include "llvm/Support/TargetSelect.h"
 #include "llvm-c/EnhancedDisassembly.h"
 using namespace llvm;
 
 int EDGetDisassembler(EDDisassemblerRef *disassembler,
                       const char *triple,
                       EDAssemblySyntax_t syntax) {
-  static bool initialized;
-  if (!initialized) {
-    // Initialize targets and assembly printers/parsers.
-    llvm::InitializeAllTargetInfos();
-    llvm::InitializeAllTargetMCs();
-    llvm::InitializeAllAsmParsers();
-    llvm::InitializeAllDisassemblers();
-    initialized = true;
-  }
-
   EDDisassembler::AssemblySyntax Syntax;
   switch (syntax) {
   default: assert(0 && "Unknown assembly syntax!");