qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 01:24:49 -07:00
Code Releases Activity

cmd/internal/obj/x86: still use (fake) local exec TLS mode on android/386

Browse Source 
golang.org/cl/16383 broke android/386 because by a sort of confluence of hacks
no TLS relocations were emitted at all when Flag_shared != 0. The hack in
runtime/cgo works as well in a PIE executable as it does with a position
dependent one, so the simplest fix is to still emit a R_TLS_LE reloc when goos
== "android".

A real fix is to use something more like the IE model code but loading the
offset from %gs to the thread local storage from a global variable rather than
from a location chosen by the system linker (this is how android/arm works).

Issue #9327.

Change-Id: I9fbfc890ec7fe191f80a595b6cf8e2a1fcbe3034
Reviewed-on: https://go-review.googlesource.com/17049
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
This commit is contained in:
Michael Hudson-Doyle 2015-11-19 22:14:13 +13:00
parent 9a7893550c
commit 0fbf0955d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/internal/obj/x86/asm6.go
View File

@ -2536,7 +2536,7 @@ func vaddr(ctxt *obj.Link, p *obj.Prog, a *obj.Addr, r *obj.Reloc) int64 {
log.Fatalf("reloc") log.Fatalf("reloc")
} }
if ctxt.Flag_shared == 0 { if ctxt.Flag_shared == 0 || isAndroid {
r.Type = obj.R_TLS_LE r.Type = obj.R_TLS_LE
r.Siz = 4 r.Siz = 4
r.Off = -1 // caller must fill in r.Off = -1 // caller must fill in