Initial work on shared library.

Change-Id: I2e779fa1b8fe14894adc0611fdfaa9bfa537e446
nadiasvertex · Dec 19, 2015 · 4a4e022 · 4a4e022
1 parent 916c14f
commit 4a4e022
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
@@ -352,7 +352,8 @@ func buildModeInit() {
 		} else {
 			switch platform {
 			case "linux/amd64", "linux/arm", "linux/arm64", "linux/386",
-				"android/amd64", "android/arm", "android/arm64", "android/386":
+				"android/amd64", "android/arm", "android/arm64", "android/386",
+				"windows/amd64":
 				codegenArg = "-shared"
 			case "darwin/amd64":
 			default:

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
@@ -1067,7 +1067,7 @@ func hostlink() {
 	if HEADTYPE == obj.Hopenbsd {
 		argv = append(argv, "-Wl,-nopie")
 	}
-	if HEADTYPE == obj.Hwindows {
+	if HEADTYPE == obj.Hwindows && Buildmode == BuildmodeExe {
 		if headstring == "windowsgui" {
 			argv = append(argv, "-mwindows")
 		} else {
@@ -1091,9 +1091,14 @@ func hostlink() {
 			if UseRelro() {
 				argv = append(argv, "-Wl,-z,relro")
 			}
+
+			argv = append(argv, "-shared")
+
 			// Pass -z nodelete to mark the shared library as
 			// non-closeable: a dlclose will do nothing.
-			argv = append(argv, "-shared", "-Wl,-z,nodelete")
+			if HEADTYPE != obj.Hwindows {
+				argv = append(argv, "-Wl,-z,nodelete")
+			}
 		}
 	case BuildmodeShared:
 		if UseRelro() {