From: Russ Cox <rsc@golang.org>
Date: Fri, 26 Sep 2014 17:50:53 +0000 (-0400)
Subject: liblink: fix cmd/ld -X flag
X-Git-Tag: go1.4beta1~273
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=df781cc4abf83225ec2e0dbd6e16dc8dd6cab36d;p=gostls13.git

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 #8806.

LGTM=r
R=golang-codereviews, r
CC=bradfitz, golang-codereviews, iant
https://golang.org/cl/145420043
---

diff --git a/src/liblink/objfile.c b/src/liblink/objfile.c
index 15d602df92..b2478ec178 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);