Handle ‘i386-nova’ as shorthand for a 4-part system name,
kernel=rtmk os=nova, instead of a canonicalized OS name with
a dash in the middle, os=rtmk-nova.

RTMK <https://rtmk.sourceforge.net/> is a microkernel.
Nova <https://www.nongnu.org/nova> is an OS written on top of that
microkernel.  The short system name ‘i386-nova’ was therefore defined
to canonicalize to ‘i386-pc-rtmk-nova’, I think prior to the general
introduction of 4-part system names.  ‘i386-pc-rtmk-nova’ still makes
sense under the rules for interpreting 4-part names, but nowadays the
logic for validating canonicalized name components rejects OS names
with a dash in the middle.  Feeding kernel=rtmk os=nova to that logic,
instead, does the Right Thing.
---
 config.sub                | 6 +++++-
 testsuite/config-sub.data | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config.sub b/config.sub
index 9305b40..0eac68e 100755
--- a/config.sub
+++ b/config.sub
@@ -1632,7 +1632,8 @@ case $os in
                os=sysv
                ;;
        nova*)
-               os=rtmk-nova
+               kernel=rtmk
+               os=nova
                ;;
        # Preserve the version number of sinix5.
        sinix5.*)
@@ -2015,6 +2016,7 @@ case $os in
        | nextstep* \
        | nindy* \
        | nonstopux* \
+       | nova* \
        | nsk* \
        | nucleus* \
        | nx6 \
@@ -2194,6 +2196,8 @@ case $kernel-$os-$obj in
                ;;
        os2-emx-)
                ;;
+       rtmk-nova-)
+               ;;
        *-eabi*- | *-gnueabi*-)
                ;;
        none--*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 568778d..17e3790 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -328,6 +328,7 @@ i386-mingw32                                        
i386-pc-mingw32
 i386-msys                                      i386-pc-msys
 i386-netbsd                                    i386-pc-netbsd
 i386-next-openstep4                            i386-next-openstep4
+i386-nova                                      i386-pc-rtmk-nova
 i386-openbsd                                   i386-pc-openbsd
 i386-os2                                       i386-pc-os2
 i386-pc-nacl                                   i386-pc-nacl
-- 
2.43.2


Reply via email to