]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/link: fix addition of -Wl,-z,relro
authorMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 16 Sep 2015 10:06:16 +0000 (22:06 +1200)
committerMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 16 Sep 2015 21:16:13 +0000 (21:16 +0000)
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>

src/cmd/link/internal/ld/lib.go

index 7bcc6f5375d6cbaa21816e3da4d113c47de481a1..d511e1bff44ae05d0ea572c9e564184022fb67af 100644 (file)
@@ -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 {