From e0b0f62d96b37dd78811159d6ddd9819f374d603 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Wed, 23 May 2012 11:36:24 +0800 Subject: [PATCH] cmd/ld: fix Linux/ARM build CL 5823055 removed a line introduced in Linux/ARM cgo support. Because readsym() now returns nil for "$a", "$d" mapping symbols, no matter the settings of `needSym', we still have to guard against them in ldelf(). R=golang-dev, dave, rsc CC=golang-dev https://golang.org/cl/6220073 --- src/cmd/ld/ldelf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cmd/ld/ldelf.c b/src/cmd/ld/ldelf.c index 5100b3f4e3..1f58573a68 100644 --- a/src/cmd/ld/ldelf.c +++ b/src/cmd/ld/ldelf.c @@ -575,6 +575,9 @@ ldelf(Biobuf *f, char *pkg, int64 len, char *pn) } if(sym.shndx >= obj->nsect || sym.shndx == 0) continue; + // even when we pass needSym == 1 to readsym, it might still return nil to skip some unwanted symbols + if(sym.sym == S) + continue; sect = obj->sect+sym.shndx; if(sect->sym == nil) { diag("%s: sym#%d: ignoring %s in section %d (type %d)", pn, i, sym.name, sym.shndx, sym.type);