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 | 657a4e774ca27ec3b74100b893bdc08654bc916a (patch) | |
| tree | 267a9d4270f0beb2a61f7871d4514e330ed25aab /lib/Target/Mips | |
| parent | ef74ca6a41c899273c5df5af1ba1ad6c9bb7da97 (diff) | |
| download | external_llvm-657a4e774ca27ec3b74100b893bdc08654bc916a.zip external_llvm-657a4e774ca27ec3b74100b893bdc08654bc916a.tar.gz external_llvm-657a4e774ca27ec3b74100b893bdc08654bc916a.tar.bz2 | |
Revert r154038. It was causing make check failures.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154054 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Mips')
| -rw-r--r-- | lib/Target/Mips/MipsISelLowering.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/Mips/MipsISelLowering.cpp b/lib/Target/Mips/MipsISelLowering.cpp index c772c5d..651425b 100644 --- a/lib/Target/Mips/MipsISelLowering.cpp +++ b/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); } |