From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 19:51:01 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A959B37B41B; Fri,  4 Apr 2003 19:50:59 -0800 (PST)
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 A67D037B404
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 19:50:58 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 339D343FAF
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 19:50:58 -0800 (PST)
	(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 h353ov0U001316
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 19:50:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h353oviN001313
	for perforce@freebsd.org; Fri, 4 Apr 2003 19:50:57 -0800 (PST)
Date: Fri, 4 Apr 2003 19:50:57 -0800 (PST)
Message-Id: <200304050350.h353oviN001313@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 28156 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, 05 Apr 2003 03:51:01 -0000

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

Change 28156 by peter@peter_overcee on 2003/04/04 19:50:55

	make this compile.. XXX hiding here

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#6 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#6 (text+ko) ====

@@ -117,7 +117,7 @@
 	}
 
 	if (local) {
-		if (rtype == R_386_RELATIVE) {	/* A + B */
+		if (rtype == R_X86_64_RELATIVE) {	/* A + B */
 			addr = relocbase + addend;
 			if (*where != addr)
 				*where = addr;
@@ -144,7 +144,7 @@
 			if (addr == 0)
 				return -1;
 			addr += addend - (Elf_Addr)where;
-			XXX needs to be 32 bit *where, not 64 bit
+			/* XXX needs to be 32 bit *where, not 64 bit */
 			if (*where != addr)
 				*where = addr;
 			break;