From: Tobias Burnus <tobias@codesourcery.com>
Date: Mon, 23 Mar 2020 11:25:37 +0000 (+0100)
Subject: AMDGCN offloading – use amdgcn-amdhsa
X-Git-Tag: upstream/12.2.0~17701
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3586eeb88414e77c7cccb69362b8d04562536b6;p=platform%2Fupstream%2Fgcc.git

AMDGCN offloading – use amdgcn-amdhsa

	gcc/
	* doc/install.texi (amdgcn-*-amdhsa): Renamed
	from amdgcn-unknown-amdhsa; change
	amdgcn-unknown-amdhsa to amdgcn-amdhsa.

	gcc/testsuite/
	* lib/target-supports.exp (check_effective_target_offload_gcn):
	Check for -foffload=amdgcn-amdhsa not ...=amdgcn-unknown-amdhsa.
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c33327e..234afee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-23  Tobias Burnus  <tobias@codesourcery.com>
+
+	* doc/install.texi (amdgcn-*-amdhsa): Renamed
+	from amdgcn-unknown-amdhsa; change
+	amdgcn-unknown-amdhsa to amdgcn-amdhsa.
+
 2020-03-23  Richard Biener  <rguenther@suse.de>
 
 	PR ipa/94245
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 9296183..5596108 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -3572,22 +3572,22 @@ This is a synonym for @samp{x86_64-*-solaris2*}.
 @html
 <hr />
 @end html
-@anchor{amdgcn-unknown-amdhsa}
-@heading amdgcn-unknown-amdhsa
+@anchor{amdgcn-x-amdhsa}
+@heading amdgcn-*-amdhsa
 AMD GCN GPU target.
 
 Instead of GNU Binutils, you will need to install LLVM 6, or later, and copy
-@file{bin/llvm-mc} to @file{amdgcn-unknown-amdhsa/bin/as},
-@file{bin/lld} to @file{amdgcn-unknown-amdhsa/bin/ld},
-@file{bin/llvm-nm} to @file{amdgcn-unknown-amdhsa/bin/nm}, and
-@file{bin/llvm-ar} to both @file{bin/amdgcn-unknown-amdhsa-ar} and
-@file{bin/amdgcn-unknown-amdhsa-ranlib}.
+@file{bin/llvm-mc} to @file{amdgcn-amdhsa/bin/as},
+@file{bin/lld} to @file{amdgcn-amdhsa/bin/ld},
+@file{bin/llvm-nm} to @file{amdgcn-amdhsa/bin/nm}, and
+@file{bin/llvm-ar} to both @file{bin/amdgcn-amdhsa-ar} and
+@file{bin/amdgcn-amdhsa-ranlib}.
 
 Use Newlib (2019-01-16, or newer).
 
 To run the binaries, install the HSA Runtime from the
 @uref{https://rocm.github.io,,ROCm Platform}, and use
-@file{libexec/gcc/amdhsa-unknown-amdhsa/@var{version}/gcn-run} to launch them
+@file{libexec/gcc/amdhsa-amdhsa/@var{version}/gcn-run} to launch them
 on the GPU.
 
 @html
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 892fcb6..558a8c6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-23  Tobias Burnus  <tobias@codesourcery.com>
+
+	* lib/target-supports.exp (check_effective_target_offload_gcn):
+	Check for -foffload=amdgcn-amdhsa not ...=amdgcn-unknown-amdhsa.
+
 2020-03-22  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	PR d/93038
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 4413c26..58919a3 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -9562,7 +9562,7 @@ proc check_effective_target_offload_hsa { } {
 proc check_effective_target_offload_gcn { } {
     return [check_no_compiler_messages offload_gcn assembly {
 	int main () {return 0;}
-    } "-foffload=amdgcn-unknown-amdhsa" ]
+    } "-foffload=amdgcn-amdhsa" ]
 }
 
 # Return 1 if the target support -fprofile-update=atomic