summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2015-01-08 17:01:24 +0100
committerThomas Schwinge <tschwinge@gcc.gnu.org>2015-01-08 17:01:24 +0100
commitf9a0eca40d0bacce52cf56998d79ca0d02345355 (patch)
treef5b8470fd4d2f13abf011a08c7dc99a8b6dd0b19 /libgomp
parent247ecdf3b8568e4b489598858b7586dccf9f95e5 (diff)
downloadgcc-f9a0eca40d0bacce52cf56998d79ca0d02345355.tar.gz
libgomp: Fix "intelmic" offloading in build-tree testing.
libgomp/ * testsuite/lib/libgomp.exp (libgomp_init): Correctly match "intelmic" in $offload_targets. From-SVN: r219348
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/testsuite/lib/libgomp.exp3
2 files changed, 6 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index afbde87a6b0..beecba9f667 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-08 Thomas Schwinge <thomas@codesourcery.com>
+
+ * testsuite/lib/libgomp.exp (libgomp_init): Correctly match
+ "intelmic" in $offload_targets.
+
2015-01-05 Jakub Jelinek <jakub@redhat.com>
Update copyright years.
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index ff22f106bc5..2d6f822adf9 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