From patchwork Tue Nov 4 22:34:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 406828 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 B623D1400A0 for ; Wed, 5 Nov 2014 09:34:47 +1100 (AEDT) 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:cc:subject:content-type; q=dns; s=default; b=rtzaDEvPCKFOz8WV6PZgPj0KY3SAngvudIKJ5ns/YUt VAAqQal8fH48xJgJeiDxAO4vqcBfjHGV54N+wDR0N8h54OzfyWFHsztm0k4ppNKu ytbygJGug4RiIqyonrkZuWYifCVOkhz0dJCxIg1zXUdY/LT1usDyVQURaiOk+C4A = 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:cc:subject:content-type; s=default; bh=P4l8XiaeQhD9cbDu49g55xykpl4=; b=N59BMZSMNHeOPAV18 qfffjapfKlI/6hzfqOorLr8u7Tm9ZJsKpMGiy+/xOe4em/vBRdRKfcilLCCv7zYk OD4hzf7/b8CHnmE74tVJKYCoCwIVA5nGFwH4xxQ4rist9Rcv8d3mjTcKROcT5+Dw /Sj+kK3Yb4yd7zkfIj5hvln+J0= Received: (qmail 32675 invoked by alias); 4 Nov 2014 22:34:40 -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 32666 invoked by uid 89); 4 Nov 2014 22:34:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE 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; Tue, 04 Nov 2014 22:34:39 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1XlmgN-0000fV-CM from Tom_deVries@mentor.com for gcc-patches@gcc.gnu.org; Tue, 04 Nov 2014 14:34:35 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.181.6; Tue, 4 Nov 2014 22:34:33 +0000 Message-ID: <54595477.3020601@mentor.com> Date: Tue, 4 Nov 2014 23:34:31 +0100 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Thomas Schwinge CC: GCC Patches Subject: [gomp4] Set default LIBGOMP_PLUGIN_PATH Thomas, this patch sets LIBGOMP_PLUGIN_PATH to the .libs dir in the build area, if LIBGOMP_PLUGIN_PATH has not been defined. This allows f.i. a gcc build without an accelerator configured, to automatically pick up the host_nonshm plugin. OK for gomp-4_0-branch? Thanks, - Tom 2014-11-03 Tom de Vries * testsuite/libgomp.oacc-c++/c++.exp: Set default LIBGOMP_PLUGIN_PATH. Print used LIBGOMP_PLUGIN_PATH. * testsuite/libgomp.oacc-c/c.exp: Same. * testsuite/libgomp.oacc-fortran/fortran.exp: Same. diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index 164d7d2..da81deb 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -62,6 +62,11 @@ if { $lang_test_file_found } { set libstdcxx_includes "" } + if { ![info exists env(LIBGOMP_PLUGIN_PATH)] } { + set env(LIBGOMP_PLUGIN_PATH) "${blddir}/.libs" + } + puts "Using LIBGOMP_PLUGIN_PATH $env(LIBGOMP_PLUGIN_PATH)" + # Todo: get list of accelerators from configure options --enable-accelerator. set accels { "nvidia" "host_nonshm" } diff --git a/libgomp/testsuite/libgomp.oacc-c/c.exp b/libgomp/testsuite/libgomp.oacc-c/c.exp index 318f78e..feb57fd 100644 --- a/libgomp/testsuite/libgomp.oacc-c/c.exp +++ b/libgomp/testsuite/libgomp.oacc-c/c.exp @@ -33,6 +33,11 @@ set ld_library_path $always_ld_library_path append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars +if { ![info exists env(LIBGOMP_PLUGIN_PATH)] } { + set env(LIBGOMP_PLUGIN_PATH) "${blddir}/.libs" +} +puts "Using LIBGOMP_PLUGIN_PATH $env(LIBGOMP_PLUGIN_PATH)" + # Todo: get list of accelerators from configure options --enable-accelerator. set accels { "nvidia" "host_nonshm" } diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp index 312f947..156ae56 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp @@ -66,6 +66,11 @@ if { $lang_test_file_found } { append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars + if { ![info exists env(LIBGOMP_PLUGIN_PATH)] } { + set env(LIBGOMP_PLUGIN_PATH) "${blddir}/.libs" + } + puts "Using LIBGOMP_PLUGIN_PATH $env(LIBGOMP_PLUGIN_PATH)" + # Todo: get list of accelerators from configure options --enable-accelerator. set accels { "nvidia" "host_nonshm" } -- 1.9.1