diff options
author | tstellar <tstellar@91177308-0d34-0410-b5e6-96231b3b80d8> | 2012-10-11 21:28:21 +0000 |
---|---|---|
committer | tstellar <tstellar@91177308-0d34-0410-b5e6-96231b3b80d8> | 2012-10-11 21:28:21 +0000 |
commit | 6441159a21bc30376f67e403eafa71eb1385d6d4 (patch) | |
tree | bad3b38c2228c5280da49551337df82d763543be | |
parent | 00b23dae41f4e32bbd975199c745d60ec7ab7524 (diff) |
AMDGPU: Fix build after merging of DataLayout changes
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/R600/@165749 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Target/AMDGPU/AMDGPU.h | 2 | ||||
-rw-r--r-- | lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 2 | ||||
-rw-r--r-- | lib/Target/AMDGPU/AMDGPUTargetMachine.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/Target/AMDGPU/AMDGPU.h b/lib/Target/AMDGPU/AMDGPU.h index f484caa9a3e..c722d0455e7 100644 --- a/lib/Target/AMDGPU/AMDGPU.h +++ b/lib/Target/AMDGPU/AMDGPU.h @@ -20,7 +20,7 @@ class FunctionPass; class AMDGPUTargetMachine; // R600 Passes -FunctionPass* createR600KernelParametersPass(const TargetData* TD); +FunctionPass* createR600KernelParametersPass(const DataLayout *TD); FunctionPass *createR600ExpandSpecialInstrsPass(TargetMachine &tm); // SI Passes diff --git a/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp index 8aaa3652836..19fd05d3196 100644 --- a/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp +++ b/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp @@ -47,7 +47,7 @@ AMDGPUTargetMachine::AMDGPUTargetMachine(const Target &T, StringRef TT, : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OptLevel), Subtarget(TT, CPU, FS), - DataLayout(Subtarget.getDataLayout()), + Layout(Subtarget.getDataLayout()), FrameLowering(TargetFrameLowering::StackGrowsUp, Subtarget.device()->getStackAlignment(), 0), IntrinsicInfo(this), diff --git a/lib/Target/AMDGPU/AMDGPUTargetMachine.h b/lib/Target/AMDGPU/AMDGPUTargetMachine.h index 8b405a882cc..712bc6c3dcc 100644 --- a/lib/Target/AMDGPU/AMDGPUTargetMachine.h +++ b/lib/Target/AMDGPU/AMDGPUTargetMachine.h @@ -20,7 +20,7 @@ #include "AMDILIntrinsicInfo.h" #include "R600ISelLowering.h" #include "llvm/ADT/OwningPtr.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" namespace llvm { @@ -29,7 +29,7 @@ MCAsmInfo* createMCAsmInfo(const Target &T, StringRef TT); class AMDGPUTargetMachine : public LLVMTargetMachine { AMDGPUSubtarget Subtarget; - const TargetData DataLayout; + const DataLayout Layout; AMDGPUFrameLowering FrameLowering; AMDGPUIntrinsicInfo IntrinsicInfo; const AMDGPUInstrInfo * InstrInfo; @@ -61,7 +61,7 @@ public: virtual const InstrItineraryData* getInstrItineraryData() const { return InstrItins; } - virtual const TargetData* getTargetData() const { return &DataLayout; } + virtual const DataLayout* getDataLayout() const { return &Layout; } virtual TargetPassConfig *createPassConfig(PassManagerBase &PM); }; |