From: Russ Cox <rsc@golang.org>
Date: Fri, 2 Jul 2010 04:48:13 +0000 (-0700)
Subject: ld: fix handling of "". names in #pragma dynimport/dynexport
X-Git-Tag: weekly.2010-07-14~47
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=44eaaaaa78ae0e716018b203bebd9821c52ba05d;p=gostls13.git

ld: fix handling of "". names in #pragma dynimport/dynexport

Fixes #728.

R=r
CC=golang-dev
https://golang.org/cl/1706053
---

diff --git a/src/cmd/ld/go.c b/src/cmd/ld/go.c
index 015f34db21..46ae5ff74d 100644
--- a/src/cmd/ld/go.c
+++ b/src/cmd/ld/go.c
@@ -66,7 +66,7 @@ ilookup(char *name)
 }
 
 static void loadpkgdata(char*, char*, char*, int);
-static void loaddynimport(char*, char*, int);
+static void loaddynimport(char*, char*, char*, int);
 static void loaddynexport(char*, char*, char*, int);
 static int parsemethod(char**, char*, char**);
 static int parsepkgdata(char*, char*, char**, char*, char**, char**, char**);
@@ -194,7 +194,7 @@ ldpkg(Biobuf *f, char *pkg, int64 len, char *filename, int whence)
 				errorexit();
 			return;
 		}
-		loaddynimport(filename, p0 + 1, p1 - (p0+1));
+		loaddynimport(filename, pkg, p0 + 1, p1 - (p0+1));
 	}
 
 	// look for dynexp section
@@ -397,7 +397,7 @@ parsemethod(char **pp, char *ep, char **methp)
 }
 
 static void
-loaddynimport(char *file, char *p, int n)
+loaddynimport(char *file, char *pkg, char *p, int n)
 {
 	char *pend, *next, *name, *def, *p0, *lib;
 	Sym *s;
@@ -432,6 +432,8 @@ loaddynimport(char *file, char *p, int n)
 		*strchr(name, ' ') = 0;
 		*strchr(def, ' ') = 0;
 
+		name = expandpkg(name, pkg);
+
 		s = lookup(name, 0);
 		s->dynimplib = lib;
 		s->dynimpname = def;