diff options
20 files changed, 41 insertions, 36 deletions
diff --git a/llvm/include/llvm/MC/MCAtom.h b/llvm/include/llvm/MC/MCAnalysis/MCAtom.h index e9d0fbacc1e..e9d0fbacc1e 100644 --- a/llvm/include/llvm/MC/MCAtom.h +++ b/llvm/include/llvm/MC/MCAnalysis/MCAtom.h diff --git a/llvm/include/llvm/MC/MCFunction.h b/llvm/include/llvm/MC/MCAnalysis/MCFunction.h index bfa470b5f42..bfa470b5f42 100644 --- a/llvm/include/llvm/MC/MCFunction.h +++ b/llvm/include/llvm/MC/MCAnalysis/MCFunction.h diff --git a/llvm/include/llvm/MC/MCModule.h b/llvm/include/llvm/MC/MCAnalysis/MCModule.h index aa389cbb0b2..aa389cbb0b2 100644 --- a/llvm/include/llvm/MC/MCModule.h +++ b/llvm/include/llvm/MC/MCAnalysis/MCModule.h diff --git a/llvm/include/llvm/MC/MCModuleYAML.h b/llvm/include/llvm/MC/MCAnalysis/MCModuleYAML.h index c4ae829535c..13b58a7ad64 100644 --- a/llvm/include/llvm/MC/MCModuleYAML.h +++ b/llvm/include/llvm/MC/MCAnalysis/MCModuleYAML.h @@ -17,7 +17,7 @@ #define LLVM_MC_MCMODULEYAML_H #include "llvm/ADT/StringRef.h" -#include "llvm/MC/MCModule.h" +#include "llvm/MC/MCAnalysis/MCModule.h" #include "llvm/Support/raw_ostream.h" namespace llvm { diff --git a/llvm/lib/MC/CMakeLists.txt b/llvm/lib/MC/CMakeLists.txt index 78bd8c4ba14..f62894cab39 100644 --- a/llvm/lib/MC/CMakeLists.txt +++ b/llvm/lib/MC/CMakeLists.txt @@ -8,7 +8,6 @@ add_llvm_library(LLVMMC MCAsmInfoELF.cpp MCAsmStreamer.cpp MCAssembler.cpp - MCAtom.cpp MCCodeEmitter.cpp MCCodeGenInfo.cpp MCContext.cpp @@ -17,7 +16,6 @@ add_llvm_library(LLVMMC MCELF.cpp MCELFObjectTargetWriter.cpp MCELFStreamer.cpp - MCFunction.cpp MCExpr.cpp MCExternalSymbolizer.cpp MCInst.cpp @@ -27,13 +25,9 @@ add_llvm_library(LLVMMC MCLinkerOptimizationHint.cpp MCMachOStreamer.cpp MCMachObjectTargetWriter.cpp - MCModule.cpp - MCModuleYAML.cpp MCNullStreamer.cpp MCObjectFileInfo.cpp - MCObjectDisassembler.cpp MCObjectStreamer.cpp - MCObjectSymbolizer.cpp MCObjectWriter.cpp MCRegisterInfo.cpp MCRelocationInfo.cpp @@ -54,5 +48,6 @@ add_llvm_library(LLVMMC WinCOFFStreamer.cpp ) +add_subdirectory(MCAnalysis) add_subdirectory(MCParser) add_subdirectory(MCDisassembler) diff --git a/llvm/lib/MC/LLVMBuild.txt b/llvm/lib/MC/LLVMBuild.txt index f35dbe4d5d3..da9995d6c57 100644 --- a/llvm/lib/MC/LLVMBuild.txt +++ b/llvm/lib/MC/LLVMBuild.txt @@ -16,7 +16,7 @@ ;===------------------------------------------------------------------------===; [common] -subdirectories = MCDisassembler MCParser +subdirectories = MCAnalysis MCDisassembler MCParser [component_0] type = Library diff --git a/llvm/lib/MC/MCAnalysis/CMakeLists.txt b/llvm/lib/MC/MCAnalysis/CMakeLists.txt new file mode 100644 index 00000000000..81eae2dfb15 --- /dev/null +++ b/llvm/lib/MC/MCAnalysis/CMakeLists.txt @@ -0,0 +1,8 @@ +add_llvm_library(LLVMMCAnalysis + MCAtom.cpp + MCFunction.cpp + MCModule.cpp + MCModuleYAML.cpp + MCObjectDisassembler.cpp + MCObjectSymbolizer.cpp +) diff --git a/llvm/lib/MC/MCAnalysis/LLVMBuild.txt b/llvm/lib/MC/MCAnalysis/LLVMBuild.txt new file mode 100644 index 00000000000..1b58fec6cc4 --- /dev/null +++ b/llvm/lib/MC/MCAnalysis/LLVMBuild.txt @@ -0,0 +1,5 @@ +[component_0] +type = Library +name = MCAnalysis +parent = Libraries +required_libraries = MC Object Support diff --git a/llvm/lib/MC/MCAtom.cpp b/llvm/lib/MC/MCAnalysis/MCAtom.cpp index bc353cdcf65..82056eed1ea 100644 --- a/llvm/lib/MC/MCAtom.cpp +++ b/llvm/lib/MC/MCAnalysis/MCAtom.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "llvm/MC/MCAtom.h" -#include "llvm/MC/MCModule.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCModule.h" #include "llvm/Support/ErrorHandling.h" #include <iterator> diff --git a/llvm/lib/MC/MCFunction.cpp b/llvm/lib/MC/MCAnalysis/MCFunction.cpp index 1ddc2505f07..4e09d1a52da 100644 --- a/llvm/lib/MC/MCFunction.cpp +++ b/llvm/lib/MC/MCAnalysis/MCFunction.cpp @@ -7,9 +7,9 @@ // //===----------------------------------------------------------------------===// -#include "llvm/MC/MCFunction.h" -#include "llvm/MC/MCAtom.h" -#include "llvm/MC/MCModule.h" +#include "llvm/MC/MCAnalysis/MCFunction.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCModule.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/MC/MCModule.cpp b/llvm/lib/MC/MCAnalysis/MCModule.cpp index 3ed735689d7..7512299c9e0 100644 --- a/llvm/lib/MC/MCModule.cpp +++ b/llvm/lib/MC/MCAnalysis/MCModule.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// +#include "llvm/MC/MCAnalysis/MCModule.h" #include "llvm/ADT/STLExtras.h" -#include "llvm/MC/MCModule.h" -#include "llvm/MC/MCAtom.h" -#include "llvm/MC/MCFunction.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCFunction.h" #include <algorithm> using namespace llvm; diff --git a/llvm/lib/MC/MCModuleYAML.cpp b/llvm/lib/MC/MCAnalysis/MCModuleYAML.cpp index f6b7431eb3b..c51c62e928d 100644 --- a/llvm/lib/MC/MCModuleYAML.cpp +++ b/llvm/lib/MC/MCAnalysis/MCModuleYAML.cpp @@ -11,10 +11,10 @@ // //===----------------------------------------------------------------------===// -#include "llvm/MC/MCModuleYAML.h" +#include "llvm/MC/MCAnalysis/MCModuleYAML.h" #include "llvm/ADT/StringMap.h" -#include "llvm/MC/MCAtom.h" -#include "llvm/MC/MCFunction.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCFunction.h" #include "llvm/MC/MCInstrInfo.h" #include "llvm/MC/MCRegisterInfo.h" #include "llvm/Object/YAML.h" diff --git a/llvm/lib/MC/MCObjectDisassembler.cpp b/llvm/lib/MC/MCAnalysis/MCObjectDisassembler.cpp index 8a258cb0909..0f789ff040f 100644 --- a/llvm/lib/MC/MCObjectDisassembler.cpp +++ b/llvm/lib/MC/MCAnalysis/MCObjectDisassembler.cpp @@ -13,11 +13,11 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" -#include "llvm/MC/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCFunction.h" +#include "llvm/MC/MCAnalysis/MCModule.h" #include "llvm/MC/MCDisassembler.h" -#include "llvm/MC/MCFunction.h" #include "llvm/MC/MCInstrAnalysis.h" -#include "llvm/MC/MCModule.h" #include "llvm/MC/MCObjectSymbolizer.h" #include "llvm/Object/MachO.h" #include "llvm/Object/ObjectFile.h" diff --git a/llvm/lib/MC/MCObjectSymbolizer.cpp b/llvm/lib/MC/MCAnalysis/MCObjectSymbolizer.cpp index b14959689d9..b14959689d9 100644 --- a/llvm/lib/MC/MCObjectSymbolizer.cpp +++ b/llvm/lib/MC/MCAnalysis/MCObjectSymbolizer.cpp diff --git a/llvm/tools/llvm-objdump/CMakeLists.txt b/llvm/tools/llvm-objdump/CMakeLists.txt index 413cb9bb1f0..d63602bd018 100644 --- a/llvm/tools/llvm-objdump/CMakeLists.txt +++ b/llvm/tools/llvm-objdump/CMakeLists.txt @@ -2,6 +2,7 @@ set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} DebugInfo MC + MCAnalysis Object Support ) diff --git a/llvm/tools/llvm-objdump/LLVMBuild.txt b/llvm/tools/llvm-objdump/LLVMBuild.txt index d16c501a6cc..d9c09b60034 100644 --- a/llvm/tools/llvm-objdump/LLVMBuild.txt +++ b/llvm/tools/llvm-objdump/LLVMBuild.txt @@ -19,4 +19,4 @@ type = Tool name = llvm-objdump parent = Tools -required_libraries = DebugInfo MC MCDisassembler MCParser Object all-targets +required_libraries = DebugInfo MC MCAnalysis MCDisassembler MCParser Object all-targets diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index d98691b4b04..309bf2369a8 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -20,17 +20,17 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/Triple.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCFunction.h" +#include "llvm/MC/MCAnalysis/MCModule.h" +#include "llvm/MC/MCAnalysis/MCModuleYAML.h" #include "llvm/MC/MCAsmInfo.h" -#include "llvm/MC/MCAtom.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCDisassembler.h" -#include "llvm/MC/MCFunction.h" #include "llvm/MC/MCInst.h" #include "llvm/MC/MCInstPrinter.h" #include "llvm/MC/MCInstrAnalysis.h" #include "llvm/MC/MCInstrInfo.h" -#include "llvm/MC/MCModule.h" -#include "llvm/MC/MCModuleYAML.h" #include "llvm/MC/MCObjectDisassembler.h" #include "llvm/MC/MCObjectFileInfo.h" #include "llvm/MC/MCObjectSymbolizer.h" diff --git a/llvm/unittests/MC/CMakeLists.txt b/llvm/unittests/MC/CMakeLists.txt index 0e4782c83f4..496056ecf59 100644 --- a/llvm/unittests/MC/CMakeLists.txt +++ b/llvm/unittests/MC/CMakeLists.txt @@ -1,11 +1,7 @@ set(LLVM_LINK_COMPONENTS - MC - ) - -set(MCSources - MCAtomTest.cpp + MCAnalysis ) add_llvm_unittest(MCTests - ${MCSources} + MCAtomTest.cpp ) diff --git a/llvm/unittests/MC/MCAtomTest.cpp b/llvm/unittests/MC/MCAtomTest.cpp index 17b056cd2de..16228b521f4 100644 --- a/llvm/unittests/MC/MCAtomTest.cpp +++ b/llvm/unittests/MC/MCAtomTest.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "llvm/MC/MCAtom.h" -#include "llvm/MC/MCModule.h" +#include "llvm/MC/MCAnalysis/MCAtom.h" +#include "llvm/MC/MCAnalysis/MCModule.h" #include "gtest/gtest.h" namespace llvm { diff --git a/llvm/unittests/MC/Makefile b/llvm/unittests/MC/Makefile index 4c25697d28d..07a608e65a3 100644 --- a/llvm/unittests/MC/Makefile +++ b/llvm/unittests/MC/Makefile @@ -9,7 +9,7 @@ LEVEL = ../.. TESTNAME = MC -LINK_COMPONENTS := MC +LINK_COMPONENTS := MCAnalysis include $(LEVEL)/Makefile.config include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest |
