commit 3c8465acb219fa83239e004d4fcac9bec1a26239
author Alexei Starovoitov <alexei.starovoitov@gmail.com> Mon Jan 26 20:43:15 2015 +0000
committer Alexei Starovoitov <alexei.starovoitov@gmail.com> Mon Jan 26 20:43:15 2015 +0000
tree db147f57234553b0fcee82b1b158228bff2e8325
parent 87d10ef3257788247081d6e94308e70c9c5bb08d

bpf: fix build due to 'Move DataLayout back to the TargetMachine'

commit r227113 moved DataLayout

llvm-svn: 227133

llvm/lib/Target/BPF/BPFSubtarget.cpp

diff --git a/llvm/lib/Target/BPF/BPFSubtarget.cpp b/llvm/lib/Target/BPF/BPFSubtarget.cpp
index 7a237ea..49addc3 100644
--- a/llvm/lib/Target/BPF/BPFSubtarget.cpp
+++ b/llvm/lib/Target/BPF/BPFSubtarget.cpp
@@ -27,5 +27,5 @@
 
 BPFSubtarget::BPFSubtarget(const std::string &TT, const std::string &CPU,
                            const std::string &FS, const TargetMachine &TM)
-    : BPFGenSubtargetInfo(TT, CPU, FS), DL("e-m:e-p:64:64-i64:64-n32:64-S128"),
-      InstrInfo(), FrameLowering(*this), TLInfo(TM), TSInfo(&DL) {}
+    : BPFGenSubtargetInfo(TT, CPU, FS), InstrInfo(), FrameLowering(*this),
+      TLInfo(TM), TSInfo(TM.getDataLayout()) {}

llvm/lib/Target/BPF/BPFSubtarget.h

diff --git a/llvm/lib/Target/BPF/BPFSubtarget.h b/llvm/lib/Target/BPF/BPFSubtarget.h
index da11811..347cffd8 100644
--- a/llvm/lib/Target/BPF/BPFSubtarget.h
+++ b/llvm/lib/Target/BPF/BPFSubtarget.h
@@ -30,7 +30,6 @@
 
 class BPFSubtarget : public BPFGenSubtargetInfo {
   virtual void anchor();
-  const DataLayout DL; // Calculates type size & alignment
   BPFInstrInfo InstrInfo;
   BPFFrameLowering FrameLowering;
   BPFTargetLowering TLInfo;
@@ -59,7 +58,6 @@
   const TargetRegisterInfo *getRegisterInfo() const override {
     return &InstrInfo.getRegisterInfo();
   }
-  const DataLayout *getDataLayout() const override { return &DL; }
 };
 } // End llvm namespace
 

llvm/lib/Target/BPF/BPFTargetMachine.cpp

diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
index 6ef2a27..c3feb02 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.cpp
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -37,6 +37,7 @@
                                    CodeGenOpt::Level OL)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
       TLOF(make_unique<TargetLoweringObjectFileELF>()),
+      DL("e-m:e-p:64:64-i64:64-n32:64-S128"),
       Subtarget(TT, CPU, FS, *this) {
   initAsmInfo();
 }

llvm/lib/Target/BPF/BPFTargetMachine.h

diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.h b/llvm/lib/Target/BPF/BPFTargetMachine.h
index 1bfaafc..821cffc 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.h
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.h
@@ -20,6 +20,7 @@
 namespace llvm {
 class BPFTargetMachine : public LLVMTargetMachine {
   std::unique_ptr<TargetLoweringObjectFile> TLOF;
+  const DataLayout DL;
   BPFSubtarget Subtarget;
 
 public:
@@ -27,6 +28,7 @@
                    const TargetOptions &Options, Reloc::Model RM,
                    CodeModel::Model CM, CodeGenOpt::Level OL);
 
+  const DataLayout *getDataLayout() const override { return &DL; }
   const BPFSubtarget *getSubtargetImpl() const override { return &Subtarget; }
 
   TargetPassConfig *createPassConfig(PassManagerBase &PM) override;