qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 08:20:05 -07:00
Code Releases Activity

cmd/ld: fix windows build

Browse Source 
Fixes #4948.

R=golang-dev, alex.brainman
CC=golang-dev
https://golang.org/cl/7445045
This commit is contained in:
Russ Cox 2013-03-01 05:03:25 -08:00
parent 776b51850b
commit 8d732368c2
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/ld/ldpe.c
View File

@ -320,12 +320,6 @@ ldpe(Biobuf *f, char *pkg, int64 len, char *pn)
goto bad; goto bad;
s = sym->sym; s = sym->sym;
if(s->outer != S) {
if(s->dupok)
continue;
diag("%s: duplicate symbol reference: %s in both %s and %s", pn, s->name, s->outer->name, sect->sym->name);
errorexit();
}
if(sym->sectnum == 0) {// extern if(sym->sectnum == 0) {// extern
if(s->type == SDYNIMPORT) if(s->type == SDYNIMPORT)
s->plt = -2; // flag for dynimport in PE object files. s->plt = -2; // flag for dynimport in PE object files.
@ -344,6 +338,13 @@ ldpe(Biobuf *f, char *pkg, int64 len, char *pn)
if(sect == nil) if(sect == nil)
return; return;
if(s->outer != S) {
if(s->dupok)
continue;
diag("%s: duplicate symbol reference: %s in both %s and %s", pn, s->name, s->outer->name, sect->sym->name);
errorexit();
}
s->sub = sect->sym->sub; s->sub = sect->sym->sub;
sect->sym->sub = s; sect->sym->sub = s;
s->type = sect->sym->type | SSUB; s->type = sect->sym->type | SSUB;

2
src/run.bat
View File

@ -54,8 +54,6 @@ echo.
if not "%GOHOSTOS%-%GOOS%-%GOARCH%-%CGO_ENABLED%" == "windows-windows-amd64-1" goto norace if not "%GOHOSTOS%-%GOOS%-%GOARCH%-%CGO_ENABLED%" == "windows-windows-amd64-1" goto norace
echo # Testing race detector. echo # Testing race detector.
echo # skipping test due to bug (http://code.google.com/p/go/issues/detail?id=4948).
goto norace
go test -race -i flag go test -race -i flag
if errorlevel 1 goto fail if errorlevel 1 goto fail
go test -race -short flag go test -race -short flag