From patchwork Wed Nov 6 19:42:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 288991 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DAA752C00AD for ; Thu, 7 Nov 2013 06:44:55 +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:date:message-id:in-reply-to:references :mime-version:content-type; q=dns; s=default; b=AmGPEcITnh+XTz6u 3Eho8Q5/283IitMpUg6d2wPHG+sx+RKDZchaIU0NuQStwnpk3PK1+fFYY3nm9sKE M+RPB2npUcuW+Nw0jgS1xC43toEKkndXLztpxpRNTXACXQSPzs0P0DQ3uKIWikgn A13DxT/1silifjgjvdMXKlN959c= 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:date:message-id:in-reply-to:references :mime-version:content-type; s=default; bh=05vtga6PW4MusatNP/Hrgh Q9T+g=; b=FEnc9zBgNq4M6BYTAkFs1u93Y4fyi9hKk/wPe1Lf6E3Dq0Nhuww/Nq 2p5ClY6hHy0Ry1e6Qsbturhzseyop5LczSfLKIhIGzaregp5t4w1mtY7midGinyd CW065P7niDfV1o4Wg4tz6hrUay6dpAO/CF+8fZjtheV2HhIDbNCuo= Received: (qmail 3457 invoked by alias); 6 Nov 2013 19:44:39 -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 3442 invoked by uid 89); 6 Nov 2013 19:44:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL, BAYES_50, RDNS_NONE autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 06 Nov 2013 19:42:54 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Ve8zu-0000Tg-Sc from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Wed, 06 Nov 2013 11:42:38 -0800 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 6 Nov 2013 11:42:38 -0800 Received: from build5-lucid-cs (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Wed, 6 Nov 2013 11:42:37 -0800 Received: by build5-lucid-cs (Postfix, from userid 49978) id 970D0326809; Wed, 6 Nov 2013 11:42:37 -0800 (PST) From: To: CC: Thomas Schwinge Subject: [gomp4 2/9] libgomp: Prepare for testcases without -fopenmp. Date: Wed, 6 Nov 2013 20:42:16 +0100 Message-ID: <1383766943-8863-2-git-send-email-thomas@codesourcery.com> In-Reply-To: <1383766943-8863-1-git-send-email-thomas@codesourcery.com> References: <878ux1jp2s.fsf@schwinge.name> <1383766943-8863-1-git-send-email-thomas@codesourcery.com> MIME-Version: 1.0 From: Thomas Schwinge libgomp/ * testsuite/lib/libgomp.exp (libgomp_init): Don't add -fopenmp to ALWAYS_CFLAGS. * testsuite/libgomp.c++/c++.exp (ALWAYS_CFLAGS): Add -fopenmp. * testsuite/libgomp.c/c.exp (ALWAYS_CFLAGS): Likewise. * testsuite/libgomp.fortran/fortran.exp (ALWAYS_CFLAGS): Likewise. * testsuite/libgomp.graphite/graphite.exp (ALWAYS_CFLAGS): Likewise. --- libgomp/testsuite/lib/libgomp.exp | 3 --- libgomp/testsuite/libgomp.c++/c++.exp | 3 +++ libgomp/testsuite/libgomp.c/c.exp | 3 +++ libgomp/testsuite/libgomp.fortran/fortran.exp | 3 +++ libgomp/testsuite/libgomp.graphite/graphite.exp | 3 +++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git libgomp/testsuite/lib/libgomp.exp libgomp/testsuite/lib/libgomp.exp index d1d8bc8..c965147 100644 --- libgomp/testsuite/lib/libgomp.exp +++ libgomp/testsuite/lib/libgomp.exp @@ -169,9 +169,6 @@ proc libgomp_init { args } { # Disable color diagnostics lappend ALWAYS_CFLAGS "additional_flags=-fdiagnostics-color=never" - - # And, gee, turn on OpenMP. - lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" } # diff --git libgomp/testsuite/libgomp.c++/c++.exp libgomp/testsuite/libgomp.c++/c++.exp index b336306..88e017e 100644 --- libgomp/testsuite/libgomp.c++/c++.exp +++ libgomp/testsuite/libgomp.c++/c++.exp @@ -11,6 +11,9 @@ set lang_library_path "../libstdc++-v3/src/.libs" # Initialize dg. dg-init +# Turn on OpenMP. +lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" + set blddir [lookfor_file [get_multilibs] libgomp] diff --git libgomp/testsuite/libgomp.c/c.exp libgomp/testsuite/libgomp.c/c.exp index 7dfdf8b..8e902d4 100644 --- libgomp/testsuite/libgomp.c/c.exp +++ libgomp/testsuite/libgomp.c/c.exp @@ -17,6 +17,9 @@ if ![info exists DEFAULT_CFLAGS] then { # Initialize dg. dg-init +# Turn on OpenMP. +lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" + # Gather a list of all tests. set tests [lsort [find $srcdir/$subdir *.c]] diff --git libgomp/testsuite/libgomp.fortran/fortran.exp libgomp/testsuite/libgomp.fortran/fortran.exp index b7fef29..e0bffe3 100644 --- libgomp/testsuite/libgomp.fortran/fortran.exp +++ libgomp/testsuite/libgomp.fortran/fortran.exp @@ -15,6 +15,9 @@ set quadmath_library_path "../libquadmath/.libs" # Initialize dg. dg-init +# Turn on OpenMP. +lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" + if { $blddir != "" } { lappend ALWAYS_CFLAGS "additional_flags=-fintrinsic-modules-path=${blddir}" # Look for a static libgfortran first. diff --git libgomp/testsuite/libgomp.graphite/graphite.exp libgomp/testsuite/libgomp.graphite/graphite.exp index 08aa509..9129964 100644 --- libgomp/testsuite/libgomp.graphite/graphite.exp +++ libgomp/testsuite/libgomp.graphite/graphite.exp @@ -42,6 +42,9 @@ set PARALLEL_CFLAGS "-ansi -pedantic-errors -O2 \ # Initialize `dg'. dg-init +# Turn on OpenMP. +lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" + # Gather a list of all tests. set tests [lsort [find $srcdir/$subdir *.c]]