From: Shenghou Ma <minux.ma@gmail.com>
Date: Tue, 22 May 2012 18:27:44 +0000 (+0800)
Subject: cmd/ld: take section symbols' value into account for PE
X-Git-Tag: go1.1rc2~3144
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1c4b77a7c8adc6eed393a83991a3a67b88739050;p=gostls13.git

cmd/ld: take section symbols' value into account for PE
    ld -r could generate multiple section symbols for the same section,
but with different values, we have to take that into account.
    Fixes #3322.
    Part of issue 3261.
    For CL 5822049.

R=golang-dev, iant, rsc, iant
CC=golang-dev
https://golang.org/cl/5823059
---

diff --git a/src/cmd/ld/ldpe.c b/src/cmd/ld/ldpe.c
index feb8620bdb..942f69ae1a 100644
--- a/src/cmd/ld/ldpe.c
+++ b/src/cmd/ld/ldpe.c
@@ -300,6 +300,11 @@ ldpe(Biobuf *f, char *pkg, int64 len, char *pn)
 					rp->add = le64(rsect->base+rp->off);
 					break;
 			}
+			// ld -r could generate multiple section symbols for the
+			// same section but with different values, we have to take
+			// that into account
+			if (obj->pesym[symindex].name[0] == '.')
+					rp->add += obj->pesym[symindex].value;
 		}
 		qsort(r, rsect->sh.NumberOfRelocations, sizeof r[0], rbyoff);