From bfda180944dda200d07d23ad50820303b262bd92 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zack@owlfolio.org>
Date: Mon, 3 Jun 2024 15:28:35 -0400
Subject: [PATCH] config.sub: accept knetbsd-gnu, netbsd-gnu, uclinux-gnu.

There is evidence elsewhere in config.sub, and in config.guess,
indicating that knetbsd-gnu, netbsd-gnu, and uclinux-gnu were
supposed to be acceptable combinations of $kernel and $os, but
they are currently being rejected.  Add them to the list of
acceptable kernel-os combinations, and add test cases for them.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
 config.sub                | 4 ++--
 testsuite/config-sub.data | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config.sub b/config.sub
index 4f121b6..ce96c82 100755
--- a/config.sub
+++ b/config.sub
@@ -2181,7 +2181,7 @@ case $kernel-$os-$obj in
 		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
 		    | linux-relibc*- | linux-uclibc*- | linux-ohos*- )
 		;;
-	uclinux-uclibc*- )
+	uclinux-uclibc*- | uclinux-gnu*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
@@ -2206,7 +2206,7 @@ case $kernel-$os-$obj in
 		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+	kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
 	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 73f6101..9d55970 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -56,7 +56,9 @@ am33_2.0					am33_2.0-unknown-none
 amd64						x86_64-pc-none
 amd64-cygwin					x86_64-pc-cygwin
 amd64-kfreebsd5.4-gnu				x86_64-pc-kfreebsd5.4-gnu
+amd64-knetbsd9.4-gnu				x86_64-pc-knetbsd9.4-gnu
 amd64-midnightbsd0.7				x86_64-pc-midnightbsd0.7
+amd64-netbsd9.4-gnu				x86_64-pc-netbsd9.4-gnu
 amd64-onefs					x86_64-pc-onefs
 amd64-unknown-freebsd5.2			x86_64-unknown-freebsd5.2
 amd64-unknown-unleashed1.1			x86_64-unknown-unleashed1.1
@@ -94,6 +96,7 @@ arm-pikeos					arm-unknown-eabi
 arm-riscos					arm-unknown-riscos
 arm-sysgo-pikeos				arm-sysgo-eabi
 arm-tirtos					arm-unknown-tirtos
+arm-uclinux-gnueabi				arm-unknown-uclinux-gnueabi
 arm-uclinux-uclibcgnueabi			arm-unknown-uclinux-uclibcgnueabi
 arm-unknown-netbsdelf7.0			arm-unknown-netbsdelf7.0
 arm-unknown-none-aout				arm-unknown-none-aout