From: Shenghou Ma <minux.ma@gmail.com>
Date: Tue, 17 Dec 2013 12:36:01 +0000 (-0500)
Subject: cmd/ld: maintain correct headstring needed by windows port.
X-Git-Tag: go1.3beta1~1209
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d35b22d128ef72387ffb5d7e66ac40ba58d9ce8e;p=gostls13.git

cmd/ld: maintain correct headstring needed by windows port.
Fixes build for go_bootstrap.
Fixes #6971.

R=alex.brainman, mattn.jp, rsc
CC=golang-dev
https://golang.org/cl/43130043
---

diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c
index 53c3ebd43c..76a3a1393a 100644
--- a/src/cmd/ld/lib.c
+++ b/src/cmd/ld/lib.c
@@ -1255,6 +1255,7 @@ setheadtype(char *s)
 		fprint(2, "unknown header type -H %s\n", s);
 		errorexit();
 	}
+	headstring = s;
 	HEADTYPE = headtype(s);
 }
 
diff --git a/src/cmd/ld/pobj.c b/src/cmd/ld/pobj.c
index 16d908a407..08d44f6376 100644
--- a/src/cmd/ld/pobj.c
+++ b/src/cmd/ld/pobj.c
@@ -138,6 +138,8 @@ main(int argc, char *argv[])
 	if(HEADTYPE == -1)
 		HEADTYPE = headtype(goos);
 	ctxt->headtype = HEADTYPE;
+	if (headstring == NULL)
+		headstring = headstr(HEADTYPE);
 
 	archinit();
 	ctxt->linkmode = linkmode;