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 53c3ebd43c54f6024a0715c2ed38082684fe18da..76a3a1393a84899c1f69ff6f56025cde412e8ef1 100644 (file)
--- 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 16d908a40737dacabdb68c28cc5a8355b56a0131..08d44f63763394129e9e69015532ea316e593166 100644 (file)
--- 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;