From owner-p4-projects@FreeBSD.ORG  Tue Oct 28 11:41: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 6D23B106567A; Tue, 28 Oct 2008 11:41: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 306C3106566B
	for <perforce@freebsd.org>; Tue, 28 Oct 2008 11:41:00 +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 203208FC17
	for <perforce@freebsd.org>; Tue, 28 Oct 2008 11:41:00 +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 m9SBf02u098493
	for <perforce@freebsd.org>; Tue, 28 Oct 2008 11:41:00 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBf0OY098491
	for perforce@freebsd.org; Tue, 28 Oct 2008 11:41:00 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Tue, 28 Oct 2008 11:41:00 GMT
Message-Id: <200810281141.m9SBf0OY098491@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 152097 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: Tue, 28 Oct 2008 11:41:00 -0000

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

Change 152097 by peter@peter_overcee on 2008/10/28 11:40:55

	Stop the debug reader from choking when it finds a 64 bit memcheck instance
	in procfs.  Our procfs doesn't have file offsets, and procstat doesn't either.
	Tweaking the alignment here causes binutils to generate a single PT_LOAD segment
	and that fools valgrind into not thinking that it might be an elf binary. (!)

Affected files ...

.. //depot/projects/valgrind/Makefile.am#7 edit

Differences ...

==== //depot/projects/valgrind/Makefile.am#7 (text+ko) ====

@@ -223,6 +223,7 @@
 	$(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \
 		-e '1,/^=====\+$$/d' \
 		-e '/^=====\+$$/d' \
+		-e '/ALIGN/s/0x100000/0x1000/g' \
 		-e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \
 	|| rm -f $@