Merge with LLVM upstream r144606 (Nov 15th 2011)

Conflicts:
	Makefile.rules
	configure
	docs/ReleaseNotes.html
	lib/Analysis/ScalarEvolution.cpp
	lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
	lib/CodeGen/ExecutionDepsFix.cpp
	lib/CodeGen/MachineBlockPlacement.cpp
	lib/CodeGen/MachineBranchProbabilityInfo.cpp
	lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
	lib/ExecutionEngine/JIT/LLVMBuild.txt
	lib/MC/LLVMBuild.txt
	lib/MC/MCDisassembler/LLVMBuild.txt
	lib/MC/MCDwarf.cpp
	lib/Object/LLVMBuild.txt
	lib/Target/ARM/ARMExpandPseudoInsts.cpp
	lib/Target/ARM/ARMFastISel.cpp
	lib/Target/ARM/ARMInstrInfo.td
	lib/Target/ARM/AsmParser/ARMAsmParser.cpp
	lib/Target/ARM/Disassembler/ARMDisassembler.cpp
	lib/Target/ARM/Disassembler/LLVMBuild.txt
	lib/Target/ARM/TargetInfo/LLVMBuild.txt
	lib/Target/CBackend/TargetInfo/LLVMBuild.txt
	lib/Target/CellSPU/MCTargetDesc/LLVMBuild.txt
	lib/Target/CellSPU/TargetInfo/LLVMBuild.txt
	lib/Target/CppBackend/TargetInfo/LLVMBuild.txt
	lib/Target/LLVMBuild.txt
	lib/Target/MBlaze/Disassembler/LLVMBuild.txt
	lib/Target/MBlaze/TargetInfo/LLVMBuild.txt
	lib/Target/MSP430/MCTargetDesc/LLVMBuild.txt
	lib/Target/MSP430/TargetInfo/LLVMBuild.txt
	lib/Target/Mips/CMakeLists.txt
	lib/Target/Mips/InstPrinter/MipsInstPrinter.cpp
	lib/Target/Mips/Mips64InstrInfo.td
	lib/Target/Mips/MipsAsmPrinter.cpp
	lib/Target/Mips/MipsISelLowering.cpp
	lib/Target/Mips/MipsMCInstLower.cpp
	lib/Target/Mips/TargetInfo/LLVMBuild.txt
	lib/Target/PTX/LLVMBuild.txt
	lib/Target/PTX/PTXAsmPrinter.cpp
	lib/Target/PTX/TargetInfo/LLVMBuild.txt
	lib/Target/PowerPC/TargetInfo/LLVMBuild.txt
	lib/Target/Sparc/TargetInfo/LLVMBuild.txt
	lib/Target/X86/TargetInfo/LLVMBuild.txt
	lib/Target/X86/X86ISelLowering.cpp
	lib/Target/X86/X86InstrSSE.td
	lib/Target/XCore/MCTargetDesc/LLVMBuild.txt
	lib/Target/XCore/TargetInfo/LLVMBuild.txt
	lib/Transforms/IPO/LLVMBuild.txt
	lib/Transforms/Utils/LLVMBuild.txt
	test/CodeGen/ARM/2011-10-26-memset-with-neon.ll
	test/CodeGen/ARM/2011-11-07-PromoteVectorLoadStore.ll
	test/CodeGen/ARM/fast-isel-cmp-imm.ll
	test/CodeGen/ARM/fast-isel-ldrh-strh-arm.ll
	test/CodeGen/CellSPU/call_indirect.ll
	test/CodeGen/X86/avx2-logic.ll
	test/CodeGen/X86/block-placement.ll
	test/CodeGen/X86/sse-domains.ll
	test/CodeGen/X86/sse3.ll
	test/CodeGen/X86/vec_shuffle-39.ll
	test/MC/ARM/neon-vld-encoding.s
	test/MC/ARM/neon-vst-encoding.s
	tools/llvm-config-2/llvm-config.cpp
	utils/TableGen/LLVMBuild.txt

Change-Id: I70f454db6fc79d7799f56d0f6f2eb7b99561c504

5 files changed, 1 insertions, 49 deletions

diff --git a/lib/MC/MCDisassembler/CMakeLists.txt b/lib/MC/MCDisassembler/CMakeLists.txt
index 4debb28..5cf5f1b 100644
--- a/lib/MC/MCDisassembler/CMakeLists.txt
+++ b/lib/MC/MCDisassembler/CMakeLists.txt
@@ -10,21 +10,4 @@ add_llvm_library_dependencies(LLVMMCDisassembler
   LLVMMC
   LLVMMCParser
   LLVMSupport
-  LLVMTarget
   )
-
-foreach(t ${LLVM_TARGETS_TO_BUILD})
-  set(td ${LLVM_MAIN_SRC_DIR}/lib/Target/${t})
-  if(EXISTS ${td}/TargetInfo/CMakeLists.txt)
-    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Info")
-  endif()
-  if(EXISTS ${td}/MCTargetDesc/CMakeLists.txt)
-    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Desc")
-  endif()
-  if(EXISTS ${td}/AsmParser/CMakeLists.txt)
-    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}AsmParser")
-  endif()
-  if(EXISTS ${td}/Disassembler/CMakeLists.txt)
-    add_llvm_library_dependencies(LLVMMCDisassembler "LLVM${t}Disassembler")
-  endif()
-endforeach(t)
diff --git a/lib/MC/MCDisassembler/Disassembler.cpp b/lib/MC/MCDisassembler/Disassembler.cpp
index 16e66dc..f156760 100644
--- a/lib/MC/MCDisassembler/Disassembler.cpp
+++ b/lib/MC/MCDisassembler/Disassembler.cpp
@@ -18,7 +18,6 @@
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Support/MemoryObject.h"
 #include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
 
 namespace llvm {
 class Target;
@@ -35,12 +34,6 @@ using namespace llvm;
 LLVMDisasmContextRef LLVMCreateDisasm(const char *TripleName, void *DisInfo,
                                       int TagType, LLVMOpInfoCallback GetOpInfo,
                                       LLVMSymbolLookupCallback SymbolLookUp) {
-  // Initialize targets and assembly printers/parsers.
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllAsmParsers();
-  llvm::InitializeAllDisassemblers();
-
   // Get the target.
   std::string Error;
   const Target *TheTarget = TargetRegistry::lookupTarget(TripleName, Error);
diff --git a/lib/MC/MCDisassembler/EDDisassembler.cpp b/lib/MC/MCDisassembler/EDDisassembler.cpp
index 5633cb1..3540334 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -34,10 +34,8 @@
 #include "llvm/Support/MemoryObject.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
 using namespace llvm;
 
-bool EDDisassembler::sInitialized = false;
 EDDisassembler::DisassemblerMap_t EDDisassembler::sDisassemblers;
 
 struct TripleMap {
@@ -98,20 +96,6 @@ static int getLLVMSyntaxVariant(Triple::ArchType arch,
   }
 }
 
-void EDDisassembler::initialize() {
-  if (sInitialized)
-    return;
-  
-  sInitialized = true;
-  
-  InitializeAllTargetInfos();
-  InitializeAllTargetMCs();
-  InitializeAllAsmParsers();
-  InitializeAllDisassemblers();
-}
-
-#undef BRINGUP_TARGET
-
 EDDisassembler *EDDisassembler::getDisassembler(Triple::ArchType arch,
                                                 AssemblySyntax syntax) {
   CPUKey key;
diff --git a/lib/MC/MCDisassembler/EDDisassembler.h b/lib/MC/MCDisassembler/EDDisassembler.h
index 38c2203..97c2d1f 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.h
+++ b/lib/MC/MCDisassembler/EDDisassembler.h
@@ -94,8 +94,6 @@ struct EDDisassembler {
   
   typedef std::map<CPUKey, EDDisassembler*> DisassemblerMap_t;
   
-  /// True if the disassembler registry has been initialized; false if not
-  static bool sInitialized;
   /// A map from disassembler specifications to disassemblers.  Populated
   ///   lazily.
   static DisassemblerMap_t sDisassemblers;
@@ -116,9 +114,6 @@ struct EDDisassembler {
   static EDDisassembler *getDisassembler(llvm::StringRef str,
                                          AssemblySyntax syntax);
   
-  /// initialize - Initializes the disassembler registry and the LLVM backend
-  static void initialize();
-  
   ////////////////////////
   // Per-object members //
   ////////////////////////
diff --git a/lib/MC/MCDisassembler/LLVMBuild.txt b/lib/MC/MCDisassembler/LLVMBuild.txt
index 7b8c7ff..d73c6ad 100644
--- a/lib/MC/MCDisassembler/LLVMBuild.txt
+++ b/lib/MC/MCDisassembler/LLVMBuild.txt
@@ -19,7 +19,4 @@
 type = Library
 name = MCDisassembler
 parent = MC
-; FIXME: This is really horrible, MCDisassembler should not in and of its own
-; accord depending on every target.
-required_libraries = all-targets MC MCParser Support
-
+required_libraries = MC MCParser Support