From patchwork Thu May 30 19:59:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cesar Philippidis X-Patchwork-Id: 247693 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 CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 3FA0C2C008F for ; Fri, 31 May 2013 05:59:36 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=cddKkg3HSD/qFmmni7CgU4ow5RaW8m4LGw5w9OkrSgtuGk p/8qm14SHNbSozHNo+7jYNfdBM6guaUFo28wfc5IuACpzFeR9JtqUTSmPn2UFraY LuP+mdR64pf0OiAMzUfN44hVFGYNc7plsAs3mXBDM1QgGIOMxtFdiUItuOGUE= 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 :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=ZzA71D8byL+1KD+bBAQ+VSQf0cU=; b=jcabrCN832+wMpYQGiSP 7K4Hd32jpelb8VNXoLI3znUPokfS+EHkQFeSm6mHgXynKXn8yKOp7n4uapdMW3Hn sm8odK19W5+PFAl2FBL2vZZpV7Vl+F8L5aI3SLVmj7OGolfCXF84pgK75wgvRsVM oZWMvNnAax4fP7H81LK6wZU= Received: (qmail 30721 invoked by alias); 30 May 2013 19:59:21 -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 30602 invoked by uid 89); 30 May 2013 19:59:20 -0000 X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 30 May 2013 19:59:18 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Ui90G-0000oH-Bb from Cesar_Philippidis@mentor.com for gcc-patches@gcc.gnu.org; Thu, 30 May 2013 12:59:16 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 30 May 2013 12:59:16 -0700 Received: from mbp17.localdomain (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.2.247.3; Thu, 30 May 2013 12:59:16 -0700 Message-ID: <51A7AF94.1080706@codesourcery.com> Date: Thu, 30 May 2013 12:59:16 -0700 From: Cesar Philippidis User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Subject: [PATCH] libgomp testsuite fixes X-Virus-Found: No Here is a patch from our backlog at Mentor Graphics that addresses a libgomp issue where setting ENABLE_LTO=1 in site.exp causes the following error with dejagnu: ERROR: (DejaGnu) proc "libgomp_target_compile linker_plugin9263.c linker_plugin9263.exe executable {{additional_flags=-flto -fuse-linker-plugin}}" does not exist. This problem usually does not occur since the default site.exp does not contain ENABLE_LTO=1. I tested both with and without our custom site.exp. Is it OK for trunk? If so, please check it in since I do not have commit rights. Cesar Philippidis 2013-05-30 Iain Sandoe Cesar Philippidis libgomp/ * testsuite/lib/libgomp.exp: Reorder lib loads into dependency order. Do not load_gcc_lib gcc-dg.exp and add a comment as to why. * testsuite/libgomp.c/c.exp: load_gcc_lib gcc-dg.exp. * testsuite/libgomp.fortran/fortran.exp: Likewise. * testsuite/libgomp.graphite/graphite.exp: Likewise. * testsuite/libgomp.c++/c++.exp: load_gcc_lib gcc-dg.exp. Use dg-runtest rather than gfortran-dg-runtest. Index: libgomp/testsuite/libgomp.fortran/fortran.exp =================================================================== --- libgomp/testsuite/libgomp.fortran/fortran.exp (revision 199267) +++ libgomp/testsuite/libgomp.fortran/fortran.exp (working copy) @@ -1,4 +1,6 @@ load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp +load_gcc_lib gfortran-dg.exp global shlib_ext global ALWAYS_CFLAGS Index: libgomp/testsuite/lib/libgomp.exp =================================================================== --- libgomp/testsuite/lib/libgomp.exp (revision 199267) +++ libgomp/testsuite/lib/libgomp.exp (working copy) @@ -9,24 +9,27 @@ } load_lib dg.exp + +# Required to use gcc-dg.exp - however, the latter should NOT be +# loaded until ${tool}_target_compile is defined since it uses that +# to determine default LTO options. + +load_gcc_lib prune.exp +load_gcc_lib target-libpath.exp +load_gcc_lib wrapper.exp +load_gcc_lib gcc-defs.exp +load_gcc_lib timeout.exp +load_gcc_lib target-supports.exp load_gcc_lib file-format.exp -load_gcc_lib target-supports.exp load_gcc_lib target-supports-dg.exp load_gcc_lib scanasm.exp load_gcc_lib scandump.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp load_gcc_lib scanipa.exp -load_gcc_lib prune.exp -load_gcc_lib target-libpath.exp -load_gcc_lib wrapper.exp -load_gcc_lib gcc-defs.exp +load_gcc_lib timeout-dg.exp load_gcc_lib torture-options.exp -load_gcc_lib timeout.exp -load_gcc_lib timeout-dg.exp load_gcc_lib fortran-modules.exp -load_gcc_lib gcc-dg.exp -load_gcc_lib gfortran-dg.exp set dg-do-what-default run Index: libgomp/testsuite/libgomp.c/c.exp =================================================================== --- libgomp/testsuite/libgomp.c/c.exp (revision 199267) +++ libgomp/testsuite/libgomp.c/c.exp (working copy) @@ -7,6 +7,7 @@ } load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp # If a testcase doesn't have special options, use these. if ![info exists DEFAULT_CFLAGS] then { Index: libgomp/testsuite/libgomp.graphite/graphite.exp =================================================================== --- libgomp/testsuite/libgomp.graphite/graphite.exp (revision 199267) +++ libgomp/testsuite/libgomp.graphite/graphite.exp (working copy) @@ -23,6 +23,7 @@ } load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp if ![check_effective_target_pthread] { return Index: libgomp/testsuite/libgomp.c++/c++.exp =================================================================== --- libgomp/testsuite/libgomp.c++/c++.exp (revision 199267) +++ libgomp/testsuite/libgomp.c++/c++.exp (working copy) @@ -1,4 +1,5 @@ load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp global shlib_ext @@ -53,7 +54,7 @@ } # Main loop. - gfortran-dg-runtest $tests $libstdcxx_includes + dg-runtest $tests "" $libstdcxx_includes } # All done.