From: Rémy Oudompheng <oudomphe@phare.normalesup.org>
Date: Wed, 20 Mar 2013 07:32:11 +0000 (+0100)
Subject: cmd/ld: remove remaining occurrence of isobj.
X-Git-Tag: go1.1rc2~430
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b35019fe9ad730216bacc665fa8144c49be695ad;p=gostls13.git

cmd/ld: remove remaining occurrence of isobj.

Fixes cgo builds.

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7784044
---

diff --git a/src/cmd/ld/lib.h b/src/cmd/ld/lib.h
index 78232c0759..a5ca7d3c3b 100644
--- a/src/cmd/ld/lib.h
+++ b/src/cmd/ld/lib.h
@@ -143,7 +143,6 @@ EXTERN	int	nldflag;
 EXTERN	char**	ldflag;
 EXTERN	int	havedynamic;
 EXTERN	int	iscgo;
-EXTERN	int	isobj;
 EXTERN	int	elfglobalsymndx;
 EXTERN	int	flag_race;
 EXTERN	int flag_shared;
diff --git a/src/cmd/ld/symtab.c b/src/cmd/ld/symtab.c
index 6c69953cf1..698194f849 100644
--- a/src/cmd/ld/symtab.c
+++ b/src/cmd/ld/symtab.c
@@ -136,7 +136,7 @@ putelfsym(Sym *x, char *s, int t, vlong addr, vlong size, int ver, Sym *go)
 		return;
 
 	off = putelfstr(s);
-	if(isobj)
+	if(linkmode == LinkExternal)
 		addr -= xo->sect->vaddr;
 	putelfsyment(off, addr, size, (bind<<4)|(type&0xf), xo->sect->elfsect->shnum, (x->type & SHIDDEN) ? 2 : 0);
 	x->elfsym = numelfsym++;