| commit | 33caa07cc57a6311292f7e89c008c5479bde50ca | [log] [tgz] |
|---|---|---|
| author | Jim Grosbach <grosbach@apple.com> | Tue Oct 05 00:34:11 2010 +0000 |
| committer | Jim Grosbach <grosbach@apple.com> | Tue Oct 05 00:34:11 2010 +0000 |
| tree | 343da0afdd30b62ece9fc5a0a80e64fe87ffc527 | |
| parent | 90371ad16529099d53e78b1c6ac0c7e8b6374153 [diff] |
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
diff --git a/lib/Target/MSP430/CMakeLists.txt b/lib/Target/MSP430/CMakeLists.txt index 2360ffd..fa223f9 100644 --- a/lib/Target/MSP430/CMakeLists.txt +++ b/lib/Target/MSP430/CMakeLists.txt
@@ -20,4 +20,6 @@ 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 4b1f4e6..f5458d5 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 98% rename from lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp rename to lib/Target/MSP430/MSP430AsmPrinter.cpp index 56f72bb..a1a7f44 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 b1f33d6..fa4e80b 100644 --- a/lib/Target/MSP430/Makefile +++ b/lib/Target/MSP430/Makefile
@@ -18,7 +18,7 @@ MSP430GenDAGISel.inc MSP430GenCallingConv.inc \ MSP430GenSubtarget.inc -DIRS = AsmPrinter TargetInfo +DIRS = InstPrinter TargetInfo include $(LEVEL)/Makefile.common