From owner-p4-projects  Sat Sep 21 19: 0:49 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12BD837B404; Sat, 21 Sep 2002 19:00:46 -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 86CF537B401
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 19:00:45 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ADCD743E4A
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 19:00:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M20iCo055524
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 19:00:44 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M20inS055514
	for perforce@freebsd.org; Sat, 21 Sep 2002 19:00:44 -0700 (PDT)
Date: Sat, 21 Sep 2002 19:00:44 -0700 (PDT)
Message-Id: <200209220200.g8M20inS055514@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 17900 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17900

Change 17900 by peter@peter_overcee on 2002/09/21 18:59:57

	finish up (almost). The kld relocator for PC32 still needs to be finished.

Affected files ...

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

Differences ...

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

@@ -72,13 +72,13 @@
 	exec_setregs
 };
 
-static Elf32_Brandinfo freebsd_brand_info = {
+static Elf64_Brandinfo freebsd_brand_info = {
 						ELFOSABI_FREEBSD,
 						EM_X86_64,
 						"FreeBSD",
 						"",
 						"/usr/libexec/ld-elf.so.1",
-						&elf32_freebsd_sysvec
+						&elf64_freebsd_sysvec
 					  };
 
 SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -89,7 +89,6 @@
 int
 elf_reloc(linker_file_t lf, const void *data, int type)
 {
-#if 0
 	Elf_Addr relocbase = (Elf_Addr) lf->address;
 	Elf_Addr *where;
 	Elf_Addr addr;
@@ -119,10 +118,10 @@
 
 	switch (rtype) {
 
-		case R_386_NONE:	/* none */
+		case R_X86_64_NONE:	/* none */
 			break;
 
-		case R_386_32:		/* S + A */
+		case R_X86_64_64:		/* S + A */
 			addr = elf_lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
@@ -131,16 +130,17 @@
 				*where = addr;
 			break;
 
-		case R_386_PC32:	/* S + A - P */
+		case R_X86_64_PC32:	/* S + A - P */
 			addr = elf_lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
 			addr += addend - (Elf_Addr)where;
+			XXX needs to be 32 bit *where, not 64 bit
 			if (*where != addr)
 				*where = addr;
 			break;
 
-		case R_386_COPY:	/* none */
+		case R_X86_64_COPY:	/* none */
 			/*
 			 * There shouldn't be copy relocations in kernel
 			 * objects.
@@ -149,7 +149,7 @@
 			return -1;
 			break;
 
-		case R_386_GLOB_DAT:	/* S */
+		case R_X86_64_GLOB_DAT:	/* S */
 			addr = elf_lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
@@ -157,7 +157,7 @@
 				*where = addr;
 			break;
 
-		case R_386_RELATIVE:	/* B + A */
+		case R_X86_64_RELATIVE:	/* B + A */
 			addr = relocbase + addend;
 			if (*where != addr)
 				*where = addr;
@@ -168,6 +168,5 @@
 			       rtype);
 			return -1;
 	}
-#endif
 	return(0);
 }

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message