From: Joel Sing <jsing@google.com>
Date: Wed, 14 Nov 2012 16:36:19 +0000 (+1100)
Subject: debug/elf: fix offset for GNU version symbols
X-Git-Tag: go1.1rc2~1870
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8c96e6d7404f27f473f97dcef8b9fc1f7f7161da;p=gostls13.git

debug/elf: fix offset for GNU version symbols

Since we no longer skip the first entry when reading a symbol table,
we no longer need to allow for the offset difference when processing
the GNU version symbols.

Unbreaks builds on Linux.

R=golang-dev, agl, iant
CC=golang-dev
https://golang.org/cl/6843057
---

diff --git a/src/pkg/debug/elf/file.go b/src/pkg/debug/elf/file.go
index 25b04d7959..b030b043df 100644
--- a/src/pkg/debug/elf/file.go
+++ b/src/pkg/debug/elf/file.go
@@ -700,8 +700,8 @@ func (f *File) gnuVersionInit(str []byte) {
 // gnuVersion adds Library and Version information to sym,
 // which came from offset i of the symbol table.
 func (f *File) gnuVersion(i int, sym *ImportedSymbol) {
-	// Each entry is two bytes; skip undef entry at beginning.
-	i = (i + 1) * 2
+	// Each entry is two bytes.
+	i = i * 2
 	if i >= len(f.gnuVersym) {
 		return
 	}