diff --git a/ChangeLog b/ChangeLog
index 597e01f..389a5d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-20  Andrew Stubbs  <ams@codesourcery.com>
+
+	* config.sub (amdgnu-amdhsa): Recognise.
+	* testsuite/config-sub.data: Test amdgcn-amdhsa.
+
 2018-10-26  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*): Set
diff --git a/config.sub b/config.sub
index f208558..b29f8f1 100755
--- a/config.sub
+++ b/config.sub
@@ -1161,6 +1161,7 @@ case $cpu-$vendor in
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
 			| alphapca5[67] | alpha64pca5[67] \
 			| am33_2.0 \
+			| amdgcn \
 			| arc | arceb \
 			| arm  | arm[lb]e | arme[lb] | armv* \
 			| avr | avr32 \
@@ -1360,7 +1361,7 @@ case $os in
 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd*)
+	     | midnightbsd* | amdhsa*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	qnx*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 3fb9c04..3c1eadd 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -38,6 +38,7 @@ amd64-onefs					x86_64-pc-onefs
 amd64-unknown-freebsd5.2			x86_64-unknown-freebsd5.2
 amd64						x86_64-pc-none
 amdahl						580-amdahl-sysv
+amdgcn-amdhsa					amdgcn-unknown-amdhsa
 amiga						m68k-unknown-none
 arc						arc-unknown-none
 arceb						arceb-unknown-none