From owner-p4-projects@FreeBSD.ORG  Tue Jun 15 21:07:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB22316A4D0; Tue, 15 Jun 2004 21:07:34 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B201F16A4CE
	for <perforce@freebsd.org>; Tue, 15 Jun 2004 21:07:34 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD5D343D31
	for <perforce@freebsd.org>; Tue, 15 Jun 2004 21:07:34 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5FL7635078110
	for <perforce@freebsd.org>; Tue, 15 Jun 2004 21:07:06 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5FL76Ll078107
	for perforce@freebsd.org; Tue, 15 Jun 2004 21:07:06 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 15 Jun 2004 21:07:06 GMT
Message-Id: <200406152107.i5FL76Ll078107@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 55046 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jun 2004 21:07:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=55046

Change 55046 by peter@peter_daintree on 2004/06/15 21:06:29

	Argh. The search_symbol methods need to compensate for the bases too.
	I think its time to switch to iedwose's alternate strategy.

Affected files ...

.. //depot/projects/hammer/sys/kern/link_elf_obj.c#41 edit

Differences ...

==== //depot/projects/hammer/sys/kern/link_elf_obj.c#41 (text+ko) ====

@@ -772,6 +772,7 @@
 	u_long off = (uintptr_t) (void *) value;
 	u_long diff = off;
 	u_long st_value;
+	Elf_Addr base;
 	const Elf_Sym *es;
 	const Elf_Sym *best = 0;
 	int i;
@@ -779,7 +780,10 @@
 	for (i = 0, es = ef->ddbsymtab; i < ef->ddbsymcnt; i++, es++) {
 		if (es->st_name == 0)
 			continue;
-		st_value = es->st_value + (uintptr_t) (void *) ef->address;
+		base = findbase(ef, es->st_shndx);
+		if (base == 0)
+			base = (Elf_Addr)ef->address;
+		st_value = es->st_value + base;
 		if (off >= st_value) {
 			if (off - st_value < diff) {
 				diff = off - st_value;