[ELF] Emit DF_STATIC_TLS only for -shared · llvm/llvm-project@6ca8fde

4 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -1382,7 +1382,7 @@ template <class ELFT> void DynamicSection<ELFT>::finalizeContents() {`
`1382`	`1382`	`}`
`1383`	`1383`	`if (!config->zText)`
`1384`	`1384`	`dtFlags \|= DF_TEXTREL;`
`1385`		`-if (config->hasTlsIe)`
	`1385`	`+if (config->hasTlsIe && config->shared)`
`1386`	`1386`	`dtFlags \|= DF_STATIC_TLS;`
`1387`	`1387`
`1388`	`1388`	`if (dtFlags)`

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`// GOTREL-NEXT: SHF_ALLOC`
`15`	`15`	`// GOTREL-NEXT: SHF_WRITE`
`16`	`16`	`// GOTREL-NEXT: ]`
`17`		`-// GOTREL-NEXT: Address: 0x402258`
`18`		`-// GOTREL-NEXT: Offset: 0x258`
	`17`	`+// GOTREL-NEXT: Address: 0x402250`
	`18`	`+// GOTREL-NEXT: Offset: 0x250`
`19`	`19`	`// GOTREL-NEXT: Size: 8`
`20`	`20`	`// GOTREL-NEXT: Link: 0`
`21`	`21`	`// GOTREL-NEXT: Info: 0`
`@@ -24,8 +24,8 @@`
`24`	`24`	`// GOTREL-NEXT: }`
`25`	`25`	`// GOTREL: Relocations [`
`26`	`26`	`// GOTREL-NEXT: Section ({{.*}}) .rel.dyn {`
`27`		`-// GOTREL-NEXT: 0x402258 R_386_TLS_TPOFF tlsshared0`
`28`		`-// GOTREL-NEXT: 0x40225C R_386_TLS_TPOFF tlsshared1`
	`27`	`+// GOTREL-NEXT: 0x402250 R_386_TLS_TPOFF tlsshared0`
	`28`	`+// GOTREL-NEXT: 0x402254 R_386_TLS_TPOFF tlsshared1`
`29`	`29`	`// GOTREL-NEXT: }`
`30`	`30`	`// GOTREL-NEXT: ]`
`31`	`31`
`@@ -45,10 +45,10 @@`
`45`	`45`	`// DISASM-NEXT: addl $0xfffffffc, %ecx`
`46`	`46`	`// DISASM-NEXT: movl %gs:(%ecx), %eax`
`47`	`47`	`/// &.got[0]`
`48`		`-// DISASM-NEXT: movl 0x402258, %ecx`
	`48`	`+// DISASM-NEXT: movl 0x402250, %ecx`
`49`	`49`	`// DISASM-NEXT: movl %gs:(%ecx), %eax`
`50`	`50`	`/// &.got[1]`
`51`		`-// DISASM-NEXT: addl 0x40225c, %ecx`
	`51`	`+// DISASM-NEXT: addl 0x402254, %ecx`
`52`	`52`	`// DISASM-NEXT: movl %gs:(%ecx), %eax`
`53`	`53`
`54`	`54`	`.type tlslocal0,@object`

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,19 @@`
`1`	`1`	`# REQUIRES: x86`
`2`	`2`
`3`	`3`	`## In this test R_X86_64_GOTTPOFF is a IE relocation (static TLS model),`
`4`		`-## test check we add STATIC_TLS flag.`
	`4`	`+## test check we add STATIC_TLS flag for -shared.`
`5`	`5`
`6`	`6`	`# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o`
`7`		`-# RUN: ld.lld %t.o -o %t1 -shared`
`8`		`-# RUN: llvm-readobj --dynamic-table %t1 \| FileCheck %s`
	`7`	`+# RUN: ld.lld %t.o -o %t.so -shared`
	`8`	`+# RUN: llvm-readobj --dynamic-table %t.so \| FileCheck %s`
	`9`	`+# RUN: ld.lld %t.o -o %t -pie`
	`10`	`+# RUN: llvm-readobj --dynamic-table %t \| FileCheck %s --check-prefix=EXE`
`9`	`11`
`10`	`12`	`# CHECK: DynamicSection [`
`11`	`13`	`# CHECK: FLAGS STATIC_TLS`
`12`	`14`
	`15`	`+# EXE-NOT: FLAGS STATIC_TLS`
	`16`	`+`
`13`	`17`	`.section ".tdata", "awT", @progbits`
`14`	`18`	`.globl var`
`15`	`19`	`var:`

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`// CHECK-NEXT: SHF_WRITE`
`16`	`16`	`// CHECK-NEXT: ]`
`17`	`17`	`// CHECK-NEXT: Address: [[ADDR:.*]]`
`18`		`-// CHECK-NEXT: Offset: 0x3C0`
	`18`	`+// CHECK-NEXT: Offset: 0x3B0`
`19`	`19`	`// CHECK-NEXT: Size: 16`
`20`	`20`	`// CHECK-NEXT: Link: 0`
`21`	`21`	`// CHECK-NEXT: Info: 0`
`@@ -26,21 +26,21 @@`
`26`	`26`	`// CHECK: Relocations [`
`27`	`27`	`// CHECK-NEXT: Section (5) .rela.dyn {`
`28`	`28`	`// CHECK-NEXT: [[ADDR]] R_X86_64_TPOFF64 tls1 0x0`
`29`		`-// CHECK-NEXT: 0x2023C8 R_X86_64_TPOFF64 tls0 0x0`
	`29`	`+// CHECK-NEXT: 0x2023B8 R_X86_64_TPOFF64 tls0 0x0`
`30`	`30`	`// CHECK-NEXT: }`
`31`	`31`	`// CHECK-NEXT: ]`
`32`	`32`
`33`		`-// 0x2012d0 + 4329 + 7 = 0x2023C0`
`34`		`-// 0x2012dA + 4327 + 7 = 0x2023C8`
`35`		`-// 0x2012e4 + 4317 + 7 = 0x2023C8`
	`33`	`+// 0x2012d0 + 4313 + 7 = 0x2023B0`
	`34`	`+// 0x2012dA + 4311 + 7 = 0x2023B8`
	`35`	`+// 0x2012e4 + 4301 + 7 = 0x2023B8`
`36`	`36`	`// DISASM: Disassembly of section .text:`
`37`	`37`	`// DISASM-EMPTY:`
`38`	`38`	`// DISASM-NEXT: <main>:`
`39`		`-// DISASM-NEXT: 2012d0: {{.*}} movq 4329(%rip), %rax`
	`39`	`+// DISASM-NEXT: 2012d0: {{.*}} movq 4313(%rip), %rax`
`40`	`40`	`// DISASM-NEXT: 2012d7: {{.*}} movl %fs:(%rax), %eax`
`41`		`-// DISASM-NEXT: 2012da: {{.*}} movq 4327(%rip), %rax`
	`41`	`+// DISASM-NEXT: 2012da: {{.*}} movq 4311(%rip), %rax`
`42`	`42`	`// DISASM-NEXT: 2012e1: {{.*}} movl %fs:(%rax), %eax`
`43`		`-// DISASM-NEXT: 2012e4: {{.*}} movq 4317(%rip), %rax`
	`43`	`+// DISASM-NEXT: 2012e4: {{.*}} movq 4301(%rip), %rax`
`44`	`44`	`// DISASM-NEXT: 2012eb: {{.*}} movl %fs:(%rax), %eax`
`45`	`45`	`// DISASM-NEXT: 2012ee: {{.*}} retq`
`46`	`46`