From 7ac1609a3b81504d269bf967060241c309771f23 Mon Sep 17 00:00:00 2001
From: Jim Grosbach <grosbach@apple.com>
Date: Fri, 1 Oct 2010 22:39:28 +0000
Subject: [PATCH] Rename the AsmPrinter directory to InstPrinter for those
 targets that have been MC-ized for assembly printing. MSP430 is mostly so,
 but still has the asm printer and lowering code in the printer subdir for the
 moment.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115360 91177308-0d34-0410-b5e6-96231b3b80d8
---
 configure                                                          | 5 +++++
 lib/Target/ARM/ARMAsmPrinter.cpp                                   | 2 +-
 lib/Target/ARM/{AsmPrinter => InstPrinter}/ARMInstPrinter.cpp      | 0
 lib/Target/ARM/{AsmPrinter => InstPrinter}/ARMInstPrinter.h        | 0
 lib/Target/ARM/{AsmPrinter => InstPrinter}/CMakeLists.txt          | 0
 lib/Target/ARM/{AsmPrinter => InstPrinter}/Makefile                | 0
 lib/Target/ARM/Makefile                                            | 2 +-
 lib/Target/X86/{AsmPrinter => InstPrinter}/CMakeLists.txt          | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/Makefile                | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/X86ATTInstPrinter.cpp   | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/X86ATTInstPrinter.h     | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/X86InstComments.cpp     | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/X86InstComments.h       | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/X86IntelInstPrinter.cpp | 0
 lib/Target/X86/{AsmPrinter => InstPrinter}/X86IntelInstPrinter.h   | 0
 lib/Target/X86/Makefile                                            | 2 +-
 lib/Target/X86/X86AsmPrinter.cpp                                   | 4 ++--
 17 files changed, 10 insertions(+), 5 deletions(-)
 rename lib/Target/ARM/{AsmPrinter => InstPrinter}/ARMInstPrinter.cpp (100%)
 rename lib/Target/ARM/{AsmPrinter => InstPrinter}/ARMInstPrinter.h (100%)
 rename lib/Target/ARM/{AsmPrinter => InstPrinter}/CMakeLists.txt (100%)
 rename lib/Target/ARM/{AsmPrinter => InstPrinter}/Makefile (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/CMakeLists.txt (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/Makefile (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/X86ATTInstPrinter.cpp (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/X86ATTInstPrinter.h (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/X86InstComments.cpp (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/X86InstComments.h (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/X86IntelInstPrinter.cpp (100%)
 rename lib/Target/X86/{AsmPrinter => InstPrinter}/X86IntelInstPrinter.h (100%)

diff --git a/configure b/configure
index 1dec712f89b..ba31b9650cc 100755
--- a/configure
+++ b/configure
@@ -5050,6 +5050,11 @@ for target_to_build in $TARGETS_TO_BUILD; do
   if test -f ${srcdir}/lib/Target/${target_to_build}/AsmPrinter/Makefile ; then
     LLVM_ENUM_ASM_PRINTERS="LLVM_ASM_PRINTER($target_to_build) $LLVM_ENUM_ASM_PRINTERS";
   fi
+  # MC-ized AsmPrinters live in TARGET/InstPrinter, not AsmPrinter
+  if test -f ${srcdir}/lib/Target/${target_to_build}/InstPrinter/Makefile ; then
+    LLVM_ENUM_ASM_PRINTERS="LLVM_ASM_PRINTER($target_to_build) $LLVM_ENUM_ASM_PRINTERS";
+  fi
+
   if test -f ${srcdir}/lib/Target/${target_to_build}/AsmParser/Makefile ; then
     LLVM_ENUM_ASM_PARSERS="LLVM_ASM_PARSER($target_to_build) $LLVM_ENUM_ASM_PARSERS";
   fi
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp
index 8ed2daed86d..fbe0317287b 100644
--- a/lib/Target/ARM/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -17,7 +17,7 @@
 #include "ARMBuildAttrs.h"
 #include "ARMAddressingModes.h"
 #include "ARMConstantPoolValue.h"
-#include "AsmPrinter/ARMInstPrinter.h"
+#include "InstPrinter/ARMInstPrinter.h"
 #include "ARMMachineFunctionInfo.h"
 #include "ARMMCInstLower.h"
 #include "ARMTargetMachine.h"
diff --git a/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp b/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
similarity index 100%
rename from lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp
rename to lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
diff --git a/lib/Target/ARM/AsmPrinter/ARMInstPrinter.h b/lib/Target/ARM/InstPrinter/ARMInstPrinter.h
similarity index 100%
rename from lib/Target/ARM/AsmPrinter/ARMInstPrinter.h
rename to lib/Target/ARM/InstPrinter/ARMInstPrinter.h
diff --git a/lib/Target/ARM/AsmPrinter/CMakeLists.txt b/lib/Target/ARM/InstPrinter/CMakeLists.txt
similarity index 100%
rename from lib/Target/ARM/AsmPrinter/CMakeLists.txt
rename to lib/Target/ARM/InstPrinter/CMakeLists.txt
diff --git a/lib/Target/ARM/AsmPrinter/Makefile b/lib/Target/ARM/InstPrinter/Makefile
similarity index 100%
rename from lib/Target/ARM/AsmPrinter/Makefile
rename to lib/Target/ARM/InstPrinter/Makefile
diff --git a/lib/Target/ARM/Makefile b/lib/Target/ARM/Makefile
index b3fcfaf6bda..63596c30e8b 100644
--- a/lib/Target/ARM/Makefile
+++ b/lib/Target/ARM/Makefile
@@ -20,6 +20,6 @@ BUILT_SOURCES = ARMGenRegisterInfo.h.inc ARMGenRegisterNames.inc \
                 ARMGenDecoderTables.inc ARMGenEDInfo.inc \
                 ARMGenFastISel.inc
 
-DIRS = AsmPrinter AsmParser Disassembler TargetInfo
+DIRS = InstPrinter AsmParser Disassembler TargetInfo
 
 include $(LEVEL)/Makefile.common
diff --git a/lib/Target/X86/AsmPrinter/CMakeLists.txt b/lib/Target/X86/InstPrinter/CMakeLists.txt
similarity index 100%
rename from lib/Target/X86/AsmPrinter/CMakeLists.txt
rename to lib/Target/X86/InstPrinter/CMakeLists.txt
diff --git a/lib/Target/X86/AsmPrinter/Makefile b/lib/Target/X86/InstPrinter/Makefile
similarity index 100%
rename from lib/Target/X86/AsmPrinter/Makefile
rename to lib/Target/X86/InstPrinter/Makefile
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp b/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp
similarity index 100%
rename from lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
rename to lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h b/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h
similarity index 100%
rename from lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
rename to lib/Target/X86/InstPrinter/X86ATTInstPrinter.h
diff --git a/lib/Target/X86/AsmPrinter/X86InstComments.cpp b/lib/Target/X86/InstPrinter/X86InstComments.cpp
similarity index 100%
rename from lib/Target/X86/AsmPrinter/X86InstComments.cpp
rename to lib/Target/X86/InstPrinter/X86InstComments.cpp
diff --git a/lib/Target/X86/AsmPrinter/X86InstComments.h b/lib/Target/X86/InstPrinter/X86InstComments.h
similarity index 100%
rename from lib/Target/X86/AsmPrinter/X86InstComments.h
rename to lib/Target/X86/InstPrinter/X86InstComments.h
diff --git a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp b/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp
similarity index 100%
rename from lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp
rename to lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp
diff --git a/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h b/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h
similarity index 100%
rename from lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h
rename to lib/Target/X86/InstPrinter/X86IntelInstPrinter.h
diff --git a/lib/Target/X86/Makefile b/lib/Target/X86/Makefile
index f4ff894a2af..9c6415d6e8c 100644
--- a/lib/Target/X86/Makefile
+++ b/lib/Target/X86/Makefile
@@ -20,6 +20,6 @@ BUILT_SOURCES = X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \
                 X86GenCallingConv.inc X86GenSubtarget.inc \
 		X86GenEDInfo.inc
 
-DIRS = AsmPrinter AsmParser Disassembler TargetInfo
+DIRS = InstPrinter AsmParser Disassembler TargetInfo
 
 include $(LEVEL)/Makefile.common
diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index 7d7cec5d8d1..85441b187ec 100644
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86AsmPrinter.h"
-#include "AsmPrinter/X86ATTInstPrinter.h"
-#include "AsmPrinter/X86IntelInstPrinter.h"
+#include "InstPrinter/X86ATTInstPrinter.h"
+#include "InstPrinter/X86IntelInstPrinter.h"
 #include "X86MCInstLower.h"
 #include "X86.h"
 #include "X86COFFMachineModuleInfo.h"
-- 
2.11.0