From owner-p4-projects@FreeBSD.ORG  Fri May 23 18:33:23 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6358D37B405; Fri, 23 May 2003 18:33:22 -0700 (PDT)
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 16B2F37B401
	for <perforce@freebsd.org>; Fri, 23 May 2003 18:33:22 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A6E5443FA3
	for <perforce@freebsd.org>; Fri, 23 May 2003 18:33:21 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4O1XL0U008577
	for <perforce@freebsd.org>; Fri, 23 May 2003 18:33:21 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4O1XLm3008574
	for perforce@freebsd.org; Fri, 23 May 2003 18:33:21 -0700 (PDT)
Date: Fri, 23 May 2003 18:33:21 -0700 (PDT)
Message-Id: <200305240133.h4O1XLm3008574@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 31749 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: Sat, 24 May 2003 01:33:23 -0000

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

Change 31749 by peter@peter_hammer on 2003/05/23 18:32:50

	bah.  When using addend, do not use *where += ...

Affected files ...

.. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#7 edit

Differences ...

==== //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#7 (text+ko) ====

@@ -145,7 +145,7 @@
 		    if (def == NULL)
 			goto done;
 
-		    *where += (Elf_Addr) (defobj->relocbase + def->st_value /* + rela->r_addend*/);
+		    *where = (Elf_Addr) (defobj->relocbase + def->st_value + rela->r_addend);
 		}
 		break;
 
@@ -164,8 +164,8 @@
 		    if (def == NULL)
 			goto done;
 
-		    *where +=
-		      (Elf_Addr) (defobj->relocbase + def->st_value /* + rela->r_addend */) -
+		    *where =
+		      (Elf_Addr) (defobj->relocbase + def->st_value + rela->r_addend) -
 		      (Elf_Addr) where;
 		}
 		break;
@@ -200,7 +200,7 @@
 		break;
 
 	    case R_X86_64_RELATIVE:
-		*where += (Elf_Addr)(obj->relocbase /*+ rela->r_addend*/);
+		*where = (Elf_Addr)(obj->relocbase + rela->r_addend);
 		break;
 
 	/* missing: R_X86_64_GOTPCREL, R_X86_64_32, R_X86_64_32S, R_X86_64_16, R_X86_64_PC16, R_X86_64_8, R_X86_64_PC8 */
@@ -259,7 +259,7 @@
 	def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL);
 	if (def == NULL)
 	    return -1;
-	target = (Elf_Addr)(defobj->relocbase + def->st_value /* + rela->r_addend */);
+	target = (Elf_Addr)(defobj->relocbase + def->st_value + rela->r_addend);
 	reloc_jmpslot(where, target, defobj, obj, (const Elf_Rel *)rela);
     }
     obj->jmpslots_done = true;