From 74a858549d0894737d2c2348d7fef00c47faca6b Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Tue, 13 Oct 2020 22:20:55 +1100
Subject: [PATCH] 	* config.sub (i*86-pc-os2-emx): Recognise correctly. 
 * testsuite/config-sub.data: Add OS/2 tests to avoid regressions.

---
 ChangeLog                 |  5 +++++
 config.sub                | 10 ++++++++--
 testsuite/config-sub.data |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2b9453..d8351fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-13  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (i*86-pc-os2-emx): Recognise correctly.
+	* testsuite/config-sub.data: Add OS/2 tests to avoid regressions.
+
 2020-09-27  Fabrice Fontaine  <fontaine.fabrice@gmail.com>
 
 	* config.sub (uclinux-uclibc*): Fix detection.
diff --git a/config.sub b/config.sub
index 9bc49a7..0663eeb 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-09-08'
+timestamp='2020-10-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1288,6 +1288,10 @@ case $basic_os in
 		kernel=linux
 		os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'`
 		;;
+	os2-emx)
+		kernel=os2
+		os=`echo $basic_os | sed -e 's|os2-emx|emx|'`
+		;;
 	nto-qnx*)
 		kernel=nto
 		os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'`
@@ -1716,7 +1720,7 @@ case $os in
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* )
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1747,6 +1751,8 @@ case $kernel-$os in
 		;;
 	nto-qnx*)
 		;;
+	os2-emx)
+	    	;;
 	*-eabi* | *-gnueabi*)
 		;;
 	-*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 1a818ca..fbadec1 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -285,6 +285,7 @@ i686-elf					i686-pc-elf
 i686-ericsson-dicos				i686-ericsson-dicos
 i686-haiku					i686-pc-haiku
 i686-kopensolaris5.11-gnu			i686-pc-kopensolaris5.11-gnu
+i686-os2-emx					i686-pc-os2-emx
 i786-elf					i786-pc-elf
 i860						i860-unknown-sysv
 i960						i960-unknown-none