diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 610074c3153..6cae4d705da 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -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.
diff --git a/libgomp/configure b/libgomp/configure
index d34a350e048..f643bf8f670 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -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
diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac
index 01815d41c8b..b9209cb8c49 100644
--- a/libgomp/plugin/configfrag.ac
+++ b/libgomp/plugin/configfrag.ac
@@ -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