diff options
| -rw-r--r-- | lib/Target/X86/X86ISelLowering.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGen/X86/tls-pie.ll | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index 1a60ce3..e6a0df7 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -7451,11 +7451,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 diff --git a/test/CodeGen/X86/tls-pie.ll b/test/CodeGen/X86/tls-pie.ll index 5cb3866..8269c43 100644 --- a/test/CodeGen/X86/tls-pie.ll +++ b/test/CodeGen/X86/tls-pie.ll @@ -40,7 +40,8 @@ define i32 @f3() { ; X32-NEXT: popl %eax ; X32-NEXT: .Ltmp{{[0-9]+}}: ; X32-NEXT: addl $_GLOBAL_OFFSET_TABLE_+(.Ltmp{{[0-9]+}}-.L{{[0-9]+}}$pb), %eax -; X32-NEXT: movl %gs:i2@GOTNTPOFF(%eax), %eax +; X32-NEXT: movl i2@GOTNTPOFF(%eax), %eax +; X32-NEXT: movl %gs:(%eax), %eax ; X32-NEXT: ret ; X64: f3: ; X64: movq i2@GOTTPOFF(%rip), %rax @@ -56,11 +57,11 @@ define i32* @f4() { ; X32: f4: ; X32: calll .L{{[0-9]+}}$pb ; X32-NEXT: .L{{[0-9]+}}$pb: -; X32-NEXT: popl %eax +; X32-NEXT: popl %ecx ; X32-NEXT: .Ltmp{{[0-9]+}}: -; X32-NEXT: addl $_GLOBAL_OFFSET_TABLE_+(.Ltmp{{[0-9]+}}-.L{{[0-9]+}}$pb), %eax -; X32-NEXT: leal i2@GOTNTPOFF(%eax), %eax -; X32-NEXT: addl %gs:0, %eax +; X32-NEXT: addl $_GLOBAL_OFFSET_TABLE_+(.Ltmp{{[0-9]+}}-.L{{[0-9]+}}$pb), %ecx +; X32-NEXT: movl %gs:0, %eax +; X32-NEXT: addl i2@GOTNTPOFF(%ecx), %eax ; X32-NEXT: ret ; X64: f4: ; X64: movq %fs:0, %rax |