From ff06261aed6d796ab0b2bb7b5d5ac8684fd5bb5f Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Thu, 20 Nov 2014 21:56:35 +0000 Subject: [PATCH] [Hexagon] [NFC] Merging InstPrinter directory in to MCTargetDesc since they have a circular dependency. llvm-svn: 222458 --- llvm/lib/Target/Hexagon/CMakeLists.txt | 1 - llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp | 2 +- llvm/lib/Target/Hexagon/InstPrinter/CMakeLists.txt | 3 --- llvm/lib/Target/Hexagon/InstPrinter/LLVMBuild.txt | 23 ---------------------- llvm/lib/Target/Hexagon/InstPrinter/Makefile | 15 -------------- llvm/lib/Target/Hexagon/LLVMBuild.txt | 4 ++-- .../lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt | 1 + .../HexagonInstPrinter.cpp | 0 .../HexagonInstPrinter.h | 0 .../Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp | 2 +- llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt | 2 +- 11 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 llvm/lib/Target/Hexagon/InstPrinter/CMakeLists.txt delete mode 100644 llvm/lib/Target/Hexagon/InstPrinter/LLVMBuild.txt delete mode 100644 llvm/lib/Target/Hexagon/InstPrinter/Makefile rename llvm/lib/Target/Hexagon/{InstPrinter => MCTargetDesc}/HexagonInstPrinter.cpp (100%) rename llvm/lib/Target/Hexagon/{InstPrinter => MCTargetDesc}/HexagonInstPrinter.h (100%) diff --git a/llvm/lib/Target/Hexagon/CMakeLists.txt b/llvm/lib/Target/Hexagon/CMakeLists.txt index d64ecaf..af7914f 100644 --- a/llvm/lib/Target/Hexagon/CMakeLists.txt +++ b/llvm/lib/Target/Hexagon/CMakeLists.txt @@ -40,6 +40,5 @@ add_llvm_target(HexagonCodeGen ) add_subdirectory(TargetInfo) -add_subdirectory(InstPrinter) add_subdirectory(MCTargetDesc) add_subdirectory(Disassembler) diff --git a/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp b/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp index 2e011bd..9240282 100644 --- a/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp +++ b/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp @@ -18,7 +18,7 @@ #include "HexagonMachineFunctionInfo.h" #include "HexagonSubtarget.h" #include "HexagonTargetMachine.h" -#include "InstPrinter/HexagonInstPrinter.h" +#include "MCTargetDesc/HexagonInstPrinter.h" #include "MCTargetDesc/HexagonMCInst.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" diff --git a/llvm/lib/Target/Hexagon/InstPrinter/CMakeLists.txt b/llvm/lib/Target/Hexagon/InstPrinter/CMakeLists.txt deleted file mode 100644 index 1ddaf9b..0000000 --- a/llvm/lib/Target/Hexagon/InstPrinter/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMHexagonAsmPrinter - HexagonInstPrinter.cpp - ) diff --git a/llvm/lib/Target/Hexagon/InstPrinter/LLVMBuild.txt b/llvm/lib/Target/Hexagon/InstPrinter/LLVMBuild.txt deleted file mode 100644 index 8678401..0000000 --- a/llvm/lib/Target/Hexagon/InstPrinter/LLVMBuild.txt +++ /dev/null @@ -1,23 +0,0 @@ -;===- ./lib/Target/Hexagon/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===; -; -; The LLVM Compiler Infrastructure -; -; This file is distributed under the University of Illinois Open Source -; License. See LICENSE.TXT for details. -; -;===------------------------------------------------------------------------===; -; -; This is an LLVMBuild description file for the components in this subdirectory. -; -; For more information on the LLVMBuild system, please see: -; -; http://llvm.org/docs/LLVMBuild.html -; -;===------------------------------------------------------------------------===; - -[component_0] -type = Library -name = HexagonAsmPrinter -parent = Hexagon -required_libraries = MC Support -add_to_library_groups = Hexagon diff --git a/llvm/lib/Target/Hexagon/InstPrinter/Makefile b/llvm/lib/Target/Hexagon/InstPrinter/Makefile deleted file mode 100644 index 20331d8..0000000 --- a/llvm/lib/Target/Hexagon/InstPrinter/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -##===- lib/Target/Hexagon/InstPrinter/Makefile ----------------------------===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -LEVEL = ../../../.. -LIBRARYNAME = LLVMHexagonAsmPrinter - -# Hack: we need to include 'main' Hexagon target directory to grab private headers -CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. - -include $(LEVEL)/Makefile.common diff --git a/llvm/lib/Target/Hexagon/LLVMBuild.txt b/llvm/lib/Target/Hexagon/LLVMBuild.txt index 1542447..6ffd26a 100644 --- a/llvm/lib/Target/Hexagon/LLVMBuild.txt +++ b/llvm/lib/Target/Hexagon/LLVMBuild.txt @@ -16,7 +16,7 @@ ;===------------------------------------------------------------------------===; [common] -subdirectories = Disassembler InstPrinter MCTargetDesc TargetInfo +subdirectories = Disassembler MCTargetDesc TargetInfo [component_0] type = TargetGroup @@ -28,5 +28,5 @@ has_asmprinter = 1 type = Library name = HexagonCodeGen parent = Hexagon -required_libraries = Analysis AsmPrinter CodeGen Core HexagonAsmPrinter HexagonDesc HexagonInfo MC SelectionDAG Support Target +required_libraries = Analysis AsmPrinter CodeGen Core HexagonDesc HexagonInfo MC SelectionDAG Support Target add_to_library_groups = Hexagon diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt index d198208..2a6124e 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/CMakeLists.txt @@ -1,6 +1,7 @@ add_llvm_library(LLVMHexagonDesc HexagonAsmBackend.cpp HexagonELFObjectWriter.cpp + HexagonInstPrinter.cpp HexagonMCAsmInfo.cpp HexagonMCCodeEmitter.cpp HexagonMCInst.cpp diff --git a/llvm/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp similarity index 100% rename from llvm/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.cpp rename to llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.cpp diff --git a/llvm/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.h b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.h similarity index 100% rename from llvm/lib/Target/Hexagon/InstPrinter/HexagonInstPrinter.h rename to llvm/lib/Target/Hexagon/MCTargetDesc/HexagonInstPrinter.h diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp index 09dd80d..14ddd9d 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCTargetDesc.cpp @@ -13,7 +13,7 @@ #include "HexagonMCTargetDesc.h" #include "HexagonMCAsmInfo.h" -#include "InstPrinter/HexagonInstPrinter.h" +#include "MCTargetDesc/HexagonInstPrinter.h" #include "llvm/MC/MCCodeGenInfo.h" #include "llvm/MC/MCELFStreamer.h" #include "llvm/MC/MCInstrInfo.h" diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt index 5ecdd50..f559a21 100644 --- a/llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt +++ b/llvm/lib/Target/Hexagon/MCTargetDesc/LLVMBuild.txt @@ -19,5 +19,5 @@ type = Library name = HexagonDesc parent = Hexagon -required_libraries = HexagonAsmPrinter HexagonInfo MC Support +required_libraries = HexagonInfo MC Support add_to_library_groups = Hexagon -- 2.7.4