debug/elf: repair GNU version symbols.

After the revert of revision 9ea9e7e6e0c8
the related revision 76ff7da868c6 must be reverted too.

Fixes #5102.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/7961044

diff --git a/src/pkg/debug/elf/file.go b/src/pkg/debug/elf/file.go
index 0d022ab910a80765d7e3c52507b33a744e5b19f3..a55c37ea99f7d18930941135ee45cbced365a22b 100644 (file)
--- a/src/pkg/debug/elf/file.go
+++ b/src/pkg/debug/elf/file.go
@@ -718,7 +718,7 @@ func (f *File) gnuVersionInit(str []byte) {
 // which came from offset i of the symbol table.
 func (f *File) gnuVersion(i int, sym *ImportedSymbol) {
        // Each entry is two bytes.
-       i = i * 2
+       i = (i + 1) * 2
        if i >= len(f.gnuVersym) {
                return
        }