From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2124) id D00E43858D1E; Mon, 26 Jun 2023 13:11:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D00E43858D1E Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Nick Clifton To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] Sync config.guess and config.sub with upstream master versions. X-Act-Checkin: binutils-gdb X-Git-Author: Nick Clifton X-Git-Refname: refs/heads/master X-Git-Oldrev: 0cf7c497f27cc36b54a57db378eefc162c6d8dc7 X-Git-Newrev: 996ff3e8c565a4e9f9d43db7cc73aa061b98cbc0 Message-Id: <20230626131155.D00E43858D1E@sourceware.org> Date: Mon, 26 Jun 2023 13:11:55 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jun 2023 13:11:55 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D996ff3e8c565= a4e9f9d43db7cc73aa061b98cbc0 commit 996ff3e8c565a4e9f9d43db7cc73aa061b98cbc0 Author: Nick Clifton Date: Mon Jun 26 14:11:30 2023 +0100 Sync config.guess and config.sub with upstream master versions. Diff: --- ChangeLog | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++ config.guess | 60 ++++++++++++++++++++++++++++++++++++++++----------------= ---- config.sub | 49 +++++++++++++++++++++++++++++++++---------------- 3 files changed, 131 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf4996d3f1b..d1c6568ad63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +2023-06-26 Nick Clifton + + * Import these updates to the config scripts + + commit 4ad4bb7c30aca1e705448ba8d51a210bbd47bb52 + Author: Paul Eggert + Date: Fri Jun 23 09:55:10 2023 -0700 + + Quote 'like this', not `like this'. + + commit 63acb96f92473ceb5e21d873d7c0aee266b3d6d3 + Author: Paul Eggert + Date: Sat Jan 21 00:15:01 2023 -0600 + + Fix config.sub spelling typo for "athlon" + + commit 4ce12a5c9125cedc0d0ba584444a6865396923ec + Author: Dmitry V. Levin + Date: Sun Jan 1 08:00:00 2023 +0000 + + Update copyright years + + commit c397e2c040bce50bcdccb131f90115ba7e8bfc19 + Author: Arsen Arsenovi + Date: Sat Sep 17 23:34:48 2022 +0200 + + config.sub: add linux-mlibc targets + + commit 9f9f9b0b13197269848c76e3e057a3ed0680b4bf + Author: Arsen Arsenovi + Date: Sat Sep 17 23:34:47 2022 +0200 + + config.guess: support running on Managarm systems + + commit 87e6687749da7bb2ab158a79fa83721c19ed9246 + Author: Arsen Arsenovi + Date: Sat Sep 17 23:34:46 2022 +0200 + + config.sub: add managarm-{mlibc,kernel} targets + + commit 20403c5701973a4cbd7e0b4bbeb627fcd424a0f1 + Author: Xiaotian Wu + Date: Mon Aug 1 16:05:29 2022 +0800 + + Remove loongarchx32 + + commit 02ba26b218d3d3db6c56e014655faf463cefa983 + Author: Alexander von Gluck IV + Date: Wed May 25 15:43:13 2022 -0500 + + config.guess: Update Haiku guesses + + commit f56a7140386d08a531bcfd444d632b28c61a6329 + Author: Bruno Haible + Date: Sun May 8 19:08:08 2022 +0200 + + config.guess (x86_64:Linux:*:*): Detect 32-bit ABI. + 2023-04-20 Nick Clifton =20 * SECURITY.txt: New file. diff --git a/config.guess b/config.guess index 7f76b6228f7..354a8ccde42 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. =20 # shellcheck disable=3DSC2006,SC2268 # see below for rationale =20 -timestamp=3D'2022-01-09' +timestamp=3D'2023-06-23' =20 # 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 @@ -47,7 +47,7 @@ me=3D`echo "$0" | sed -e 's,.*/,,'` usage=3D"\ Usage: $0 [OPTION] =20 -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. =20 Options: -h, --help print this help, then exit @@ -60,13 +60,13 @@ version=3D"\ GNU config.guess ($timestamp) =20 Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. =20 This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE= ." =20 help=3D" -Try \`$me --help' for more information." +Try '$me --help' for more information." =20 # Parse command line while test $# -gt 0 ; do @@ -102,8 +102,8 @@ GUESS=3D # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. =20 -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. =20 # Portable tmp directory creation inspired by the Autoconf team. =20 @@ -459,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME= _VERSION in UNAME_RELEASE=3D`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. + # Japanese Language versions have a version number like '4.1.3-JL'. SUN_REL=3D`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` GUESS=3Dsparc-sun-sunos$SUN_REL ;; @@ -966,6 +966,12 @@ EOF GNU_REL=3D`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=3D$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS=3D"$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS=3D"$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=3D$UNAME_MACHINE-unknown-minix ;; @@ -1036,7 +1042,7 @@ EOF k1om:Linux:*:*) GUESS=3D$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=3D$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1151,16 +1157,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=3D$UNAME_MACHINE LIBCABI=3D$LIBC if test "$CC_FOR_BUILD" !=3D no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS=3D"" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=3D${LIBC}x32 - fi + ABI=3D64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=3Dx86 + #else + #ifdef __ILP32__ + ABI=3Dx32 + #endif + #endif +EOF + cc_set_abi=3D`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' |= sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=3Di686 ;; + x32) LIBCABI=3D${LIBC}x32 ;; + esac fi - GUESS=3D$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=3D$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=3D$UNAME_MACHINE-unknown-linux-$LIBC @@ -1180,7 +1197,7 @@ EOF GUESS=3D$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. GUESS=3D$UNAME_MACHINE-pc-os2-emx ;; @@ -1321,7 +1338,7 @@ EOF GUESS=3Dns32k-sni-sysv fi ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says GUESS=3Di586-unisys-sysv4 ;; @@ -1367,8 +1384,11 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=3Di586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=3Dx86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=3Dpowerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=3D$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=3Dsx4-nec-superux$UNAME_RELEASE diff --git a/config.sub b/config.sub index dba16e84c77..f6ede1d0dc0 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. =20 # shellcheck disable=3DSC2006,SC2268 # see below for rationale =20 -timestamp=3D'2022-01-03' +timestamp=3D'2023-06-23' =20 # 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 ." version=3D"\ GNU config.sub ($timestamp) =20 -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. =20 This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE= ." =20 help=3D" -Try \`$me --help' for more information." +Try '$me --help' for more information." =20 # Parse command line while test $# -gt 0 ; do @@ -130,7 +130,7 @@ IFS=3D$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=3D$field1 basic_os=3D$maybe_os ;; @@ -943,7 +943,7 @@ $basic_machine EOF IFS=3D$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=3Di586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=3Di686 ;; 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 ;; =20 *) - echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not re= cognized 1>&2 + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognize= d" 1>&2 exit 1 ;; esac @@ -1341,6 +1341,10 @@ EOF kernel=3Dlinux os=3D`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=3Dmanagarm + os=3D`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel=3D os=3D$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 w= ith OS \`$os'." 1>&2 + echo "Invalid configuration '$1': Kernel '$kernel' not known to work wit= h OS '$os'." 1>&2 exit 1 ;; esac