From b21c795fa27f6fcefdb38d1bc50f1d1634f4e0b3 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Thu, 8 Jan 2015 16:01:24 +0000 Subject: [PATCH] libgomp: Fix "intelmic" offloading in build-tree testing. libgomp/ * testsuite/lib/libgomp.exp (libgomp_init): Correctly match "intelmic" in $offload_targets. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219348 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 5 +++++ libgomp/testsuite/lib/libgomp.exp | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index afbde87a6b0c..beecba9f667f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-08 Thomas Schwinge + + * testsuite/lib/libgomp.exp (libgomp_init): Correctly match + "intelmic" in $offload_targets. + 2015-01-05 Jakub Jelinek Update copyright years. diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index ff22f106bc5c..2d6f822adf95 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -115,8 +115,7 @@ proc libgomp_init { args } { # Add liboffloadmic build directory in LD_LIBRARY_PATH to support # non-fallback testing for Intel MIC targets - if { [string match "*-intelmic-*" $offload_targets] - || [string match "*-intelmicemul-*" $offload_targets] } { + if { [string match "*,intelmic,*" ",$offload_targets,"] } { append always_ld_library_path ":${blddir}/../liboffloadmic/.libs" append always_ld_library_path ":${blddir}/../liboffloadmic/plugin/.libs" # libstdc++ is required by liboffloadmic -- 2.47.3