From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 16 Sep 2015 10:06:16 +0000 (+1200)
Subject: cmd/link: fix addition of -Wl,-z,relro
X-Git-Tag: go1.6beta1~1056
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9a6a8a0586117f67ae6dd9eae5811d1fc2ba8575;p=gostls13.git

cmd/link: fix addition of -Wl,-z,relro

Not sure how I managed to do this, or get it past review.

Change-Id: I141b97ef8e09dcc9c910c45493a584a3dced2b28
Reviewed-on: https://go-review.googlesource.com/14634
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index 7bcc6f5375..d511e1bff4 100644
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -1001,9 +1001,9 @@ func hostlink() {
 		// anyway.
 		argv = append(argv, "-Wl,-Bsymbolic-functions")
 		if UseRelro() {
-			argv = append(argv, "-shared")
+			argv = append(argv, "-Wl,-z,relro")
 		}
-		argv = append(argv, "-Wl,-z,relro")
+		argv = append(argv, "-shared")
 	}
 
 	if Linkshared && Iself {