libgomp: Fix "intelmic" offloading in build-tree testing.

	libgomp/
	* testsuite/lib/libgomp.exp (libgomp_init): Correctly match
	"intelmic" in $offload_targets.

From-SVN: r219348

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index afbde87a6b0c1633a2e35219e8469adc0be86920..beecba9f667f56dd8e0421d2f1c08e5c7a1ece92 100644 (file)
--- 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 ff22f106bc5cc015ad33a76c44426130ef7dbf54..2d6f822adf952aed40306d4899bd598c2940c3d6 100644 (file)
--- 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