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.

(cherry picked from commit ebe5dace8c318b38f42cfe1d148e90dcdfadb31e)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 1c4634d09abeb31dfb39af6081c17b60c57b63af..e146e14e6f8e3960e35189744346e81fca4be9c8 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,12 @@
+2022-07-04  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-05-17  Tobias Burnus  <tobias@codesourcery.com>
+
+       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.
+
 2022-07-04  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/config/gcn/gcn.cc b/gcc/config/gcn/gcn.cc
index 98e563054366dcffb2d37cd43164a8c2a5213673..d963231fd501a63fb0e066666af6fcb4af465e0e 100644 (file)
--- a/gcc/config/gcn/gcn.cc
+++ b/gcc/config/gcn/gcn.cc
@@ -2667,7 +2667,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 1086cefb0a29f9dc192d235a6d67feef5a9ec185..27d36db894bed8845b240831867688a9aff44da2 100644 (file)
--- 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 gfx90a >> $@