From owner-p4-projects@FreeBSD.ORG  Fri Aug 21 19:30:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 52A2E1065691; Fri, 21 Aug 2009 19:30:11 +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 17800106568E
	for <perforce@freebsd.org>; Fri, 21 Aug 2009 19:30:11 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 06AB98FC17
	for <perforce@freebsd.org>; Fri, 21 Aug 2009 19:30:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7LJUAIO076490
	for <perforce@freebsd.org>; Fri, 21 Aug 2009 19:30:10 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7LJUA0R076488
	for perforce@freebsd.org; Fri, 21 Aug 2009 19:30:10 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 21 Aug 2009 19:30:10 GMT
Message-Id: <200908211930.n7LJUA0R076488@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167581 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, 21 Aug 2009 19:30:11 -0000

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

Change 167581 by stas@stas_yandex on 2009/08/21 19:29:47

	- Remove local hacks that we don't probably need.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#10 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#10 (text+ko) ====

@@ -2770,9 +2770,6 @@
 {
    Addr brk_limit = VG_(brk_limit);
    Addr brk_new; 
-#ifdef VGP_x86_freebsd
-   ThreadState* tst;
-#endif
 
    /* libc   says: int   brk(void *end_data_segment);
       kernel says: void* brk(void* end_data_segment);  (more or less)
@@ -2792,24 +2789,6 @@
    PRINT("sys_brk ( %#lx )", ARG1);
    PRE_REG_READ1(unsigned long, "brk", unsigned long, end_data_segment);
 
-#if defined(VGO_freebsd)
-#if defined(VGP_x86_freebsd)
-   /* We have to preserve %edx across this call for libc/i386/brk.S */
-   /* QQQ: only on 4.x? or 6.x as well? */
-   tst = VG_(get_ThreadState)(tid);
-   brk_new = do_brk(ARG1);
-   SET_STATUS_Success2( brk_new, tst->arch.vex.guest_EDX );
-#elif defined(VGP_amd64_freebsd)
-   brk_new = do_brk(ARG1);
-   SET_STATUS_Success( brk_new );
-#else
-#error "add your platform"
-#endif
-#else
-   brk_new = do_brk(ARG1);
-   SET_STATUS_Success( brk_new );
-#endif
-
    brk_new = do_brk(ARG1);
    SET_STATUS_Success( brk_new );