diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2011-06-28 20:07:07 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2011-06-28 20:07:07 +0000 |
| commit | 22fee2dff4c43b551aefa44a96ca74fcade6bfac (patch) | |
| tree | 7542d1f709659ef4c6f0a81239a9298c8a82afae /lib/Target/PowerPC | |
| parent | e837dead3c8dc3445ef6a0e2322179c57e264a13 (diff) | |
| download | llvm-22fee2dff4c43b551aefa44a96ca74fcade6bfac.tar.gz llvm-22fee2dff4c43b551aefa44a96ca74fcade6bfac.tar.bz2 llvm-22fee2dff4c43b551aefa44a96ca74fcade6bfac.tar.xz | |
Merge XXXGenRegisterNames.inc into XXXGenRegisterInfo.inc
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134024 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/PowerPC')
| -rw-r--r-- | lib/Target/PowerPC/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/Target/PowerPC/Makefile | 2 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPC.h | 3 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCInstrInfo.cpp | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/lib/Target/PowerPC/CMakeLists.txt b/lib/Target/PowerPC/CMakeLists.txt index ca5daec210..ea11f4c3a7 100644 --- a/lib/Target/PowerPC/CMakeLists.txt +++ b/lib/Target/PowerPC/CMakeLists.txt @@ -1,11 +1,10 @@ set(LLVM_TARGET_DEFINITIONS PPC.td) -tablegen(PPCGenInstrNames.inc -gen-instr-enums) tablegen(PPCGenAsmWriter.inc -gen-asm-writer) tablegen(PPCGenCodeEmitter.inc -gen-emitter) tablegen(PPCGenMCCodeEmitter.inc -gen-emitter -mc-emitter) tablegen(PPCGenRegisterInfo.inc -gen-register-info) -tablegen(PPCGenInstrInfo.inc -gen-instr-desc) +tablegen(PPCGenInstrInfo.inc -gen-instr-info) tablegen(PPCGenDAGISel.inc -gen-dag-isel) tablegen(PPCGenCallingConv.inc -gen-callingconv) tablegen(PPCGenSubtarget.inc -gen-subtarget) diff --git a/lib/Target/PowerPC/Makefile b/lib/Target/PowerPC/Makefile index d7a57f9fa2..2a18db7ad9 100644 --- a/lib/Target/PowerPC/Makefile +++ b/lib/Target/PowerPC/Makefile @@ -12,7 +12,7 @@ LIBRARYNAME = LLVMPowerPCCodeGen TARGET = PPC # Make sure that tblgen is run, first thing. -BUILT_SOURCES = PPCGenInstrNames.inc PPCGenRegisterInfo.inc \ +BUILT_SOURCES = PPCGenRegisterInfo.inc \ PPCGenAsmWriter.inc PPCGenCodeEmitter.inc \ PPCGenInstrInfo.inc PPCGenDAGISel.inc \ PPCGenSubtarget.inc PPCGenCallingConv.inc \ diff --git a/lib/Target/PowerPC/PPC.h b/lib/Target/PowerPC/PPC.h index a8ab8f2995..55852e69da 100644 --- a/lib/Target/PowerPC/PPC.h +++ b/lib/Target/PowerPC/PPC.h @@ -89,6 +89,7 @@ namespace llvm { // Defines symbolic names for the PowerPC instructions. // -#include "PPCGenInstrNames.inc" +#define GET_INSTRINFO_ENUM +#include "PPCGenInstrInfo.inc" #endif diff --git a/lib/Target/PowerPC/PPCInstrInfo.cpp b/lib/Target/PowerPC/PPCInstrInfo.cpp index c3fbc8be53..dade833864 100644 --- a/lib/Target/PowerPC/PPCInstrInfo.cpp +++ b/lib/Target/PowerPC/PPCInstrInfo.cpp @@ -15,7 +15,6 @@ #include "PPCInstrBuilder.h" #include "PPCMachineFunctionInfo.h" #include "PPCPredicates.h" -#include "PPCGenInstrInfo.inc" #include "PPCTargetMachine.h" #include "PPCHazardRecognizers.h" #include "llvm/ADT/STLExtras.h" @@ -29,6 +28,9 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/MC/MCAsmInfo.h" +#define GET_INSTRINFO_MC_DESC +#include "PPCGenInstrInfo.inc" + namespace llvm { extern cl::opt<bool> EnablePPC32RS; // FIXME (64-bit): See PPCRegisterInfo.cpp. extern cl::opt<bool> EnablePPC64RS; // FIXME (64-bit): See PPCRegisterInfo.cpp. |