From owner-p4-projects@FreeBSD.ORG  Mon Nov 10 22:02:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4158C106567E; Mon, 10 Nov 2008 22:02:36 +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 0568E1065674
	for <perforce@freebsd.org>; Mon, 10 Nov 2008 22:02:36 +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 E54AE8FC0C
	for <perforce@freebsd.org>; Mon, 10 Nov 2008 22:02:35 +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 mAAM2Zs2039827
	for <perforce@freebsd.org>; Mon, 10 Nov 2008 22:02:35 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAAM2ZFF039825
	for perforce@freebsd.org; Mon, 10 Nov 2008 22:02:35 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Mon, 10 Nov 2008 22:02:35 GMT
Message-Id: <200811102202.mAAM2ZFF039825@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 152772 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: Mon, 10 Nov 2008 22:02:36 -0000

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

Change 152772 by peter@peter_freefall on 2008/11/10 22:01:48

	Deal with $LD_32_PRELOAD...

Affected files ...

.. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#4 (text+ko) ====

@@ -217,9 +217,9 @@
 static HChar** setup_client_env ( HChar** origenv, const HChar* toolname)
 {
    HChar* preload_core    = "vgpreload_core";
-   HChar* ld_preload      = "LD_PRELOAD=";
+   HChar* ld_preload;
    HChar* v_launcher      = VALGRIND_LAUNCHER "=";
-   Int    ld_preload_len  = VG_(strlen)( ld_preload );
+   Int    ld_preload_len;
    Int    v_launcher_len  = VG_(strlen)( v_launcher );
    Bool   ld_preload_done = False;
    Int    vglib_len       = VG_(strlen)(VG_(libdir));
@@ -277,6 +277,15 @@
    
    vg_assert(envc == (cpp - ret));
 
+   ld_preload      = "LD_PRELOAD=";
+   ld_preload_len  = VG_(strlen)( ld_preload );
+#if defined(VGP_x86_freebsd)
+   if (VG_(is32on64)())
+      ld_preload      = "LD_32_PRELOAD=";
+   else
+#endif
+      ld_preload      = "LD_PRELOAD=";
+   ld_preload_len  = VG_(strlen)( ld_preload );
    /* Walk over the new environment, mashing as we go */
    for (cpp = ret; cpp && *cpp; cpp++) {
       if (VG_(memcmp)(*cpp, ld_preload, ld_preload_len) == 0) {