From b35019fe9ad730216bacc665fa8144c49be695ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9my=20Oudompheng?= Date: Wed, 20 Mar 2013 08:32:11 +0100 Subject: [PATCH] cmd/ld: remove remaining occurrence of isobj. Fixes cgo builds. R=golang-dev, minux.ma CC=golang-dev https://golang.org/cl/7784044 --- src/cmd/ld/lib.h | 1 - src/cmd/ld/symtab.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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++; -- 2.50.0