diff options
| author | Russ Cox <rsc@golang.org> | 2013-03-10 18:19:53 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2013-03-10 18:19:53 -0400 |
| commit | 96b243fa47d64e0e9538222e114efe53f86ba184 (patch) | |
| tree | 7117ecb6a3a5c8d1da0eebcd8881db7517971040 /src/cmd/ld/data.c | |
| parent | 4c40e5ae51a3a8ba76ffae04b394523e154fe1b7 (diff) | |
| download | go-96b243fa47d64e0e9538222e114efe53f86ba184.tar.xz | |
cmd/ld: replace dynimpname with extname
Dynimpname was getting too confusing.
Replace flag-like checks with tests of s->type.
R=ken2
CC=golang-dev
https://golang.org/cl/7594046
Diffstat (limited to 'src/cmd/ld/data.c')
| -rw-r--r-- | src/cmd/ld/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c index 3e4e4bf6d9..e035942be7 100644 --- a/src/cmd/ld/data.c +++ b/src/cmd/ld/data.c @@ -297,7 +297,7 @@ dynrelocsym(Sym *s) for(r=s->r; r<s->r+s->nr; r++) { if(r->sym != S && r->sym->type == SDYNIMPORT || r->type >= 256) adddynrel(s, r); - if(flag_shared && r->sym != S && (r->sym->dynimpname == nil || (r->sym->cgoexport & CgoExportDynamic)) && r->type == D_ADDR + if(flag_shared && r->sym != S && s->type != SDYNIMPORT && r->type == D_ADDR && (s == got || s->type == SDATA || s->type == SGOSTRING || s->type == STYPE || s->type == SRODATA)) { // Create address based RELATIVE relocation adddynrela(rel, s, r); |