From owner-p4-projects@FreeBSD.ORG  Fri Jul 22 00:20:11 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1E2D16A428; Fri, 22 Jul 2005 00:20:10 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 5853716A426
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:20:10 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2663043D46
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:20:10 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6M0K9Ic033432
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:20:09 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6M0K945033429
	for perforce@freebsd.org; Fri, 22 Jul 2005 00:20:09 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 22 Jul 2005 00:20:09 GMT
Message-Id: <200507220020.j6M0K945033429@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>
Cc: 
Subject: PERFORCE change 80722 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 22 Jul 2005 00:20:11 -0000

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

Change 80722 by peter@peter_melody on 2005/07/22 00:19:09

	enable 32 bit gdb to work in a 64 bit universe

Affected files ...

.. //depot/projects/hammer/contrib/gdb/gdb/solib-svr4.c#3 edit
.. //depot/projects/hammer/sys/conf/files#119 edit

Differences ...

==== //depot/projects/hammer/contrib/gdb/gdb/solib-svr4.c#3 (text+ko) ====

@@ -1027,7 +1027,14 @@
          be trivial on GNU/Linux).  Therefore, we have to try an alternate
          mechanism to find the dynamic linker's base address.  */
 
-      tmp_fd  = solib_open (buf, &tmp_pathname);
+#if defined(__i386__) || defined(COMPAT_32BIT)
+      if ((strcmp(buf, "/usr/libexec/ld-elf.so.1") == 0 ||
+	   strcmp(buf, "/libexec/ld-elf.so.1") == 0) &&
+	  access("/libexec/ld-elf32.so.1", 0) == 0)
+	tmp_fd  = solib_open ("/libexec/ld-elf32.so.1", &tmp_pathname);
+      else
+#endif
+	tmp_fd  = solib_open (buf, &tmp_pathname);
       if (tmp_fd >= 0)
 	tmp_bfd = bfd_fdopenr (tmp_pathname, gnutarget, tmp_fd);
 

==== //depot/projects/hammer/sys/conf/files#119 (text+ko) ====

@@ -1298,6 +1298,7 @@
 kern/vfs_subr.c			standard
 kern/vfs_syscalls.c		standard
 kern/vfs_vnops.c		standard
+kern/ylock.c			optional ylock
 #
 # These files in libkern/ are those needed by all architectures.  Some
 # of the files in libkern/ are only needed on some architectures, e.g.,