From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 20:38:00 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 273D337B404; Sat,  5 Apr 2003 20:38:00 -0800 (PST)
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 BB7A137B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 20:37:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 64FF543FBD
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 20:37:59 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h364bx0U067425
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 20:37:59 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h364bwCY067422
	for perforce@freebsd.org; Sat, 5 Apr 2003 20:37:58 -0800 (PST)
Date: Sat, 5 Apr 2003 20:37:58 -0800 (PST)
Message-Id: <200304060437.h364bwCY067422@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28294 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Apr 2003 04:38:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=28294

Change 28294 by peter@peter_overcee on 2003/04/05 20:37:47

	look for "elf32 *" before "elf *"

Affected files ...

.. //depot/projects/hammer/sys/kern/link_elf.c#10 edit

Differences ...

==== //depot/projects/hammer/sys/kern/link_elf.c#10 (text+ko) ====

@@ -258,7 +258,9 @@
 
     dp = (Elf_Dyn*) &_DYNAMIC;
     modname = NULL;
-    modptr = preload_search_by_type("elf kernel");
+    modptr = preload_search_by_type("elf" __XSTRING(__ELF_WORD_SIZE) " kernel");
+    if (modptr == NULL)
+	modptr = preload_search_by_type("elf kernel");
     if (modptr)
 	modname = (char *)preload_search_info(modptr, MODINFO_NAME);
     if (modname == NULL)
@@ -462,7 +464,9 @@
     baseptr = preload_search_info(modptr, MODINFO_ADDR);
     sizeptr = preload_search_info(modptr, MODINFO_SIZE);
     dynptr = preload_search_info(modptr, MODINFO_METADATA|MODINFOMD_DYNAMIC);
-    if (type == NULL || strcmp(type, "elf module") != 0)
+    if (type == NULL ||
+	(strcmp(type, "elf" __XSTRING(__ELF_WORD_SIZE) " module") != 0 &&
+	 strcmp(type, "elf module") != 0))
 	return (EFTYPE);
     if (baseptr == NULL || sizeptr == NULL || dynptr == NULL)
 	return (EINVAL);