Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Jul 2002 20:41:47 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 14496 for review
Message-ID:  <200207200341.g6K3flus010731@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14496

Change 14496 by peter@peter_daintree on 2002/07/19 20:41:36

	Mismerge

Affected files ...

.. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#5 edit

Differences ...

==== //depot/projects/ia64/sys/i386/i386/elf_machdep.c#5 (text+ko) ====

@@ -70,39 +70,6 @@
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&freebsd_brand_info);
 
-struct sysentvec elf32_freebsd_sysvec = {
-        SYS_MAXSYSCALL,
-        sysent,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        elf32_freebsd_fixup,
-        sendsig,
-        sigcode,
-        &szsigcode,
-        0,
-	"FreeBSD ELF32",
-	__elfN(coredump),
-	NULL,
-	MINSIGSTKSZ
-};
-
-static Elf32_Brandinfo freebsd_brand_info = {
-						ELFOSABI_FREEBSD,
-						EM_386,
-						"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,
-	&freebsd_brand_info);
-
 /* Process one elf relocation with addend. */
 int
 elf_reloc(linker_file_t lf, const void *data, int type)

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?200207200341.g6K3flus010731>