From patchwork Tue Jun 27 16:19:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 781281 Return-Path: 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wxrjb6v1kz9ryQ for ; Wed, 28 Jun 2017 02:19:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="nV8/FYMJ"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; q=dns; s=default; b=MXzoecptCfWaSivMCjWZE3zrtgv3HW sTyDjcZPG/4fAIlI8CKMuWOq2sItOJt/2KwY9kyvHDEnVcDgzY7CXuXRQDB10H3b BFF9QJkaJ3Rj3HAUHcvvWu2wIPH4ZZRK3cKJVm9UmRtrsWzUA48PcseDsoV45kPr DlypuRh1DnU3Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:references:mime-version:content-type :in-reply-to; s=default; bh=/PmBIlkROHBFt1ypb7AvLRbuie4=; b=nV8/ FYMJkcAw2ytnijvl++3A6+zuQC1JgNyWpvBLN3q5k++oN9E4m3vmiX49Tu8YToa3 QJkDudvI0oJRIgtWa7bjAfA1BRdLt9jiMMoMRTq71JxxS7Kg2b+yKsGZqtIiyRf3 K+uaFDB2xJzrhSRrC24LR9L8dafPH1x7Br3NPOc= Received: (qmail 97768 invoked by alias); 27 Jun 2017 16:19:32 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 97201 invoked by uid 89); 27 Jun 2017 16:19:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Jun 2017 16:19:30 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EED4AB97A; Tue, 27 Jun 2017 16:19:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9EED4AB97A Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jwakely@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9EED4AB97A Received: from localhost (unknown [10.33.36.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45D2C87F94; Tue, 27 Jun 2017 16:19:29 +0000 (UTC) Date: Tue, 27 Jun 2017 17:19:28 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [PATCH] PR libstdc++/81221 fix namespace qualification for parallel mode Message-ID: <20170627161928.GY5211@redhat.com> References: <20170627144604.GA12842@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170627144604.GA12842@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.8.0 (2017-02-23) On 27/06/17 15:46 +0100, Jonathan Wakely wrote: >std::sample needs to call _GLIBCXX_STD_A::__sample instead of >std::__sample, so that it works when Parallel Mode is active. > > PR libstdc++/81221 > * include/bits/stl_algo.h (sample): Qualify with _GLIBCXX_STD_A not > std. > * testsuite/25_algorithms/sample/81221.cc: New. > >Tested powerpc64le-linux, committed to trunk, and will commit to the >gcc-7-branch shortly. I forgot that tests can't use -D_GLIBCXX_PARALLEL if libgomp isn't available. This makes it conditional on running "make check-parallel" Commnitted to trunk. commit 8fb437bed6c707288f8d1fa6c27c6e3ed6b422a4 Author: Jonathan Wakely Date: Tue Jun 27 16:31:25 2017 +0100 PR libstdc++/81221 only run new test for check-parallel PR libstdc++/81221 * testsuite/25_algorithms/sample/81221.cc: Disable except for check-parallel. diff --git a/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc b/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc index e6dd5e0..28ec0e3 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sample/81221.cc @@ -17,7 +17,6 @@ // { dg-options "-std=gnu++17" } // { dg-do compile { target c++1z } } +// { dg-require-parallel-mode "" } -#undef _GLIBCXX_PARALLEL -#define _GLIBCXX_PARALLEL 1 #include