From: Shenghou Ma <minux@golang.org>
Date: Fri, 5 Dec 2014 07:22:20 +0000 (-0500)
Subject: [dev.cc] cmd/ld: finalize linkmode before determining whether to import runtime/cgo
X-Git-Tag: go1.5beta1~2688^2~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=274976f45c9b2c3f9140768b457e9140ea65bfb4;p=gostls13.git

[dev.cc] cmd/ld: finalize linkmode before determining whether to import runtime/cgo

Frankly, I don't understand how the current code could possibly work except
when every android program is using cgo. Discovered this while working on
the iOS port.

LGTM=crawshaw, rsc
R=rsc, crawshaw
CC=golang-codereviews
https://golang.org/cl/177470043
---

diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c
index 64608d226e..925274bfd3 100644
--- a/src/cmd/ld/lib.c
+++ b/src/cmd/ld/lib.c
@@ -202,7 +202,18 @@ loadlib(void)
 		iscgo |= strcmp(ctxt->library[i].pkg, "runtime/cgo") == 0;
 		objfile(ctxt->library[i].file, ctxt->library[i].pkg);
 	}
-	
+
+	if(linkmode == LinkAuto) {
+		if(iscgo && externalobj)
+			linkmode = LinkExternal;
+		else
+			linkmode = LinkInternal;
+
+		// Force external linking for android.
+		if(strcmp(goos, "android") == 0)
+			linkmode = LinkExternal;
+	}
+
 	if(linkmode == LinkExternal && !iscgo) {
 		// This indicates a user requested -linkmode=external.
 		// The startup code uses an import of runtime/cgo to decide
@@ -229,17 +240,6 @@ loadlib(void)
 		}
 	}
 
-	if(linkmode == LinkAuto) {
-		if(iscgo && externalobj)
-			linkmode = LinkExternal;
-		else
-			linkmode = LinkInternal;
-
-		// Force external linking for android.
-		if(strcmp(goos, "android") == 0)
-			linkmode = LinkExternal;
-	}
-
 	if(linkmode == LinkInternal) {
 		// Drop all the cgo_import_static declarations.
 		// Turns out we won't be needing them.