diff options
| author | tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-08 16:01:24 +0000 |
|---|---|---|
| committer | tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-08 16:01:24 +0000 |
| commit | b21c795fa27f6fcefdb38d1bc50f1d1634f4e0b3 (patch) | |
| tree | f5b8470fd4d2f13abf011a08c7dc99a8b6dd0b19 /libgomp | |
| parent | 4b7fbadf914edaa69b7466019fc7bcdc55f82a2c (diff) | |
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
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 3 |
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 |