From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Mon, 2 May 2016 01:58:48 +0000 (+1200)
Subject: cmd/link: pass -Wl,-z,relro to host linker in -buildmode=PIE
X-Git-Tag: go1.7beta1~370
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=45f39fb46747d0c46bc25e6ef605c00e96e2dc07;p=gostls13.git

cmd/link: pass -Wl,-z,relro to host linker in -buildmode=PIE

Fixes #15485

Change-Id: I8e9314be91db89873130b232b589a284822e6643
Reviewed-on: https://go-review.googlesource.com/22687
Run-TryBot: Michael Hudson-Doyle <michael.hudson@canonical.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index a193704eb0..711945fbd1 100644
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -1091,6 +1091,9 @@ func hostlink() {
 			argv = append(argv, "-Wl,-pagezero_size,4000000")
 		}
 	case BuildmodePIE:
+		if UseRelro() {
+			argv = append(argv, "-Wl,-z,relro")
+		}
 		argv = append(argv, "-pie")
 	case BuildmodeCShared:
 		if HEADTYPE == obj.Hdarwin {