From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 04:13:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 37756106567F; Fri,  7 Nov 2008 04:13:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EEFD61065670
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 04:12:59 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DE5F38FC16
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 04:12:59 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA74CxNU077851
	for <perforce@freebsd.org>; Fri, 7 Nov 2008 04:12:59 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA74CxOc077849
	for perforce@freebsd.org; Fri, 7 Nov 2008 04:12:59 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 7 Nov 2008 04:12:59 GMT
Message-Id: <200811070412.mA74CxOc077849@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 152612 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, 07 Nov 2008 04:13:00 -0000

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

Change 152612 by peter@peter_hammer on 2008/11/07 04:12:06

	Deal with execing 32 bit binaries and the interpreter subterfuge

Affected files ...

.. //depot/projects/valgrind/coregrind/m_ume.c#5 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_ume.c#5 (text+ko) ====

@@ -401,6 +401,14 @@
 	 buf[ph->p_filesz] = '\0';
 
 //VG_(printf)("interpreter is %s\n", buf);
+#if defined(VGP_x86_freebsd)
+         /* Hack.  FreeBSD's kernel overloads the interpreter name. */
+         if (VG_(strcmp)(buf, "/libexec/ld-elf.so.1") == 0 ||
+	     VG_(strcmp)(buf, "/usr/libexec/ld-elf.so.1") == 0) {
+	    sres = VG_(open)("/libexec/ld-elf32.so.1", VKI_O_RDONLY, 0);
+	 }
+	 if (sres.isError)
+#endif
 	 sres = VG_(open)(buf, VKI_O_RDONLY, 0);
          if (sres.isError) {
 	    VG_(printf)("valgrind: m_ume.c: can't open interpreter\n");