From owner-p4-projects  Sat Sep 21  2:36:28 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C4B0737B404; Sat, 21 Sep 2002 02:36:25 -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 72DC837B401
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 02:36:25 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 30F4B43E65
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 02:36:25 -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 g8L9aPCo013283
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 02:36:25 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L9aPLS013280
	for perforce@freebsd.org; Sat, 21 Sep 2002 02:36:25 -0700 (PDT)
Date: Sat, 21 Sep 2002 02:36:25 -0700 (PDT)
Message-Id: <200209210936.g8L9aPLS013280@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 17847 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=17847

Change 17847 by peter@peter_overcee on 2002/09/21 02:35:26

	s/elf32/elf64/ for native binaries initially and #If 0 out the reloc
	code

Affected files ...

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

Differences ...

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

@@ -44,7 +44,7 @@
 #include <machine/elf.h>
 #include <machine/md_var.h>
 
-struct sysentvec elf32_freebsd_sysvec = {
+struct sysentvec elf64_freebsd_sysvec = {
 	SYS_MAXSYSCALL,
 	sysent,
 	0,
@@ -58,7 +58,7 @@
 	sigcode,
 	&szsigcode,
 	NULL,
-	"FreeBSD ELF32",
+	"FreeBSD ELF64",
 	__elfN(coredump),
 	NULL,
 	MINSIGSTKSZ,
@@ -74,21 +74,22 @@
 
 static Elf32_Brandinfo freebsd_brand_info = {
 						ELFOSABI_FREEBSD,
-						EM_386,
+						EM_X86_64,
 						"FreeBSD",
 						"",
 						"/usr/libexec/ld-elf.so.1",
 						&elf32_freebsd_sysvec
 					  };
 
-SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY,
-	(sysinit_cfunc_t) elf32_insert_brand_entry,
+SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
+	(sysinit_cfunc_t) elf64_insert_brand_entry,
 	&freebsd_brand_info);
 
 /* Process one elf relocation with addend. */
 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;
@@ -167,5 +168,6 @@
 			       rtype);
 			return -1;
 	}
+#endif
 	return(0);
 }

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