[llvm] r258818 - Reflect the MC/MCDisassembler split on the include/ level.

Benjamin Kramer via llvm-commits llvm-commits at lists.llvm.org
Tue Jan 26 08:44:39 PST 2016


Author: d0k
Date: Tue Jan 26 10:44:37 2016
New Revision: 258818

URL: http://llvm.org/viewvc/llvm-project?rev=258818&view=rev
Log:
Reflect the MC/MCDisassembler split on the include/ level.

No functional change, just moving code around.

Added:
    llvm/trunk/include/llvm/MC/MCDisassembler/
    llvm/trunk/include/llvm/MC/MCDisassembler/MCDisassembler.h
      - copied, changed from r258816, llvm/trunk/include/llvm/MC/MCDisassembler.h
    llvm/trunk/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h
      - copied, changed from r258816, llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h
    llvm/trunk/include/llvm/MC/MCDisassembler/MCRelocationInfo.h
      - copied, changed from r258816, llvm/trunk/include/llvm/MC/MCRelocationInfo.h
    llvm/trunk/include/llvm/MC/MCDisassembler/MCSymbolizer.h
      - copied, changed from r258816, llvm/trunk/include/llvm/MC/MCSymbolizer.h
    llvm/trunk/lib/MC/MCDisassembler/MCSymbolizer.cpp
      - copied, changed from r258816, llvm/trunk/lib/MC/MCSymbolizer.cpp
Removed:
    llvm/trunk/include/llvm/MC/MCDisassembler.h
    llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h
    llvm/trunk/include/llvm/MC/MCRelocationInfo.h
    llvm/trunk/include/llvm/MC/MCSymbolizer.h
    llvm/trunk/lib/MC/MCSymbolizer.cpp
Modified:
    llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
    llvm/trunk/lib/MC/CMakeLists.txt
    llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt
    llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp
    llvm/trunk/lib/MC/MCDisassembler/MCDisassembler.cpp
    llvm/trunk/lib/MC/MCDisassembler/MCExternalSymbolizer.cpp
    llvm/trunk/lib/MC/MCDisassembler/MCRelocationInfo.cpp
    llvm/trunk/lib/Target/AArch64/Disassembler/AArch64Disassembler.h
    llvm/trunk/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h
    llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
    llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
    llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp
    llvm/trunk/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp
    llvm/trunk/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
    llvm/trunk/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp
    llvm/trunk/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
    llvm/trunk/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp
    llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp
    llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.h
    llvm/trunk/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp
    llvm/trunk/tools/llvm-mc/Disassembler.cpp
    llvm/trunk/tools/llvm-objdump/MachODump.cpp
    llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
    llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp
    llvm/trunk/tools/sancov/sancov.cc

Removed: llvm/trunk/include/llvm/MC/MCDisassembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDisassembler.h?rev=258817&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCDisassembler.h (original)
+++ llvm/trunk/include/llvm/MC/MCDisassembler.h (removed)
@@ -1,113 +0,0 @@
-//===-- llvm/MC/MCDisassembler.h - Disassembler interface -------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#ifndef LLVM_MC_MCDISASSEMBLER_H
-#define LLVM_MC_MCDISASSEMBLER_H
-
-#include "llvm-c/Disassembler.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/MC/MCSymbolizer.h"
-#include "llvm/Support/DataTypes.h"
-
-namespace llvm {
-
-class MCInst;
-class MCSubtargetInfo;
-class raw_ostream;
-class MCContext;
-
-/// Superclass for all disassemblers. Consumes a memory region and provides an
-/// array of assembly instructions.
-class MCDisassembler {
-public:
-  /// Ternary decode status. Most backends will just use Fail and
-  /// Success, however some have a concept of an instruction with
-  /// understandable semantics but which is architecturally
-  /// incorrect. An example of this is ARM UNPREDICTABLE instructions
-  /// which are disassemblable but cause undefined behaviour.
-  ///
-  /// Because it makes sense to disassemble these instructions, there
-  /// is a "soft fail" failure mode that indicates the MCInst& is
-  /// valid but architecturally incorrect.
-  ///
-  /// The enum numbers are deliberately chosen such that reduction
-  /// from Success->SoftFail ->Fail can be done with a simple
-  /// bitwise-AND:
-  ///
-  ///   LEFT & TOP =  | Success       Unpredictable   Fail
-  ///   --------------+-----------------------------------
-  ///   Success       | Success       Unpredictable   Fail
-  ///   Unpredictable | Unpredictable Unpredictable   Fail
-  ///   Fail          | Fail          Fail            Fail
-  ///
-  /// An easy way of encoding this is as 0b11, 0b01, 0b00 for
-  /// Success, SoftFail, Fail respectively.
-  enum DecodeStatus {
-    Fail = 0,
-    SoftFail = 1,
-    Success = 3
-  };
-
-  MCDisassembler(const MCSubtargetInfo &STI, MCContext &Ctx)
-    : Ctx(Ctx), STI(STI), Symbolizer(), CommentStream(nullptr) {}
-
-  virtual ~MCDisassembler();
-
-  /// Returns the disassembly of a single instruction.
-  ///
-  /// \param Instr    - An MCInst to populate with the contents of the
-  ///                   instruction.
-  /// \param Size     - A value to populate with the size of the instruction, or
-  ///                   the number of bytes consumed while attempting to decode
-  ///                   an invalid instruction.
-  /// \param Address  - The address, in the memory space of region, of the first
-  ///                   byte of the instruction.
-  /// \param VStream  - The stream to print warnings and diagnostic messages on.
-  /// \param CStream  - The stream to print comments and annotations on.
-  /// \return         - MCDisassembler::Success if the instruction is valid,
-  ///                   MCDisassembler::SoftFail if the instruction was
-  ///                                            disassemblable but invalid,
-  ///                   MCDisassembler::Fail if the instruction was invalid.
-  virtual DecodeStatus getInstruction(MCInst &Instr, uint64_t &Size,
-                                      ArrayRef<uint8_t> Bytes, uint64_t Address,
-                                      raw_ostream &VStream,
-                                      raw_ostream &CStream) const = 0;
-
-private:
-  MCContext &Ctx;
-
-protected:
-  // Subtarget information, for instruction decoding predicates if required.
-  const MCSubtargetInfo &STI;
-  std::unique_ptr<MCSymbolizer> Symbolizer;
-
-public:
-  // Helpers around MCSymbolizer
-  bool tryAddingSymbolicOperand(MCInst &Inst,
-                                int64_t Value,
-                                uint64_t Address, bool IsBranch,
-                                uint64_t Offset, uint64_t InstSize) const;
-
-  void tryAddingPcLoadReferenceComment(int64_t Value, uint64_t Address) const;
-
-  /// Set \p Symzer as the current symbolizer.
-  /// This takes ownership of \p Symzer, and deletes the previously set one.
-  void setSymbolizer(std::unique_ptr<MCSymbolizer> Symzer);
-
-  MCContext& getContext() const { return Ctx; }
-
-  const MCSubtargetInfo& getSubtargetInfo() const { return STI; }
-
-  // Marked mutable because we cache it inside the disassembler, rather than
-  // having to pass it around as an argument through all the autogenerated code.
-  mutable raw_ostream *CommentStream;
-};
-
-} // namespace llvm
-
-#endif

Copied: llvm/trunk/include/llvm/MC/MCDisassembler/MCDisassembler.h (from r258816, llvm/trunk/include/llvm/MC/MCDisassembler.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDisassembler/MCDisassembler.h?p2=llvm/trunk/include/llvm/MC/MCDisassembler/MCDisassembler.h&p1=llvm/trunk/include/llvm/MC/MCDisassembler.h&r1=258816&r2=258818&rev=258818&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCDisassembler.h (original)
+++ llvm/trunk/include/llvm/MC/MCDisassembler/MCDisassembler.h Tue Jan 26 10:44:37 2016
@@ -6,12 +6,12 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_MC_MCDISASSEMBLER_H
-#define LLVM_MC_MCDISASSEMBLER_H
+#ifndef LLVM_MC_MCDISASSEMBLER_MCDISASSEMBLER_H
+#define LLVM_MC_MCDISASSEMBLER_MCDISASSEMBLER_H
 
 #include "llvm-c/Disassembler.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/MC/MCSymbolizer.h"
+#include "llvm/MC/MCDisassembler/MCSymbolizer.h"
 #include "llvm/Support/DataTypes.h"
 
 namespace llvm {

Copied: llvm/trunk/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h (from r258816, llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h?p2=llvm/trunk/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h&p1=llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h&r1=258816&r2=258818&rev=258818&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h (original)
+++ llvm/trunk/include/llvm/MC/MCDisassembler/MCExternalSymbolizer.h Tue Jan 26 10:44:37 2016
@@ -13,11 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_MC_MCEXTERNALSYMBOLIZER_H
-#define LLVM_MC_MCEXTERNALSYMBOLIZER_H
+#ifndef LLVM_MC_MCDISASSEMBLER_MCEXTERNALSYMBOLIZER_H
+#define LLVM_MC_MCDISASSEMBLER_MCEXTERNALSYMBOLIZER_H
 
 #include "llvm-c/Disassembler.h"
-#include "llvm/MC/MCSymbolizer.h"
+#include "llvm/MC/MCDisassembler/MCSymbolizer.h"
 #include <memory>
 
 namespace llvm {

Copied: llvm/trunk/include/llvm/MC/MCDisassembler/MCRelocationInfo.h (from r258816, llvm/trunk/include/llvm/MC/MCRelocationInfo.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDisassembler/MCRelocationInfo.h?p2=llvm/trunk/include/llvm/MC/MCDisassembler/MCRelocationInfo.h&p1=llvm/trunk/include/llvm/MC/MCRelocationInfo.h&r1=258816&r2=258818&rev=258818&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCRelocationInfo.h (original)
+++ llvm/trunk/include/llvm/MC/MCDisassembler/MCRelocationInfo.h Tue Jan 26 10:44:37 2016
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_MC_MCRELOCATIONINFO_H
-#define LLVM_MC_MCRELOCATIONINFO_H
+#ifndef LLVM_MC_MCDISASSEMBLER_MCRELOCATIONINFO_H
+#define LLVM_MC_MCDISASSEMBLER_MCRELOCATIONINFO_H
 
 #include "llvm/Support/Compiler.h"
 

Copied: llvm/trunk/include/llvm/MC/MCDisassembler/MCSymbolizer.h (from r258816, llvm/trunk/include/llvm/MC/MCSymbolizer.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDisassembler/MCSymbolizer.h?p2=llvm/trunk/include/llvm/MC/MCDisassembler/MCSymbolizer.h&p1=llvm/trunk/include/llvm/MC/MCSymbolizer.h&r1=258816&r2=258818&rev=258818&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCSymbolizer.h (original)
+++ llvm/trunk/include/llvm/MC/MCDisassembler/MCSymbolizer.h Tue Jan 26 10:44:37 2016
@@ -13,10 +13,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_MC_MCSYMBOLIZER_H
-#define LLVM_MC_MCSYMBOLIZER_H
+#ifndef LLVM_MC_MCDISASSEMBLER_MCSYMBOLIZER_H
+#define LLVM_MC_MCDISASSEMBLER_MCSYMBOLIZER_H
 
-#include "llvm/MC/MCRelocationInfo.h"
+#include "llvm/MC/MCDisassembler/MCRelocationInfo.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/DataTypes.h"
 #include <cassert>

Removed: llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h?rev=258817&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h (original)
+++ llvm/trunk/include/llvm/MC/MCExternalSymbolizer.h (removed)
@@ -1,58 +0,0 @@
-//===-- llvm/MC/MCExternalSymbolizer.h - ------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains the declaration of the MCExternalSymbolizer class, which
-// enables library users to provide callbacks (through the C API) to do the
-// symbolization externally.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCEXTERNALSYMBOLIZER_H
-#define LLVM_MC_MCEXTERNALSYMBOLIZER_H
-
-#include "llvm-c/Disassembler.h"
-#include "llvm/MC/MCSymbolizer.h"
-#include <memory>
-
-namespace llvm {
-
-/// \brief Symbolize using user-provided, C API, callbacks.
-///
-/// See llvm-c/Disassembler.h.
-class MCExternalSymbolizer : public MCSymbolizer {
-protected:
-  /// \name Hooks for symbolic disassembly via the public 'C' interface.
-  /// @{
-  /// The function to get the symbolic information for operands.
-  LLVMOpInfoCallback GetOpInfo;
-  /// The function to lookup a symbol name.
-  LLVMSymbolLookupCallback SymbolLookUp;
-  /// The pointer to the block of symbolic information for above call back.
-  void *DisInfo;
-  /// @}
-
-public:
-  MCExternalSymbolizer(MCContext &Ctx,
-                       std::unique_ptr<MCRelocationInfo> RelInfo,
-                       LLVMOpInfoCallback getOpInfo,
-                       LLVMSymbolLookupCallback symbolLookUp, void *disInfo)
-    : MCSymbolizer(Ctx, std::move(RelInfo)), GetOpInfo(getOpInfo),
-      SymbolLookUp(symbolLookUp), DisInfo(disInfo) {}
-
-  bool tryAddingSymbolicOperand(MCInst &MI, raw_ostream &CommentStream,
-                                int64_t Value, uint64_t Address, bool IsBranch,
-                                uint64_t Offset, uint64_t InstSize) override;
-  void tryAddingPcLoadReferenceComment(raw_ostream &CommentStream,
-                                       int64_t Value,
-                                       uint64_t Address) override;
-};
-
-}
-
-#endif

Removed: llvm/trunk/include/llvm/MC/MCRelocationInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCRelocationInfo.h?rev=258817&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCRelocationInfo.h (original)
+++ llvm/trunk/include/llvm/MC/MCRelocationInfo.h (removed)
@@ -1,51 +0,0 @@
-//==-- llvm/MC/MCRelocationInfo.h --------------------------------*- C++ -*-==//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the MCRelocationInfo class, which provides methods to
-// create MCExprs from relocations, either found in an object::ObjectFile
-// (object::RelocationRef), or provided through the C API.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCRELOCATIONINFO_H
-#define LLVM_MC_MCRELOCATIONINFO_H
-
-#include "llvm/Support/Compiler.h"
-
-namespace llvm {
-
-namespace object {
-class RelocationRef;
-}
-class MCExpr;
-class MCContext;
-
-/// \brief Create MCExprs from relocations found in an object file.
-class MCRelocationInfo {
-  MCRelocationInfo(const MCRelocationInfo &) = delete;
-  void operator=(const MCRelocationInfo &) = delete;
-
-protected:
-  MCContext &Ctx;
-
-public:
-  MCRelocationInfo(MCContext &Ctx);
-  virtual ~MCRelocationInfo();
-
-  /// \brief Create an MCExpr for the target-specific \p VariantKind.
-  /// The VariantKinds are defined in llvm-c/Disassembler.h.
-  /// Used by MCExternalSymbolizer.
-  /// \returns If possible, an MCExpr corresponding to VariantKind, else 0.
-  virtual const MCExpr *createExprForCAPIVariantKind(const MCExpr *SubExpr,
-                                                     unsigned VariantKind);
-};
-
-}
-
-#endif

Removed: llvm/trunk/include/llvm/MC/MCSymbolizer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCSymbolizer.h?rev=258817&view=auto
==============================================================================
--- llvm/trunk/include/llvm/MC/MCSymbolizer.h (original)
+++ llvm/trunk/include/llvm/MC/MCSymbolizer.h (removed)
@@ -1,85 +0,0 @@
-//===-- llvm/MC/MCSymbolizer.h - MCSymbolizer class -------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains the declaration of the MCSymbolizer class, which is used
-// to symbolize instructions decoded from an object, that is, transform their
-// immediate operands to MCExprs.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCSYMBOLIZER_H
-#define LLVM_MC_MCSYMBOLIZER_H
-
-#include "llvm/MC/MCRelocationInfo.h"
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/DataTypes.h"
-#include <cassert>
-#include <memory>
-
-namespace llvm {
-
-class MCContext;
-class MCInst;
-class raw_ostream;
-
-/// \brief Symbolize and annotate disassembled instructions.
-///
-/// For now this mimics the old symbolization logic (from both ARM and x86), that
-/// relied on user-provided (C API) callbacks to do the actual symbol lookup in
-/// the object file. This was moved to MCExternalSymbolizer.
-/// A better API would not rely on actually calling the two methods here from
-/// inside each disassembler, but would use the instr info to determine what
-/// operands are actually symbolizable, and in what way. I don't think this
-/// information exists right now.
-class MCSymbolizer {
-  MCSymbolizer(const MCSymbolizer &) = delete;
-  void operator=(const MCSymbolizer &) = delete;
-
-protected:
-  MCContext &Ctx;
-  std::unique_ptr<MCRelocationInfo> RelInfo;
-
-public:
-  /// \brief Construct an MCSymbolizer, taking ownership of \p RelInfo.
-  MCSymbolizer(MCContext &Ctx, std::unique_ptr<MCRelocationInfo> RelInfo)
-    : Ctx(Ctx), RelInfo(std::move(RelInfo)) {
-  }
-
-  virtual ~MCSymbolizer();
-
-  /// \brief Try to add a symbolic operand instead of \p Value to the MCInst.
-  ///
-  /// Instead of having a difficult to read immediate, a symbolic operand would
-  /// represent this immediate in a more understandable way, for instance as a
-  /// symbol or an offset from a symbol. Relocations can also be used to enrich
-  /// the symbolic expression.
-  /// \param Inst      - The MCInst where to insert the symbolic operand.
-  /// \param cStream   - Stream to print comments and annotations on.
-  /// \param Value     - Operand value, pc-adjusted by the caller if necessary.
-  /// \param Address   - Load address of the instruction.
-  /// \param IsBranch  - Is the instruction a branch?
-  /// \param Offset    - Byte offset of the operand inside the inst.
-  /// \param InstSize  - Size of the instruction in bytes.
-  /// \return Whether a symbolic operand was added.
-  virtual bool tryAddingSymbolicOperand(MCInst &Inst, raw_ostream &cStream,
-                                        int64_t Value, uint64_t Address,
-                                        bool IsBranch, uint64_t Offset,
-                                        uint64_t InstSize) = 0;
-
-  /// \brief Try to add a comment on the PC-relative load.
-  /// For instance, in Mach-O, this is used to add annotations to instructions
-  /// that use C string literals, as found in __cstring.
-  virtual void tryAddingPcLoadReferenceComment(raw_ostream &cStream,
-                                               int64_t Value,
-                                               uint64_t Address) = 0;
-};
-
-}
-
-#endif

Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp Tue Jan 26 10:44:37 2016
@@ -12,7 +12,7 @@
 #include "RuntimeDyldImpl.h"
 #include "llvm/ExecutionEngine/RuntimeDyldChecker.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/Support/Path.h"
 #include <cctype>

Modified: llvm/trunk/lib/MC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/CMakeLists.txt?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/CMakeLists.txt (original)
+++ llvm/trunk/lib/MC/CMakeLists.txt Tue Jan 26 10:44:37 2016
@@ -38,7 +38,6 @@ add_llvm_library(LLVMMC
   MCSubtargetInfo.cpp
   MCSymbol.cpp
   MCSymbolELF.cpp
-  MCSymbolizer.cpp
   MCTargetOptions.cpp
   MCValue.cpp
   MCWin64EH.cpp

Modified: llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt (original)
+++ llvm/trunk/lib/MC/MCDisassembler/CMakeLists.txt Tue Jan 26 10:44:37 2016
@@ -1,6 +1,7 @@
 add_llvm_library(LLVMMCDisassembler
   Disassembler.cpp
-  MCRelocationInfo.cpp
-  MCExternalSymbolizer.cpp
   MCDisassembler.cpp
+  MCExternalSymbolizer.cpp
+  MCRelocationInfo.cpp
+  MCSymbolizer.cpp
   )

Modified: llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/Disassembler.cpp Tue Jan 26 10:44:37 2016
@@ -11,14 +11,14 @@
 #include "llvm-c/Disassembler.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCRelocationInfo.h"
+#include "llvm/MC/MCDisassembler/MCSymbolizer.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCRelocationInfo.h"
 #include "llvm/MC/MCSubtargetInfo.h"
-#include "llvm/MC/MCSymbolizer.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/TargetRegistry.h"

Modified: llvm/trunk/lib/MC/MCDisassembler/MCDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/MCDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/MCDisassembler.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/MCDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCDisassembler.h"
-#include "llvm/MC/MCExternalSymbolizer.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCExternalSymbolizer.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;

Modified: llvm/trunk/lib/MC/MCDisassembler/MCExternalSymbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/MCExternalSymbolizer.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/MCExternalSymbolizer.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/MCExternalSymbolizer.cpp Tue Jan 26 10:44:37 2016
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCExternalSymbolizer.h"
+#include "llvm/MC/MCDisassembler/MCExternalSymbolizer.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"

Modified: llvm/trunk/lib/MC/MCDisassembler/MCRelocationInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/MCRelocationInfo.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/MCRelocationInfo.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/MCRelocationInfo.cpp Tue Jan 26 10:44:37 2016
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCRelocationInfo.h"
+#include "llvm/MC/MCDisassembler/MCRelocationInfo.h"
 #include "llvm-c/Disassembler.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/TargetRegistry.h"

Copied: llvm/trunk/lib/MC/MCDisassembler/MCSymbolizer.cpp (from r258816, llvm/trunk/lib/MC/MCSymbolizer.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/MCSymbolizer.cpp?p2=llvm/trunk/lib/MC/MCDisassembler/MCSymbolizer.cpp&p1=llvm/trunk/lib/MC/MCSymbolizer.cpp&r1=258816&r2=258818&rev=258818&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCSymbolizer.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/MCSymbolizer.cpp Tue Jan 26 10:44:37 2016
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCSymbolizer.h"
+#include "llvm/MC/MCDisassembler/MCSymbolizer.h"
 
 using namespace llvm;
 

Removed: llvm/trunk/lib/MC/MCSymbolizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCSymbolizer.cpp?rev=258817&view=auto
==============================================================================
--- llvm/trunk/lib/MC/MCSymbolizer.cpp (original)
+++ llvm/trunk/lib/MC/MCSymbolizer.cpp (removed)
@@ -1,15 +0,0 @@
-//===-- llvm/MC/MCSymbolizer.cpp - MCSymbolizer class -----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/MC/MCSymbolizer.h"
-
-using namespace llvm;
-
-MCSymbolizer::~MCSymbolizer() {
-}

Modified: llvm/trunk/lib/Target/AArch64/Disassembler/AArch64Disassembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/Disassembler/AArch64Disassembler.h?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/Disassembler/AArch64Disassembler.h (original)
+++ llvm/trunk/lib/Target/AArch64/Disassembler/AArch64Disassembler.h Tue Jan 26 10:44:37 2016
@@ -13,7 +13,7 @@
 #ifndef LLVM_LIB_TARGET_AARCH64_DISASSEMBLER_AARCH64DISASSEMBLER_H
 #define LLVM_LIB_TARGET_AARCH64_DISASSEMBLER_AARCH64DISASSEMBLER_H
 
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 
 namespace llvm {
 

Modified: llvm/trunk/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h (original)
+++ llvm/trunk/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.h Tue Jan 26 10:44:37 2016
@@ -14,7 +14,7 @@
 #ifndef LLVM_LIB_TARGET_AARCH64_DISASSEMBLER_AARCH64EXTERNALSYMBOLIZER_H
 #define LLVM_LIB_TARGET_AARCH64_DISASSEMBLER_AARCH64EXTERNALSYMBOLIZER_H
 
-#include "llvm/MC/MCExternalSymbolizer.h"
+#include "llvm/MC/MCDisassembler/MCExternalSymbolizer.h"
 
 namespace llvm {
 

Modified: llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Tue Jan 26 10:44:37 2016
@@ -20,7 +20,7 @@
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCAssembler.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCELFStreamer.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"

Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "MCTargetDesc/ARMAddressingModes.h"
 #include "MCTargetDesc/ARMBaseInfo.h"
 #include "MCTargetDesc/ARMMCExpr.h"

Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp Tue Jan 26 10:44:37 2016
@@ -12,7 +12,7 @@
 #include "llvm-c/Disassembler.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCExpr.h"
-#include "llvm/MC/MCRelocationInfo.h"
+#include "llvm/MC/MCDisassembler/MCRelocationInfo.h"
 
 using namespace llvm;
 using namespace object;

Modified: llvm/trunk/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/Disassembler/HexagonDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -16,7 +16,7 @@
 #include "MCTargetDesc/HexagonMCInstrInfo.h"
 #include "MCTargetDesc/HexagonInstPrinter.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCFixedLenDisassembler.h"

Modified: llvm/trunk/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/Disassembler/MipsDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/Disassembler/MipsDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/Mips/Disassembler/MipsDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -15,7 +15,7 @@
 #include "MipsRegisterInfo.h"
 #include "MipsSubtarget.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCFixedLenDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSubtargetInfo.h"

Modified: llvm/trunk/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PPC.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCFixedLenDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSubtargetInfo.h"

Modified: llvm/trunk/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -14,7 +14,7 @@
 #include "Sparc.h"
 #include "SparcRegisterInfo.h"
 #include "SparcSubtarget.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCFixedLenDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCContext.h"

Modified: llvm/trunk/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/Disassembler/SystemZDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SystemZ.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCFixedLenDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSubtargetInfo.h"

Modified: llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp (original)
+++ llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.cpp Tue Jan 26 10:44:37 2016
@@ -17,7 +17,7 @@
 #include "X86Disassembler.h"
 #include "X86DisassemblerDecoder.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstrInfo.h"

Modified: llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.h?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.h (original)
+++ llvm/trunk/lib/Target/X86/Disassembler/X86Disassembler.h Tue Jan 26 10:44:37 2016
@@ -75,7 +75,7 @@
 #define LLVM_LIB_TARGET_X86_DISASSEMBLER_X86DISASSEMBLER_H
 
 #include "X86DisassemblerDecoderCommon.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 
 namespace llvm {
 

Modified: llvm/trunk/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp Tue Jan 26 10:44:37 2016
@@ -15,7 +15,7 @@
 #include "XCore.h"
 #include "XCoreRegisterInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCFixedLenDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCSubtargetInfo.h"

Modified: llvm/trunk/tools/llvm-mc/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Tue Jan 26 10:44:37 2016
@@ -16,7 +16,7 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/MC/MCStreamer.h"

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Tue Jan 26 10:44:37 2016
@@ -22,7 +22,7 @@
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrDesc.h"

Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Tue Jan 26 10:44:37 2016
@@ -25,18 +25,18 @@
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCRelocationInfo.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrAnalysis.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCRelocationInfo.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Object/Archive.h"
-#include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/COFF.h"
+#include "llvm/Object/ELFObjectFile.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/Casting.h"

Modified: llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp (original)
+++ llvm/trunk/tools/llvm-rtdyld/llvm-rtdyld.cpp Tue Jan 26 10:44:37 2016
@@ -19,7 +19,7 @@
 #include "llvm/ExecutionEngine/RuntimeDyldChecker.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"

Modified: llvm/trunk/tools/sancov/sancov.cc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/sancov/sancov.cc?rev=258818&r1=258817&r2=258818&view=diff
==============================================================================
--- llvm/trunk/tools/sancov/sancov.cc (original)
+++ llvm/trunk/tools/sancov/sancov.cc Tue Jan 26 10:44:37 2016
@@ -14,7 +14,7 @@
 #include "llvm/DebugInfo/Symbolize/Symbolize.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCDisassembler.h"
+#include "llvm/MC/MCDisassembler/MCDisassembler.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrAnalysis.h"




More information about the llvm-commits mailing list