[gcc r13-557] gcn/t-omp-device: Add 'amdgcn' as 'arch' [PR105602]

[gcc r13-557] gcn/t-omp-device: Add 'amdgcn' as 'arch' [PR105602]

[Tobias Burnus]

https://gcc.gnu.org/g:ebe5dace8c318b38f42cfe1d148e90dcdfadb31e

commit r13-557-gebe5dace8c318b38f42cfe1d148e90dcdfadb31e
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Tue May 17 15:48:40 2022 +0200

    gcn/t-omp-device: Add 'amdgcn' as 'arch' [PR105602]
    
    Improve cross-compiler handling.
    
    gcc/ChangeLog:
    
            PR target/105602
            * config/gcn/t-omp-device (arch): Add 'amdgcn' besides existing 'gcn'.
            * config/gcn/gcn.cc (gcn_omp_device_kind_arch_isa): Likewise.

Diff:
---
 gcc/config/gcn/gcn.cc       | 2 +-
 gcc/config/gcn/t-omp-device | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc
index e2e9335ad75..76b27c49d76 100644
--- a/gcc/config/gcn/gcn.cc
+++ b/gcc/config/gcn/gcn.cc
@@ -2632,7 +2632,7 @@ gcn_omp_device_kind_arch_isa (enum omp_device_kind_arch_isa trait,
     case omp_device_kind:
       return strcmp (name, "gpu") == 0;
     case omp_device_arch:
-      return strcmp (name, "gcn") == 0;
+      return strcmp (name, "amdgcn") == 0 || strcmp (name, "gcn") == 0;
     case omp_device_isa:
       if (strcmp (name, "fiji") == 0)
 	return gcn_arch == PROCESSOR_FIJI;
diff --git a/gcc/config/gcn/t-omp-device b/gcc/config/gcn/t-omp-device
index cd56e2f8a68..e1d9e0d2a1e 100644
--- a/gcc/config/gcn/t-omp-device
+++ b/gcc/config/gcn/t-omp-device
@@ -1,4 +1,4 @@
 omp-device-properties-gcn: $(srcdir)/config/gcn/gcn.cc
 	echo kind: gpu > $@
-	echo arch: gcn >> $@
+	echo arch: amdgcn gcn >> $@
 	echo isa: fiji gfx900 gfx906 gfx908 >> $@