From: Aram Hăvărneanu <aram@mgk.ro>
Date: Mon, 30 Mar 2015 11:46:28 +0000 (+0200)
Subject: cmd/6l: use .plt instead of .got on Solaris
X-Git-Tag: go1.5beta1~728
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e481aac0e1f7c26ce5c86c5771bcd4ca81e90765;p=gostls13.git

cmd/6l: use .plt instead of .got on Solaris

Solaris requires all external procedures to be accessed through the
PLT. If 6l won't do it, /bin/ld will, so all the code written with .GOT
in mind won't work with the external linker.

This CL makes external linking work, opening the path to cgo support
on Solaris.

This CL breaks the Solaris build, this is fixed in subsequent CLs in
this series.

Change-Id: If370a79f49fdbe66d28b89fa463b4f3e91685f69
Reviewed-on: https://go-review.googlesource.com/8214
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
---

diff --git a/src/cmd/6l/asm.go b/src/cmd/6l/asm.go
index 4df8ac7196..a025ce6ea6 100644
--- a/src/cmd/6l/asm.go
+++ b/src/cmd/6l/asm.go
@@ -272,6 +272,12 @@ func adddynrel(s *ld.LSym, r *ld.Reloc) {
 
 	case obj.R_ADDR:
 		if s.Type == obj.STEXT && ld.Iself {
+			if ld.HEADTYPE == obj.Hsolaris {
+				addpltsym(targ)
+				r.Sym = ld.Linklookup(ld.Ctxt, ".plt", 0)
+				r.Add += int64(targ.Plt)
+				return
+			}
 			// The code is asking for the address of an external
 			// function.  We provide it with the address of the
 			// correspondent GOT symbol.