libgomp: For hsa offloading, compilation is all handled by the target compiler

libgomp/
	* plugin/configfrag.ac (offload_additional_options)
	(offload_additional_lib_paths): Don't amend for hsa offloading.
	* configure: Regenerate.

From-SVN: r233071
This commit is contained in:
Thomas Schwinge 2016-02-02 13:48:21 +01:00 committed by Thomas Schwinge
parent 41d809d3c8
commit 4a88d9b77a
3 changed files with 12 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2016-02-02 Thomas Schwinge <thomas@codesourcery.com>
* plugin/configfrag.ac (offload_additional_options)
(offload_additional_lib_paths): Don't amend for hsa offloading.
* configure: Regenerate.
* plugin/configfrag.ac: Don't configure for offloading target if
we don't build the corresponding plugin.
* configure: Regenerate.

5
libgomp/configure vendored
View File

@ -15434,7 +15434,10 @@ rm -f core conftest.err conftest.$ac_objext \
else
offload_targets=$offload_targets,$tgt_name
fi
if test x"$tgt_dir" != x; then
if test "$tgt_name" = hsa; then
# Offloading compilation is all handled by the target compiler.
:
elif test x"$tgt_dir" != x; then
offload_additional_options="$offload_additional_options -B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin"
offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32"
else

View File

@ -235,7 +235,10 @@ if test x"$enable_offload_targets" != x; then
else
offload_targets=$offload_targets,$tgt_name
fi
if test x"$tgt_dir" != x; then
if test "$tgt_name" = hsa; then
# Offloading compilation is all handled by the target compiler.
:
elif test x"$tgt_dir" != x; then
offload_additional_options="$offload_additional_options -B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin"
offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32"
else