diff options
| author | Jan Voung <jvoung@google.com> | 2012-08-13 14:32:46 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-08-13 14:32:46 -0700 |
| commit | 57564f591c8e1ece26a9ab1fc1a2f661697f5b0f (patch) | |
| tree | e8ce281be100903c5040ad35b92150bc6f845105 /lib | |
| parent | c1a9e1f9671aac40856979e0f68fd167c0b494f4 (diff) | |
Cherry-pick 159409 for TLS Initial Exec fix.
Review URL: http://codereview.chromium.org/10826251/
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index f641940154..bf559c98dd 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -7485,11 +7485,11 @@ static SDValue LowerToTLSExecModel(GlobalAddressSDNode *GA, SelectionDAG &DAG, Offset = DAG.getNode(ISD::ADD, dl, PtrVT, DAG.getNode(X86ISD::GlobalBaseReg, DebugLoc(), PtrVT), Offset); - } else { - Offset = DAG.getLoad(PtrVT, dl, DAG.getEntryNode(), Offset, - MachinePointerInfo::getGOT(), false, false, false, - 0); } + + Offset = DAG.getLoad(PtrVT, dl, DAG.getEntryNode(), Offset, + MachinePointerInfo::getGOT(), false, false, false, + 0); } // The address of the thread local variable is the add of the thread |