From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 22:48:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A921C1065672; Fri,  7 Nov 2008 22:48:01 +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 6D7091065670
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 22:48:01 +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 5BDD28FC12
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 22:48:01 +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 mA7Mm1tP058990
	for <perforce@freebsd.org>; Fri, 7 Nov 2008 22:48:01 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA7Mm1jc058988
	for perforce@freebsd.org; Fri, 7 Nov 2008 22:48:01 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Fri, 7 Nov 2008 22:48:01 GMT
Message-Id: <200811072248.mA7Mm1jc058988@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 152637 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 22:48:02 -0000

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

Change 152637 by peter@peter_overcee on 2008/11/07 22:47:49

	Rearrange deck chairs to make gcc happier.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#10 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#10 (text+ko) ====

@@ -350,8 +350,8 @@
 #if defined(VGP_x86_freebsd)
   Int is32on64;
 #endif
+  Bool have_sigtimedwait_zero = True;
 #endif
-  Bool have_sigtimedwait_zero = True;
   static const struct vki_timespec zero = { 0, 0 };
 
 #if __FreeBSD__ < 7
@@ -364,14 +364,14 @@
   if (is32on64 && osreldate < 700000)
      have_sigtimedwait_zero = False;
 #endif
+  if (have_sigtimedwait_zero) {
 #endif
-  if (have_sigtimedwait_zero) {
      SysRes res = VG_(do_syscall3)(__NR_sigtimedwait, (UWord)set, (UWord)info, 
                                    (UWord)&zero);
      return res.isError ? -1 : res.res;
+#if __FreeBSD__ < 7
   }
 
-#if __FreeBSD__ < 7
   /* Find out what's pending: FreeBSD sigpending */
   sr = VG_(do_syscall1)(__NR_sigpending, (UWord)&pending);
   vg_assert(!sr.isError);