diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-02 13:48:04 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2016-02-02 13:48:04 +0100 |
| commit | 41d809d3c8acf94279622b90b9fed8127ba29aab (patch) | |
| tree | 991f8fcd67013e9a867c5f75f72f86e0c90f8247 /libgomp | |
| parent | 9dc03c974ffc1fa29217cf0fb83b4d662a6e7a93 (diff) | |
| download | gcc-41d809d3c8acf94279622b90b9fed8127ba29aab.zip gcc-41d809d3c8acf94279622b90b9fed8127ba29aab.tar.gz gcc-41d809d3c8acf94279622b90b9fed8127ba29aab.tar.bz2 | |
libgomp: Don't configure for offloading target if we don't build the corresponding plugin
libgomp/
* plugin/configfrag.ac: Don't configure for offloading target if
we don't build the corresponding plugin.
* configure: Regenerate.
From-SVN: r233070
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rwxr-xr-x | libgomp/configure | 7 | ||||
| -rw-r--r-- | libgomp/plugin/configfrag.ac | 7 |
3 files changed, 18 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index c94fa27..610074c 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2016-02-02 Thomas Schwinge <thomas@codesourcery.com> + + * plugin/configfrag.ac: Don't configure for offloading target if + we don't build the corresponding plugin. + * configure: Regenerate. + 2016-02-01 Nathan Sidwell <nathan@codesourcery.com> * testsuite/libgomp.oacc-c-c++-common/loop-dim-default.c: New. diff --git a/libgomp/configure b/libgomp/configure index 1410bc7..d34a350 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15323,6 +15323,7 @@ if test x"$enable_offload_targets" != x; then for tgt in `echo $enable_offload_targets | sed -e 's#,# #g'`; do tgt_dir=`echo $tgt | grep '=' | sed 's/.*=//'` tgt=`echo $tgt | sed 's/=.*//'` + tgt_name= case $tgt in *-intelmic-* | *-intelmicemul-*) tgt_name=intelmic @@ -15424,7 +15425,11 @@ rm -f core conftest.err conftest.$ac_objext \ as_fn_error "unknown offload target specified" "$LINENO" 5 ;; esac - if test x"$offload_targets" = x; then + if test x"$tgt_name" = x; then + # Don't configure libgomp for this offloading target if we don't build + # the corresponding plugin. + continue + elif test x"$offload_targets" = x; then offload_targets=$tgt_name else offload_targets=$offload_targets,$tgt_name diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 2a9d9f9..01815d4 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -146,6 +146,7 @@ if test x"$enable_offload_targets" != x; then for tgt in `echo $enable_offload_targets | sed -e 's#,# #g'`; do tgt_dir=`echo $tgt | grep '=' | sed 's/.*=//'` tgt=`echo $tgt | sed 's/=.*//'` + tgt_name= case $tgt in *-intelmic-* | *-intelmicemul-*) tgt_name=intelmic @@ -225,7 +226,11 @@ if test x"$enable_offload_targets" != x; then AC_MSG_ERROR([unknown offload target specified]) ;; esac - if test x"$offload_targets" = x; then + if test x"$tgt_name" = x; then + # Don't configure libgomp for this offloading target if we don't build + # the corresponding plugin. + continue + elif test x"$offload_targets" = x; then offload_targets=$tgt_name else offload_targets=$offload_targets,$tgt_name |