From 630424ca3a630f52ea745ffd06ccc8e4da5a5223 Mon Sep 17 00:00:00 2001
From: "Kazushi (Jam) Marukawa" <marukawa@nec.com>
Date: Tue, 17 Mar 2020 11:32:33 +0100
Subject: [PATCH] [VE] Move VEInstPrinter.cpp and VEInstPrinter.h into
 MCTargetDesc

Summary:
Move them into MCTargetDesc to follow other architectures (a263aa2).

Reviewed By: simoll

Differential Revision: https://reviews.llvm.org/D76270
---
 lib/Target/VE/CMakeLists.txt                  |  1 -
 lib/Target/VE/InstPrinter/CMakeLists.txt      |  3 ---
 lib/Target/VE/InstPrinter/LLVMBuild.txt       | 22 -------------------
 lib/Target/VE/LLVMBuild.txt                   |  5 ++---
 lib/Target/VE/MCTargetDesc/CMakeLists.txt     |  1 +
 lib/Target/VE/MCTargetDesc/LLVMBuild.txt      |  2 +-
 .../VEInstPrinter.cpp                         |  0
 .../VEInstPrinter.h                           |  0
 lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp |  2 +-
 .../VE/MCTargetDesc/VETargetStreamer.cpp      |  2 +-
 lib/Target/VE/VEAsmPrinter.cpp                |  2 +-
 11 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 lib/Target/VE/InstPrinter/CMakeLists.txt
 delete mode 100644 lib/Target/VE/InstPrinter/LLVMBuild.txt
 rename lib/Target/VE/{InstPrinter => MCTargetDesc}/VEInstPrinter.cpp (100%)
 rename lib/Target/VE/{InstPrinter => MCTargetDesc}/VEInstPrinter.h (100%)

diff --git a/lib/Target/VE/CMakeLists.txt b/lib/Target/VE/CMakeLists.txt
index 5b32fd50e58..89c946d87e1 100644
--- a/lib/Target/VE/CMakeLists.txt
+++ b/lib/Target/VE/CMakeLists.txt
@@ -21,6 +21,5 @@ add_llvm_target(VECodeGen
   VETargetMachine.cpp
   )
 
-add_subdirectory(InstPrinter)
 add_subdirectory(TargetInfo)
 add_subdirectory(MCTargetDesc)
diff --git a/lib/Target/VE/InstPrinter/CMakeLists.txt b/lib/Target/VE/InstPrinter/CMakeLists.txt
deleted file mode 100644
index 7ddeebb9a7d..00000000000
--- a/lib/Target/VE/InstPrinter/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_component_library(LLVMVEAsmPrinter
-  VEInstPrinter.cpp
-  )
diff --git a/lib/Target/VE/InstPrinter/LLVMBuild.txt b/lib/Target/VE/InstPrinter/LLVMBuild.txt
deleted file mode 100644
index 8cfaea7634e..00000000000
--- a/lib/Target/VE/InstPrinter/LLVMBuild.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-;===- ./lib/Target/VE/InstPrinter/LLVMBuild.txt ----------------*- Conf -*--===;
-;
-; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-; See https://llvm.org/LICENSE.txt for license information.
-; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-;
-;===------------------------------------------------------------------------===;
-;
-; 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 = VEAsmPrinter
-parent = VE
-required_libraries = MC Support
-add_to_library_groups = VE
diff --git a/lib/Target/VE/LLVMBuild.txt b/lib/Target/VE/LLVMBuild.txt
index 4e1a5ed898c..eb74a9a387b 100644
--- a/lib/Target/VE/LLVMBuild.txt
+++ b/lib/Target/VE/LLVMBuild.txt
@@ -15,7 +15,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = InstPrinter MCTargetDesc TargetInfo
+subdirectories = MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
@@ -29,6 +29,5 @@ type = Library
 name = VECodeGen
 parent = VE
 required_libraries = Analysis AsmPrinter CodeGen Core
-                     MC SelectionDAG VEAsmPrinter
-                     VEDesc VEInfo Support Target
+                     MC SelectionDAG VEDesc VEInfo Support Target
 add_to_library_groups = VE
diff --git a/lib/Target/VE/MCTargetDesc/CMakeLists.txt b/lib/Target/VE/MCTargetDesc/CMakeLists.txt
index 5ef74c18461..9bca0ceeb69 100644
--- a/lib/Target/VE/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/VE/MCTargetDesc/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_llvm_component_library(LLVMVEDesc
+  VEInstPrinter.cpp
   VEMCAsmInfo.cpp
   VEMCExpr.cpp
   VEMCTargetDesc.cpp
diff --git a/lib/Target/VE/MCTargetDesc/LLVMBuild.txt b/lib/Target/VE/MCTargetDesc/LLVMBuild.txt
index 3fddd5268be..e585042e60b 100644
--- a/lib/Target/VE/MCTargetDesc/LLVMBuild.txt
+++ b/lib/Target/VE/MCTargetDesc/LLVMBuild.txt
@@ -18,5 +18,5 @@
 type = Library
 name = VEDesc
 parent = VE
-required_libraries = MC VEAsmPrinter VEInfo Support
+required_libraries = MC VEInfo Support
 add_to_library_groups = VE
diff --git a/lib/Target/VE/InstPrinter/VEInstPrinter.cpp b/lib/Target/VE/MCTargetDesc/VEInstPrinter.cpp
similarity index 100%
rename from lib/Target/VE/InstPrinter/VEInstPrinter.cpp
rename to lib/Target/VE/MCTargetDesc/VEInstPrinter.cpp
diff --git a/lib/Target/VE/InstPrinter/VEInstPrinter.h b/lib/Target/VE/MCTargetDesc/VEInstPrinter.h
similarity index 100%
rename from lib/Target/VE/InstPrinter/VEInstPrinter.h
rename to lib/Target/VE/MCTargetDesc/VEInstPrinter.h
diff --git a/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp b/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp
index b228617058a..3cd09299fc7 100644
--- a/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp
+++ b/lib/Target/VE/MCTargetDesc/VEMCTargetDesc.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "VEMCTargetDesc.h"
-#include "InstPrinter/VEInstPrinter.h"
+#include "VEInstPrinter.h"
 #include "VEMCAsmInfo.h"
 #include "VETargetStreamer.h"
 #include "llvm/MC/MCInstrInfo.h"
diff --git a/lib/Target/VE/MCTargetDesc/VETargetStreamer.cpp b/lib/Target/VE/MCTargetDesc/VETargetStreamer.cpp
index dfe94bbaaa4..29f5afb67ac 100644
--- a/lib/Target/VE/MCTargetDesc/VETargetStreamer.cpp
+++ b/lib/Target/VE/MCTargetDesc/VETargetStreamer.cpp
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "VETargetStreamer.h"
-#include "InstPrinter/VEInstPrinter.h"
+#include "VEInstPrinter.h"
 #include "llvm/Support/FormattedStream.h"
 
 using namespace llvm;
diff --git a/lib/Target/VE/VEAsmPrinter.cpp b/lib/Target/VE/VEAsmPrinter.cpp
index 99bbe441608..19a01f4f074 100644
--- a/lib/Target/VE/VEAsmPrinter.cpp
+++ b/lib/Target/VE/VEAsmPrinter.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "InstPrinter/VEInstPrinter.h"
+#include "MCTargetDesc/VEInstPrinter.h"
 #include "MCTargetDesc/VEMCExpr.h"
 #include "MCTargetDesc/VETargetStreamer.h"
 #include "VE.h"