diff options
| author | Owen Anderson <resistor@mac.com> | 2012-04-04 21:18:58 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2012-04-04 21:18:58 +0000 |
| commit | 4743c6e159c03b378e90c5ccb3d0fe50b4fa1cb5 (patch) | |
| tree | fc62218f8d90cebc54db45903de03caf6d24e890 /llvm/lib/Target | |
| parent | 9380e0ea236add5de3a02782e3f4f1b1dc308406 (diff) | |
| download | bcm5719-llvm-4743c6e159c03b378e90c5ccb3d0fe50b4fa1cb5.tar.gz bcm5719-llvm-4743c6e159c03b378e90c5ccb3d0fe50b4fa1cb5.zip | |
Revert r154038. It was causing make check failures.
llvm-svn: 154054
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelLowering.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/Mips/MipsISelLowering.cpp b/llvm/lib/Target/Mips/MipsISelLowering.cpp index c772c5d371c..651425b829f 100644 --- a/llvm/lib/Target/Mips/MipsISelLowering.cpp +++ b/llvm/lib/Target/Mips/MipsISelLowering.cpp @@ -1543,7 +1543,7 @@ SDValue MipsTargetLowering::LowerGlobalAddress(SDValue Op, EVT ValTy = Op.getValueType(); bool HasGotOfst = (GV->hasInternalLinkage() || (GV->hasLocalLinkage() && !isa<Function>(GV))); - unsigned GotFlag = HasMips64 ? + unsigned GotFlag = IsN64 ? (HasGotOfst ? MipsII::MO_GOT_PAGE : MipsII::MO_GOT_DISP) : (HasGotOfst ? MipsII::MO_GOT : MipsII::MO_GOT16); SDValue GA = DAG.getTargetGlobalAddress(GV, dl, ValTy, 0, GotFlag); @@ -1555,8 +1555,8 @@ SDValue MipsTargetLowering::LowerGlobalAddress(SDValue Op, if (!HasGotOfst) return ResNode; SDValue GALo = DAG.getTargetGlobalAddress(GV, dl, ValTy, 0, - HasMips64 ? MipsII::MO_GOT_OFST : - MipsII::MO_ABS_LO); + IsN64 ? MipsII::MO_GOT_OFST : + MipsII::MO_ABS_LO); SDValue Lo = DAG.getNode(MipsISD::Lo, dl, ValTy, GALo); return DAG.getNode(ISD::ADD, dl, ValTy, ResNode, Lo); } |
