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 78232c07598aa97c2ba4593c4f013b7124defe9d..a5ca7d3c3b5869b7a6a47c7509254f4c7d8742d3 100644 (file)
--- 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 6c69953cf1cdb89611076288bddda4dcd2b0daaa..698194f849b9b1906fc86c8b9bcbe4507a5700b6 100644 (file)
--- 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++;