From owner-p4-projects  Fri Jul 19 20:41:53 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D0DF37B401; Fri, 19 Jul 2002 20:41:48 -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 22B1B37B400
	for <perforce@freebsd.org>; Fri, 19 Jul 2002 20:41:48 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D8F2043E6A
	for <perforce@freebsd.org>; Fri, 19 Jul 2002 20:41:47 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K3flJU010734
	for <perforce@freebsd.org>; Fri, 19 Jul 2002 20:41:47 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K3flus010731
	for perforce@freebsd.org; Fri, 19 Jul 2002 20:41:47 -0700 (PDT)
Date: Fri, 19 Jul 2002 20:41:47 -0700 (PDT)
Message-Id: <200207200341.g6K3flus010731@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 14496 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=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