| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 |
- From 90a3ce02dc25adcf1598faf11a66b151ada3f637 Mon Sep 17 00:00:00 2001
- From: Elias Naur <mail@eliasnaur.com>
- Date: Wed, 27 Mar 2019 14:25:24 +0100
- Subject: [PATCH] cmd/link/internal/ld: skip TLS section on Android
- We don't use the TLS section on android, and dropping it avoids
- complaints about underalignment from the Android Q linker.
- Updates #29674
- Change-Id: I91dabf2a58e6eb1783872639a6a144858db09cef
- Reviewed-on: https://go-review.googlesource.com/c/go/+/169618
- Reviewed-by: Ian Lance Taylor <iant@golang.org>
- ---
- src/cmd/link/internal/ld/lib.go | 29 +++++++++++++++++------------
- 1 file changed, 17 insertions(+), 12 deletions(-)
- diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
- index 1d44c0eb18b..b331e39fe3e 100644
- --- a/src/cmd/link/internal/ld/lib.go
- +++ b/src/cmd/link/internal/ld/lib.go
- @@ -453,18 +453,23 @@ func (ctxt *Link) loadlib() {
- }
- }
-
- - tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0)
- -
- - // runtime.tlsg is used for external linking on platforms that do not define
- - // a variable to hold g in assembly (currently only intel).
- - if tlsg.Type == 0 {
- - tlsg.Type = sym.STLSBSS
- - tlsg.Size = int64(ctxt.Arch.PtrSize)
- - } else if tlsg.Type != sym.SDYNIMPORT {
- - Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type)
- - }
- - tlsg.Attr |= sym.AttrReachable
- - ctxt.Tlsg = tlsg
- + // The Android Q linker started to complain about underalignment of the our TLS
- + // section. We don't actually use the section on android, so dont't
- + // generate it.
- + if objabi.GOOS != "android" {
- + tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0)
- +
- + // runtime.tlsg is used for external linking on platforms that do not define
- + // a variable to hold g in assembly (currently only intel).
- + if tlsg.Type == 0 {
- + tlsg.Type = sym.STLSBSS
- + tlsg.Size = int64(ctxt.Arch.PtrSize)
- + } else if tlsg.Type != sym.SDYNIMPORT {
- + Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type)
- + }
- + tlsg.Attr |= sym.AttrReachable
- + ctxt.Tlsg = tlsg
- + }
-
- var moduledata *sym.Symbol
- if ctxt.BuildMode == BuildModePlugin {
|
