summaryrefslogtreecommitdiff
path: root/src/liblink
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-09-26 13:50:53 -0400
committerRuss Cox <rsc@golang.org>2014-09-26 13:50:53 -0400
commit8756f605b8e890a155eb7bd4046c3f2330dde0d8 (patch)
treebd8bdd3f4ef6bd90ea7e260ca673b328b9e37cbb /src/liblink
parentd1d23f585d117ac1f7bcc3aa5fee5528cb2e3a3c (diff)
downloadgo-8756f605b8e890a155eb7bd4046c3f2330dde0d8.tar.gz
liblink: fix cmd/ld -X flag
This fixes the test/linkx.go test, which does not run by default. (Issue 4139 is about fixing that.) Fixes issue 8806. LGTM=r R=golang-codereviews, r CC=bradfitz, golang-codereviews, iant https://codereview.appspot.com/145420043
Diffstat (limited to 'src/liblink')
-rw-r--r--src/liblink/objfile.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liblink/objfile.c b/src/liblink/objfile.c
index 15d602df9..b2478ec17 100644
--- a/src/liblink/objfile.c
+++ b/src/liblink/objfile.c
@@ -589,6 +589,8 @@ readsym(Link *ctxt, Biobuf *f, char *pkg, char *pn)
typ = rdsym(ctxt, f, pkg);
if(typ != nil) // if bss sym defined multiple times, take type from any one def
s->gotype = typ;
+ if(dup != nil && typ != nil)
+ dup->gotype = typ;
rddata(f, &s->p, &s->np);
s->maxp = s->np;
n = rdint(f);