From 33caa07cc57a6311292f7e89c008c5479bde50ca Mon Sep 17 00:00:00 2001
From: Jim Grosbach <grosbach@apple.com>
Date: Tue, 5 Oct 2010 00:34:11 +0000
Subject: [PATCH] Re-apply r115363 and r115366 now that r115525 has removed the
 un-needed header that caused the circular dependencies on Linux.

Built OK for me on OSX and Linux (Ubuntu) with configure/make and CMake. Will
keep an eye on the bots....

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115582 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/MSP430/CMakeLists.txt                                | 2 ++
 lib/Target/MSP430/{AsmPrinter => InstPrinter}/CMakeLists.txt    | 2 --
 .../MSP430/{AsmPrinter => InstPrinter}/MSP430InstPrinter.cpp    | 0
 .../MSP430/{AsmPrinter => InstPrinter}/MSP430InstPrinter.h      | 0
 lib/Target/MSP430/{AsmPrinter => InstPrinter}/Makefile          | 0
 lib/Target/MSP430/{AsmPrinter => }/MSP430AsmPrinter.cpp         | 2 +-
 lib/Target/MSP430/{AsmPrinter => }/MSP430MCInstLower.cpp        | 0
 lib/Target/MSP430/{AsmPrinter => }/MSP430MCInstLower.h          | 0
 lib/Target/MSP430/Makefile                                      | 2 +-
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/Target/MSP430/{AsmPrinter => InstPrinter}/CMakeLists.txt (81%)
 rename lib/Target/MSP430/{AsmPrinter => InstPrinter}/MSP430InstPrinter.cpp (100%)
 rename lib/Target/MSP430/{AsmPrinter => InstPrinter}/MSP430InstPrinter.h (100%)
 rename lib/Target/MSP430/{AsmPrinter => InstPrinter}/Makefile (100%)
 rename lib/Target/MSP430/{AsmPrinter => }/MSP430AsmPrinter.cpp (99%)
 rename lib/Target/MSP430/{AsmPrinter => }/MSP430MCInstLower.cpp (100%)
 rename lib/Target/MSP430/{AsmPrinter => }/MSP430MCInstLower.h (100%)

diff --git a/lib/Target/MSP430/CMakeLists.txt b/lib/Target/MSP430/CMakeLists.txt
index 2360ffdef4b..fa223f9617c 100644
--- a/lib/Target/MSP430/CMakeLists.txt
+++ b/lib/Target/MSP430/CMakeLists.txt
@@ -20,4 +20,6 @@ add_llvm_target(MSP430CodeGen
   MSP430Subtarget.cpp
   MSP430TargetMachine.cpp
   MSP430SelectionDAGInfo.cpp
+  MSP430AsmPrinter.cpp
+  MSP430MCInstLower.cpp
   )
diff --git a/lib/Target/MSP430/AsmPrinter/CMakeLists.txt b/lib/Target/MSP430/InstPrinter/CMakeLists.txt
similarity index 81%
rename from lib/Target/MSP430/AsmPrinter/CMakeLists.txt
rename to lib/Target/MSP430/InstPrinter/CMakeLists.txt
index 4b1f4e6ff26..f5458d59a82 100644
--- a/lib/Target/MSP430/AsmPrinter/CMakeLists.txt
+++ b/lib/Target/MSP430/InstPrinter/CMakeLists.txt
@@ -1,8 +1,6 @@
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 
 add_llvm_library(LLVMMSP430AsmPrinter
-  MSP430AsmPrinter.cpp
   MSP430InstPrinter.cpp
-  MSP430MCInstLower.cpp
   )
 add_dependencies(LLVMMSP430AsmPrinter MSP430CodeGenTable_gen)
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp b/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp
similarity index 100%
rename from lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp
rename to lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.h b/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h
similarity index 100%
rename from lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.h
rename to lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h
diff --git a/lib/Target/MSP430/AsmPrinter/Makefile b/lib/Target/MSP430/InstPrinter/Makefile
similarity index 100%
rename from lib/Target/MSP430/AsmPrinter/Makefile
rename to lib/Target/MSP430/InstPrinter/Makefile
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp b/lib/Target/MSP430/MSP430AsmPrinter.cpp
similarity index 99%
rename from lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
rename to lib/Target/MSP430/MSP430AsmPrinter.cpp
index 56f72bbc147..a1a7f44c19c 100644
--- a/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
+++ b/lib/Target/MSP430/MSP430AsmPrinter.cpp
@@ -15,10 +15,10 @@
 #define DEBUG_TYPE "asm-printer"
 #include "MSP430.h"
 #include "MSP430InstrInfo.h"
-#include "MSP430InstPrinter.h"
 #include "MSP430MCAsmInfo.h"
 #include "MSP430MCInstLower.h"
 #include "MSP430TargetMachine.h"
+#include "InstPrinter/MSP430InstPrinter.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.cpp b/lib/Target/MSP430/MSP430MCInstLower.cpp
similarity index 100%
rename from lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.cpp
rename to lib/Target/MSP430/MSP430MCInstLower.cpp
diff --git a/lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.h b/lib/Target/MSP430/MSP430MCInstLower.h
similarity index 100%
rename from lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.h
rename to lib/Target/MSP430/MSP430MCInstLower.h
diff --git a/lib/Target/MSP430/Makefile b/lib/Target/MSP430/Makefile
index b1f33d6d0c1..fa4e80b0ff3 100644
--- a/lib/Target/MSP430/Makefile
+++ b/lib/Target/MSP430/Makefile
@@ -18,7 +18,7 @@ BUILT_SOURCES = MSP430GenRegisterInfo.h.inc MSP430GenRegisterNames.inc \
 		MSP430GenDAGISel.inc MSP430GenCallingConv.inc \
 		MSP430GenSubtarget.inc
 
-DIRS = AsmPrinter TargetInfo
+DIRS = InstPrinter TargetInfo
 
 include $(LEVEL)/Makefile.common