From acda67c97a58432a188ec293a45710ac53f2525a Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 4 Dec 2017 09:08:55 +0000 Subject: [PATCH] [ARM] Allow using emulated tls on platforms other than ELF This matches how it is done on X86. This allows using emulated tls on windows; in MinGW environments, native tls isn't supported at the moment. Differential Revision: https://reviews.llvm.org/D40769 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319643 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMISelLowering.cpp | 8 ++-- test/CodeGen/ARM/emutls_generic.ll | 75 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp index cee274080b2..d9893db3773 100644 --- a/lib/Target/ARM/ARMISelLowering.cpp +++ b/lib/Target/ARM/ARMISelLowering.cpp @@ -2956,6 +2956,10 @@ ARMTargetLowering::LowerToTLSExecModels(GlobalAddressSDNode *GA, SDValue ARMTargetLowering::LowerGlobalTLSAddress(SDValue Op, SelectionDAG &DAG) const { + GlobalAddressSDNode *GA = cast(Op); + if (DAG.getTarget().Options.EmulatedTLS) + return LowerToTLSEmulatedModel(GA, DAG); + if (Subtarget->isTargetDarwin()) return LowerGlobalTLSAddressDarwin(Op, DAG); @@ -2964,10 +2968,6 @@ ARMTargetLowering::LowerGlobalTLSAddress(SDValue Op, SelectionDAG &DAG) const { // TODO: implement the "local dynamic" model assert(Subtarget->isTargetELF() && "Only ELF implemented here"); - GlobalAddressSDNode *GA = cast(Op); - if (DAG.getTarget().Options.EmulatedTLS) - return LowerToTLSEmulatedModel(GA, DAG); - TLSModel::Model model = getTargetMachine().getTLSModel(GA->getGlobal()); switch (model) { diff --git a/test/CodeGen/ARM/emutls_generic.ll b/test/CodeGen/ARM/emutls_generic.ll index f5633dc23bc..8c1c40dd6ea 100644 --- a/test/CodeGen/ARM/emutls_generic.ll +++ b/test/CodeGen/ARM/emutls_generic.ll @@ -6,6 +6,10 @@ ; RUN: | FileCheck -check-prefix=ARM_32 %s ; RUN: llc < %s -emulated-tls -mtriple=arm-linux-androidabi -O3 \ ; RUN: | FileCheck -check-prefix=ARM_32 %s +; RUN: llc < %s -emulated-tls -mtriple=arm-apple-darwin -O3 \ +; RUN: | FileCheck -check-prefix=DARWIN %s +; RUN: llc < %s -emulated-tls -mtriple=thumbv7-windows-gnu -O3 \ +; RUN: | FileCheck -check-prefix=WIN %s ; Make sure that TLS symbols are emitted in expected order. @@ -61,3 +65,74 @@ entry: ; ARM_32-LABEL: __emutls_t.internal_y: ; ARM_32-NEXT: .long 9 ; ARM_32-NEXT: .long 0 + +; WIN-LABEL: get_external_x: +; WIN: movw r0, :lower16:__emutls_v.external_x +; WIN: movt r0, :upper16:__emutls_v.external_x +; WIN: bl __emutls_get_address +; WIN-LABEL: get_external_y: +; WIN: movw r0, :lower16:__emutls_v.external_y +; WIN: movt r0, :upper16:__emutls_v.external_y +; WIN: bl __emutls_get_address +; WIN-LABEL: get_internal_y: +; WIN: movw r0, :lower16:__emutls_v.internal_y +; WIN: movt r0, :upper16:__emutls_v.internal_y +; WIN: bl __emutls_get_address +; WIN-NOT: __emutls_t.external_x +; WIN-NOT: __emutls_v.external_x: +; WIN: .data{{$}} +; WIN: .globl __emutls_v.external_y +; WIN: .p2align 2 +; WIN-LABEL: __emutls_v.external_y: +; WIN-NEXT: .long 1 +; WIN-NEXT: .long 2 +; WIN-NEXT: .long 0 +; WIN-NEXT: .long __emutls_t.external_y +; WIN: .section .rdata, +; WIN-LABEL: __emutls_t.external_y: +; WIN-NEXT: .byte 7 +; WIN: .data{{$}} +; WIN-NOT: .globl +; WIN: .p2align 2 +; WIN-LABEL: __emutls_v.internal_y: +; WIN-NEXT: .long 8 +; WIN-NEXT: .long 16 +; WIN-NEXT: .long 0 +; WIN-NEXT: .long __emutls_t.internal_y +; WIN-LABEL: __emutls_t.internal_y: +; .quad 9 is equivalent to .long 9 .long 0 +; WIN-NEXT: .quad 9 + +; DARWIN-LABEL: _get_external_x: +; DARWIN: bl ___emutls_get_address +; DARWIN: .long L___emutls_v.external_x$non_lazy_ptr-(LPC0_0+8) +; DARWIN-LABEL: _get_external_y: +; DARWIN: bl ___emutls_get_address +; DARWIN: .long ___emutls_v.external_y-(LPC1_0+8) +; DARWIN-LABEL: _get_internal_y: +; DARWIN: bl ___emutls_get_address +; DARWIN: .long ___emutls_v.internal_y-(LPC2_0+8) +; DARWIN-NOT: ___emutls_t.external_x +; DARWIN-NOT: ___emutls_v.external_x: +; DARWIN: .section __DATA,__data +; DARWIN: .globl ___emutls_v.external_y +; DARWIN: .p2align 2 +; DARWIN-LABEL: ___emutls_v.external_y: +; DARWIN-NEXT: .long 1 +; DARWIN-NEXT: .long 2 +; DARWIN-NEXT: .long 0 +; DARWIN-NEXT: .long ___emutls_t.external_y +; DARWIN: .section __TEXT,__const +; DARWIN-LABEL: ___emutls_t.external_y: +; DARWIN-NEXT: .byte 7 +; DARWIN: .section __DATA,__data +; DARWIN-NOT: .globl +; DARWIN: .p2align 2 +; DARWIN-LABEL: ___emutls_v.internal_y: +; DARWIN-NEXT: .long 8 +; DARWIN-NEXT: .long 16 +; DARWIN-NEXT: .long 0 +; DARWIN-NEXT: .long ___emutls_t.internal_y +; DARWIN-LABEL: ___emutls_t.internal_y: +; DARWIN-NEXT: .long 9 +; DARWIN-NEXT: .long 0 -- 2.11.4.GIT