[llvm-branch-commits] [llvm-branch] r165749 - in /llvm/branches/R600/lib/Target/AMDGPU: AMDGPU.h AMDGPUTargetMachine.cpp AMDGPUTargetMachine.h

[Tom Stellard]

Author: tstellar
Date: Thu Oct 11 16:28:21 2012
New Revision: 165749

URL: http://llvm.org/viewvc/llvm-project?rev=165749&view=rev
Log:
AMDGPU: Fix build after merging of DataLayout changes

Modified:
    llvm/branches/R600/lib/Target/AMDGPU/AMDGPU.h
    llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
    llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.h

Modified: llvm/branches/R600/lib/Target/AMDGPU/AMDGPU.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/Target/AMDGPU/AMDGPU.h?rev=165749&r1=165748&r2=165749&view=diff
==============================================================================
--- llvm/branches/R600/lib/Target/AMDGPU/AMDGPU.h (original)
+++ llvm/branches/R600/lib/Target/AMDGPU/AMDGPU.h Thu Oct 11 16:28:21 2012
@@ -20,7 +20,7 @@
 class AMDGPUTargetMachine;
 
 // R600 Passes
-FunctionPass* createR600KernelParametersPass(const TargetData* TD);
+FunctionPass* createR600KernelParametersPass(const DataLayout *TD);
 FunctionPass *createR600ExpandSpecialInstrsPass(TargetMachine &tm);
 
 // SI Passes

Modified: llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp?rev=165749&r1=165748&r2=165749&view=diff
==============================================================================
--- llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp (original)
+++ llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp Thu Oct 11 16:28:21 2012
@@ -47,7 +47,7 @@
 :
   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),

Modified: llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.h?rev=165749&r1=165748&r2=165749&view=diff
==============================================================================
--- llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.h (original)
+++ llvm/branches/R600/lib/Target/AMDGPU/AMDGPUTargetMachine.h Thu Oct 11 16:28:21 2012
@@ -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 @@
 class AMDGPUTargetMachine : public LLVMTargetMachine {
 
   AMDGPUSubtarget Subtarget;
-  const TargetData DataLayout;
+  const DataLayout Layout;
   AMDGPUFrameLowering FrameLowering;
   AMDGPUIntrinsicInfo IntrinsicInfo;
   const AMDGPUInstrInfo * InstrInfo;
@@ -61,7 +61,7 @@
    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);
 };