diff options
| author | Ian Lance Taylor <iant@golang.org> | 2014-04-07 22:12:26 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2014-04-07 22:12:26 -0700 |
| commit | f4ecfaa442ffdcab83bf63b2d40c67290d13f618 (patch) | |
| tree | cd84c917fe2718bc616249875ca3618825781077 /src | |
| parent | 78025fb2202e79580cd78bc1f4a32cead762e963 (diff) | |
| download | go-f4ecfaa442ffdcab83bf63b2d40c67290d13f618.tar.xz | |
liblink: remove code that is never executed
This code tests linkmode == LinkExternal but is only invoked
by the compiler/assembler, not the linker.
Update #7164
LGTM=rsc
R=rsc, dave
CC=golang-codereviews
https://golang.org/cl/85080043
Diffstat (limited to 'src')
| -rw-r--r-- | src/liblink/asm6.c | 15 | ||||
| -rw-r--r-- | src/liblink/asm8.c | 22 |
2 files changed, 0 insertions, 37 deletions
diff --git a/src/liblink/asm6.c b/src/liblink/asm6.c index 0403665211..07ca35edae 100644 --- a/src/liblink/asm6.c +++ b/src/liblink/asm6.c @@ -2415,21 +2415,6 @@ putrelv: r = addrel(ctxt->cursym); *r = rel; r->off = ctxt->curp->pc + ctxt->andptr - ctxt->and; - } else if(ctxt->iself && ctxt->linkmode == LinkExternal && a->type == D_INDIR+D_FS - && ctxt->headtype != Hopenbsd) { - Reloc *r; - LSym *s; - - r = addrel(ctxt->cursym); - r->off = ctxt->curp->pc + ctxt->andptr - ctxt->and; - r->add = a->offset - ctxt->tlsoffset; - r->xadd = r->add; - r->siz = 4; - r->type = D_TLS; - s = linklookup(ctxt, "runtime.tlsgm", 0); - r->sym = s; - r->xsym = s; - v = 0; } put4(ctxt, v); diff --git a/src/liblink/asm8.c b/src/liblink/asm8.c index 2e4bc709e8..4d209cbdfa 100644 --- a/src/liblink/asm8.c +++ b/src/liblink/asm8.c @@ -1728,14 +1728,6 @@ vaddr(Link *ctxt, Addr *a, Reloc *r) return v; } -static int -istls(Link *ctxt, Addr *a) -{ - if(ctxt->headtype == Hlinux || ctxt->headtype == Hnacl) - return a->index == D_GS; - return a->type == D_INDIR+D_GS; -} - static void asmand(Link *ctxt, Addr *a, int r) { @@ -1857,20 +1849,6 @@ putrelv: r = addrel(ctxt->cursym); *r = rel; r->off = ctxt->curp->pc + ctxt->andptr - ctxt->and; - } else if(ctxt->iself && ctxt->linkmode == LinkExternal && istls(ctxt, a) && ctxt->headtype != Hopenbsd) { - Reloc *r; - LSym *s; - - r = addrel(ctxt->cursym); - r->off = ctxt->curp->pc + ctxt->andptr - ctxt->and; - r->add = a->offset - ctxt->tlsoffset; - r->xadd = r->add; - r->siz = 4; - r->type = D_TLS; - s = linklookup(ctxt, "runtime.tlsgm", 0); - r->sym = s; - r->xsym = s; - v = 0; } put4(ctxt, v); |