From patchwork Wed Oct 16 10:55:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 283919 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 32C2C2C009C for ; Wed, 16 Oct 2013 21:55:33 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=RfS//jqC+do4qNwU 3cCbUrQbnZgfs3ie/68rg3BVd38LXOJmH7hhZ57eBcDFpukJq2ahTF11IUvgnCpq VV16tvGXICvp+uBIsU45kt4FlZB2a490KmjyPQNdKRlJ55hkjFgIsTgGU++Dx0tt gihjfeuUc5XmeEeoLgCsqxp5fX0= 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:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=jwftlKICmF+7fLwLx7EXk1 eGxe8=; b=PGebXWFzPlEdXAPLY6XTFxUrNOZBaoqfGMIDtiM5UuTNvw/GOaDHkN gK+R2eK5932I9wqLWR08IGTuEvl60I1Syqd7k6J7lrrrUVv+Pdd2CPmLiB8gVIdA fHzEchPdktiWXQ3W3Fk10GUDxisSbzDsVSPggLnT1CeP3tjX+ZCEk= Received: (qmail 18641 invoked by alias); 16 Oct 2013 10:55:27 -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 18628 invoked by uid 89); 16 Oct 2013 10:55:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 16 Oct 2013 10:55:25 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VWOl6-0004Yu-1N from Thomas_Schwinge@mentor.com ; Wed, 16 Oct 2013 03:55:20 -0700 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 16 Oct 2013 03:55:20 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.2.247.3; Wed, 16 Oct 2013 11:55:18 +0100 From: Thomas Schwinge To: Kyrill Tkachov CC: 'Jakub Jelinek' , GCC Patches Subject: Re: [PATCH] Move effective target check after other directives in c-c++-common/cpp/openmp-define-3.c In-Reply-To: <525E6268.3010506@arm.com> References: <525BC6CD.5070505@arm.com> <87k3hdr2ii.fsf@schwinge.name> <525E6268.3010506@arm.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.4.1 (x86_64-pc-linux-gnu) Date: Wed, 16 Oct 2013 12:55:11 +0200 Message-ID: <87bo2pqycw.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Wed, 16 Oct 2013 10:54:48 +0100, Kyrill Tkachov wrote: > >> --- a/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c > >> +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c > >> @@ -1,6 +1,6 @@ > >> -/* { dg-require-effective-target fopenmp } */ > >> /* { dg-options "-fopenmp" } */ > >> /* { dg-do preprocess } */ > >> +/* { dg-require-effective-target fopenmp } */ > > The other testsuite files that I added in r203417 should also be adapted > > accordingly. Do you want to do that, or want me to do it? > I'll leave the honors to you :) Sure. ;-) Pushed to trunk, r203697: gcc/testsuite/ * c-c++-common/cpp/openmp-define-1.c: Move dg-require-effective-target fopenmp after dg-do directive. * c-c++-common/cpp/openmp-define-2.c: Likewise. * gfortran.dg/openmp-define-1.f90: Likewise. * gfortran.dg/openmp-define-2.f90: Likewise. * gfortran.dg/openmp-define-3.f90: Likewise. Completion of r203588, fix-up for r203417. Grüße, Thomas diff --git gcc/testsuite/c-c++-common/cpp/openmp-define-1.c gcc/testsuite/c-c++-common/cpp/openmp-define-1.c index 0e7943a..c537922 100644 --- gcc/testsuite/c-c++-common/cpp/openmp-define-1.c +++ gcc/testsuite/c-c++-common/cpp/openmp-define-1.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target fopenmp } */ /* { dg-do preprocess } */ +/* { dg-require-effective-target fopenmp } */ #ifdef _OPENMP # error _OPENMP defined diff --git gcc/testsuite/c-c++-common/cpp/openmp-define-2.c gcc/testsuite/c-c++-common/cpp/openmp-define-2.c index f777789..8823e29 100644 --- gcc/testsuite/c-c++-common/cpp/openmp-define-2.c +++ gcc/testsuite/c-c++-common/cpp/openmp-define-2.c @@ -1,6 +1,6 @@ -/* { dg-require-effective-target fopenmp } */ /* { dg-options "-fno-openmp" } */ /* { dg-do preprocess } */ +/* { dg-require-effective-target fopenmp } */ #ifdef _OPENMP # error _OPENMP defined diff --git gcc/testsuite/gfortran.dg/openmp-define-1.f90 gcc/testsuite/gfortran.dg/openmp-define-1.f90 index d4ef1d1..4e1c076 100644 --- gcc/testsuite/gfortran.dg/openmp-define-1.f90 +++ gcc/testsuite/gfortran.dg/openmp-define-1.f90 @@ -1,6 +1,6 @@ -! { dg-require-effective-target fopenmp } ! { dg-options "-cpp" } ! { dg-do preprocess } +! { dg-require-effective-target fopenmp } #ifdef _OPENMP # error _OPENMP defined diff --git gcc/testsuite/gfortran.dg/openmp-define-2.f90 gcc/testsuite/gfortran.dg/openmp-define-2.f90 index 651dae7..cd167ea 100644 --- gcc/testsuite/gfortran.dg/openmp-define-2.f90 +++ gcc/testsuite/gfortran.dg/openmp-define-2.f90 @@ -1,6 +1,6 @@ -! { dg-require-effective-target fopenmp } ! { dg-options "-cpp -fno-openmp" } ! { dg-do preprocess } +! { dg-require-effective-target fopenmp } #ifdef _OPENMP # error _OPENMP defined diff --git gcc/testsuite/gfortran.dg/openmp-define-3.f90 gcc/testsuite/gfortran.dg/openmp-define-3.f90 index dfc45b1..3d55986 100644 --- gcc/testsuite/gfortran.dg/openmp-define-3.f90 +++ gcc/testsuite/gfortran.dg/openmp-define-3.f90 @@ -1,6 +1,6 @@ -! { dg-require-effective-target fopenmp } ! { dg-options "-cpp -fopenmp" } ! { dg-do preprocess } +! { dg-require-effective-target fopenmp } #ifndef _OPENMP # error _OPENMP not defined