1 files changed, 33 insertions, 16 deletions

diff --git a/exec/config.sub b/exec/config.sub
index b41da55df45..a6d99a0f15f 100755
--- a/exec/config.sub
+++ b/exec/config.sub
@@ -1,10 +1,10 @@
 #!/usr/bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-01-03'
+timestamp='2023-06-23'
 
 # 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
@@ -76,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -130,7 +130,7 @@ IFS=$saved_IFS
 # Separate into logical components for further validation
 case $1 in
         *-*-*-*-*)
-                echo Invalid configuration \`"$1"\': more than four components >&2
+                echo "Invalid configuration '$1': more than four components" >&2
                 exit 1
                 ;;
         *-*-*-*)
@@ -145,7 +145,7 @@ case $1 in
                         nto-qnx* | linux-* | uclinux-uclibc* \
                         | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
                         | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-                        | storm-chaos* | os2-emx* | rtmk-nova*)
+                        | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*)
                                 basic_machine=$field1
                                 basic_os=$maybe_os
                                 ;;
@@ -943,7 +943,7 @@ $basic_machine
 EOF
                 IFS=$saved_IFS
                 ;;
-        # We use `pc' rather than `unknown'
+        # We use 'pc' rather than 'unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
         i*86 | x86_64)
@@ -1075,7 +1075,7 @@ case $cpu-$vendor in
         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                 cpu=i586
                 ;;
-        pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+        pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
                 cpu=i686
                 ;;
         pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1207,7 +1207,7 @@ case $cpu-$vendor in
                         | k1om \
                         | le32 | le64 \
                         | lm32 \
-                        | loongarch32 | loongarch64 | loongarchx32 \
+                        | loongarch32 | loongarch64 \
                         | m32c | m32r | m32rle \
                         | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
                         | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
@@ -1285,7 +1285,7 @@ case $cpu-$vendor in
                                 ;;
 
                         *)
-                                echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+                                echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
                                 exit 1
                                 ;;
                 esac
@@ -1341,6 +1341,10 @@ EOF
                 kernel=linux
                 os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
                 ;;
+        managarm*)
+                kernel=managarm
+                os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+                ;;
         *)
                 kernel=
                 os=$basic_os
@@ -1754,7 +1758,7 @@ case $os in
              | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
              | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
              | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-             | fiwix* )
+             | fiwix* | mlibc* )
                 ;;
         # This one is extra strict with allowed versions
         sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1762,8 +1766,11 @@ case $os in
                 ;;
         none)
                 ;;
+        kernel* )
+                # Restricted further below
+                ;;
         *)
-                echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+                echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
                 exit 1
                 ;;
 esac
@@ -1772,14 +1779,24 @@ esac
 # (given a valid OS), if there is a kernel.
 case $kernel-$os in
         linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-                   | linux-musl* | linux-relibc* | linux-uclibc* )
+                   | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* )
                 ;;
         uclinux-uclibc* )
                 ;;
-        -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+        managarm-mlibc* | managarm-kernel* )
+                ;;
+        -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
                 # These are just libc implementations, not actual OSes, and thus
                 # require a kernel.
-                echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+                echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
+                exit 1
+                ;;
+        -kernel* )
+                echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
+                exit 1
+                ;;
+        *-kernel* )
+                echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
                 exit 1
                 ;;
         kfreebsd*-gnu* | kopensolaris*-gnu*)
@@ -1796,7 +1813,7 @@ case $kernel-$os in
                 # Blank kernel with real OS is always fine.
                 ;;
         *-*)
-                echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+                echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
                 exit 1
                 ;;
 esac