From patchwork Wed Oct 12 23:04:10 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Aldy Hernandez <aldyh@redhat.com>
X-Patchwork-Id: 119326
Return-Path: 
 <gcc-patches-return-304262-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id A4D37B6F71
	for <incoming@patchwork.ozlabs.org>;
	Thu, 13 Oct 2011 10:04:38 +1100 (EST)
Received: (qmail 25015 invoked by alias); 12 Oct 2011 23:04:36 -0000
Received: (qmail 25005 invoked by uid 22791); 12 Oct 2011 23:04:35 -0000
X-SWARE-Spam-Status: No, hits=-6.6 required=5.0	tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_SV
X-Spam-Check-By: sourceware.org
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Wed, 12 Oct 2011 23:04:13 +0000
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])	by
	mx1.redhat.com (8.14.4/8.14.4) with ESMTP id
	p9CN4BRo017600	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA
	bits=256 verify=OK)	for <gcc-patches@gcc.gnu.org>;
	Wed, 12 Oct 2011 19:04:11 -0400
Received: from houston.quesejoda.com (vpn-237-75.phx2.redhat.com
	[10.3.237.75])	by int-mx09.intmail.prod.int.phx2.redhat.com
	(8.14.4/8.14.4) with ESMTP id p9CN4BtU014145;
	Wed, 12 Oct 2011 19:04:11 -0400
Message-ID: <4E961CEA.7010009@redhat.com>
Date: Wed, 12 Oct 2011 18:04:10 -0500
From: Aldy Hernandez <aldyh@redhat.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:6.0.2) Gecko/20110906 Thunderbird/6.0.2
MIME-Version: 1.0
To: Andrew MacLeod <amacleod@redhat.com>,
	gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [cxx-mem-model] merge from trunk @ 179855
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Nothing major to report.  I found a small buglet in 
gcc/testsuite/g++.dg/dg.exp that is left over from the memmodel -> 
simulate-thread rename.

I also found that trunk does not have the following change to 
g++.dg/dg.exp and I will submit this as a follow up (to trunk).

Committed to branch.

houston:/source/cxx-mem-model-merge/gcc/testsuite/g++.dg$ svn diff *.exp

Index: dg.exp
===================================================================
--- dg.exp      (revision 179857)
+++ dg.exp      (working copy)
@@ -48,7 +48,7 @@ set tests [prune $tests $srcdir/$subdir/
  set tests [prune $tests $srcdir/$subdir/torture/*]
  set tests [prune $tests $srcdir/$subdir/graphite/*]
  set tests [prune $tests $srcdir/$subdir/guality/*]
-set tests [prune $tests $srcdir/$subdir/memmodel/*]
+set tests [prune $tests $srcdir/$subdir/simulate-thread/*]

  # Main loop.
  dg-runtest $tests "" $DEFAULT_CXXFLAGS