Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Sep 2002 02:36:25 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 17847 for review
Message-ID:  <200209210936.g8L9aPLS013280@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209210936.g8L9aPLS013280>