diff options
| -rw-r--r-- | include/llvm/Target/TargetOptions.h | 10 | ||||
| -rw-r--r-- | lib/Target/TargetMachine.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGen/X86/tls-pie.ll | 64 | ||||
| -rw-r--r-- | tools/llc/llc.cpp | 6 |
4 files changed, 80 insertions, 3 deletions
diff --git a/include/llvm/Target/TargetOptions.h b/include/llvm/Target/TargetOptions.h index 7730ab90e8..1c10059218 100644 --- a/include/llvm/Target/TargetOptions.h +++ b/include/llvm/Target/TargetOptions.h @@ -42,8 +42,8 @@ namespace llvm { GuaranteedTailCallOpt(false), DisableTailCalls(false), StackAlignmentOverride(0), RealignStack(true), DisableJumpTables(false), EnableFastISel(false), - EnableSegmentedStacks(false), TrapFuncName(""), - FloatABIType(FloatABI::Default) + PositionIndependentExecutable(false), EnableSegmentedStacks(false), + TrapFuncName(""), FloatABIType(FloatABI::Default) {} /// PrintMachineCode - This flag is enabled when the -print-machineinstrs @@ -164,6 +164,12 @@ namespace llvm { /// compile time. unsigned EnableFastISel : 1; + /// PositionIndependentExecutable - This flag indicates whether the code + /// will eventually be linked into a single executable, despite the PIC + /// relocation model being in use. It's value is undefined (and irrelevant) + /// if the relocation model is anything other than PIC. + unsigned PositionIndependentExecutable : 1; + unsigned EnableSegmentedStacks : 1; /// getTrapFunctionName - If this returns a non-empty string, this means diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp index b8e7f15d09..b9b2526876 100644 --- a/lib/Target/TargetMachine.cpp +++ b/lib/Target/TargetMachine.cpp @@ -82,7 +82,8 @@ TLSModel::Model TargetMachine::getTLSModel(const GlobalValue *GV) const { // For variables, is internal different from hidden? bool isHidden = GV->hasHiddenVisibility(); - if (getRelocationModel() == Reloc::PIC_) { + if (getRelocationModel() == Reloc::PIC_ && + !Options.PositionIndependentExecutable) { if (isLocal || isHidden) return TLSModel::LocalDynamic; else diff --git a/test/CodeGen/X86/tls-pie.ll b/test/CodeGen/X86/tls-pie.ll new file mode 100644 index 0000000000..6c739cbabd --- /dev/null +++ b/test/CodeGen/X86/tls-pie.ll @@ -0,0 +1,64 @@ +; RUN: llc < %s -march=x86 -mtriple=i386-linux-gnu -relocation-model=pic -enable-pie \ +; RUN: | FileCheck -check-prefix=X32 %s +; RUN: llc < %s -march=x86-64 -mtriple=x86_64-linux-gnu -relocation-model=pic -enable-pie \ +; RUN: | FileCheck -check-prefix=X64 %s + +@i = thread_local global i32 15 +@i2 = external thread_local global i32 + +define i32 @f1() { +; X32: f1: +; X32: movl %gs:i@NTPOFF, %eax +; X32-NEXT: ret +; X64: f1: +; X64: movabsq $i@TPOFF, %rax +; X64-NEXT: movl %fs:(%rax), %eax +; X64-NEXT: ret + +entry: + %tmp1 = load i32* @i + ret i32 %tmp1 +} + +define i32* @f2() { +; X32: f2: +; X32: movl %gs:0, %eax +; X32-NEXT: leal i@NTPOFF(%eax), %eax +; X32-NEXT: ret +; X64: f2: +; X64: movq %fs:0, %rax +; X64-NEXT: addq $i@TPOFF, %rax +; X64-NEXT: ret + +entry: + ret i32* @i +} + +define i32 @f3() { +; X32: f3: +; X32: movl i2@INDNTPOFF, %eax +; X32-NEXT: movl %gs:(%eax), %eax +; X32-NEXT: ret +; X64: f3: +; X64: movq i2@GOTTPOFF(%rip), %rax +; X64-NEXT: movl %fs:(%rax), %eax +; X64-NEXT: ret + +entry: + %tmp1 = load i32* @i2 + ret i32 %tmp1 +} + +define i32* @f4() { +; X32: f4: +; X32: movl %gs:0, %eax +; X32-NEXT: addl i2@INDNTPOFF, %eax +; X32-NEXT: ret +; X64: f4: +; X64: movq %fs:0, %rax +; X64-NEXT: addq i2@GOTTPOFF(%rip), %rax +; X64-NEXT: ret + +entry: + ret i32* @i2 +} diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index 191b649c05..9e30ac198b 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -263,6 +263,11 @@ TrapFuncName("trap-func", cl::Hidden, cl::init("")); static cl::opt<bool> +EnablePIE("enable-pie", + cl::desc("Assume the creation of a position independent executable."), + cl::init(false)); + +static cl::opt<bool> SegmentedStacks("segmented-stacks", cl::desc("Use segmented stacks if possible."), cl::init(false)); @@ -467,6 +472,7 @@ int main(int argc, char **argv) { Options.RealignStack = EnableRealignStack; Options.DisableJumpTables = DisableSwitchTables; Options.TrapFuncName = TrapFuncName; + Options.PositionIndependentExecutable = EnablePIE; Options.EnableSegmentedStacks = SegmentedStacks; std::auto_ptr<TargetMachine> |