adding go wrapper

2025-10-26 23:18:23 +09:00
parent f45aba56f2
commit 3b5a21a60a
34 changed files with 4103 additions and 5309 deletions
--- a/ac/ar-lib
+++ b/ac/ar-lib
@ -2,9 +2,9 @@
 # Wrapper for Microsoft lib.exe

 me=ar-lib
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2025-02-03.05; # UTC

-# Copyright (C) 2010-2024 Free Software Foundation, Inc.
+# Copyright (C) 2010-2025 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
@ -51,9 +51,20 @@ func_file_conv ()
 	# lazily determine how to convert abs files
 	case `uname -s` in
 	  MINGW*)
-	    file_conv=mingw
+	    if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then
+	      # MSYS2 environment.
+	      file_conv=cygwin
+	    else
+	      # Original MinGW environment.
+	      file_conv=mingw
+	    fi
 	    ;;
-	  CYGWIN* | MSYS*)
+	  MSYS*)
+	    # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell.
+	    file_conv=cygwin
+	    ;;
+	  CYGWIN*)
+	    # Cygwin environment.
 	    file_conv=cygwin
 	    ;;
 	  *)
@ -65,8 +76,8 @@ func_file_conv ()
 	mingw)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin | msys)
-	  file=`cygpath -m "$file" || echo "$file"`
+	cygwin)
+	  file=`cygpath -w "$file" || echo "$file"`
 	  ;;
 	wine)
 	  file=`winepath -w "$file" || echo "$file"`
--- a/ac/compile
+++ b/ac/compile
@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.

-scriptversion=2024-06-19.01; # UTC
+scriptversion=2025-06-18.21; # UTC

-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2025 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@ -37,11 +37,11 @@ IFS=" ""	$nl"

 file_conv=

-# func_file_conv build_file lazy
+# func_file_conv build_file unneeded_conversions
 # Convert a $build file to $host form and store it in $file
 # Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
+# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no
+# conversion will take place.
 func_file_conv ()
 {
  file=$1
@ -51,9 +51,20 @@ func_file_conv ()
 	# lazily determine how to convert abs files
 	case `uname -s` in
 	  MINGW*)
-	    file_conv=mingw
+	    if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then
+	      # MSYS2 environment.
+	      file_conv=cygwin
+	    else
+	      # Original MinGW environment.
+	      file_conv=mingw
+	    fi
 	    ;;
-	  CYGWIN* | MSYS*)
+	  MSYS*)
+	    # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell.
+	    file_conv=cygwin
+	    ;;
+	  CYGWIN*)
+	    # Cygwin environment.
 	    file_conv=cygwin
 	    ;;
 	  *)
@ -63,12 +74,14 @@ func_file_conv ()
      fi
      case $file_conv/,$2, in
 	*,$file_conv,*)
+	  # This is the optimization mentioned above:
+	  # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert.
 	  ;;
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/* | msys/*)
-	  file=`cygpath -m "$file" || echo "$file"`
+	cygwin/*)
+	  file=`cygpath -w "$file" || echo "$file"`
 	  ;;
 	wine/*)
 	  file=`winepath -w "$file" || echo "$file"`
@ -343,9 +356,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ac/config.guess
+++ b/ac/config.guess
@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2024 Free Software Foundation, Inc.

@ -194,6 +194,17 @@ Linux|GNU|GNU/*)
 	;;
 esac

+case "${UNAME_MACHINE}" in
+  i?86)
+     test -z "$VENDOR" && VENDOR=pc
+     ;;
+  *)
+     test -z "$VENDOR" && VENDOR=unknown
+     ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+test -f /etc/os-release && grep -q suse /etc/os-release && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.

 case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
@ -275,46 +286,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 	;;
    *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-bitrig$UNAME_RELEASE
 	;;
    *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-openbsd$UNAME_RELEASE
 	;;
    *:SecBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-secbsd$UNAME_RELEASE
 	;;
    *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE_ARCH-${VENDOR}-libertybsd$UNAME_RELEASE
 	;;
    *:MidnightBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-midnightbsd$UNAME_RELEASE
 	;;
    *:ekkoBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-ekkobsd$UNAME_RELEASE
 	;;
    *:SolidBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-solidbsd$UNAME_RELEASE
 	;;
    *:OS108:*:*)
-	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-os108_$UNAME_RELEASE
 	;;
    macppc:MirBSD:*:*)
-	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+	GUESS=powerpc-${VENDOR}-mirbsd$UNAME_RELEASE
 	;;
    *:MirBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-mirbsd$UNAME_RELEASE
 	;;
    *:Sortix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-sortix
+	GUESS=$UNAME_MACHINE-${VENDOR}-sortix
 	;;
    *:Twizzler:*:*)
-	GUESS=$UNAME_MACHINE-unknown-twizzler
+	GUESS=$UNAME_MACHINE-${VENDOR}-twizzler
 	;;
    *:Redox:*:*)
-	GUESS=$UNAME_MACHINE-unknown-redox
+	GUESS=$UNAME_MACHINE-${VENDOR}-redox
 	;;
    mips:OSF1:*.*)
 	GUESS=mips-dec-osf1
@ -376,13 +387,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
 	;;
    Amiga*:UNIX_System_V:4.0:*)
-	GUESS=m68k-unknown-sysv4
+	GUESS=m68k-${VENDOR}-sysv4
 	;;
    *:[Aa]miga[Oo][Ss]:*:*)
-	GUESS=$UNAME_MACHINE-unknown-amigaos
+	GUESS=$UNAME_MACHINE-${VENDOR}-amigaos
 	;;
    *:[Mm]orph[Oo][Ss]:*:*)
-	GUESS=$UNAME_MACHINE-unknown-morphos
+	GUESS=$UNAME_MACHINE-${VENDOR}-morphos
 	;;
    *:OS/390:*:*)
 	GUESS=i370-ibm-openedition
@ -397,7 +408,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 	GUESS=arm-acorn-riscix$UNAME_RELEASE
 	;;
    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	GUESS=arm-unknown-riscos
+	GUESS=arm-${VENDOR}-riscos
 	;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	GUESS=hppa1.1-hitachi-hiuxmpp
@ -511,7 +522,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 	GUESS=m68k-hades-mint$UNAME_RELEASE
 	;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	GUESS=m68k-unknown-mint$UNAME_RELEASE
+	GUESS=m68k-${VENDOR}-mint$UNAME_RELEASE
 	;;
    m68k:machten:*:*)
 	GUESS=m68k-apple-machten$UNAME_RELEASE
@ -826,9 +837,9 @@ EOF
 	;;
    i*86:OSF1:*:*)
 	if test -x /usr/sbin/sysversion ; then
-	    GUESS=$UNAME_MACHINE-unknown-osf1mk
+	    GUESS=$UNAME_MACHINE-${VENDOR}-osf1mk
 	else
-	    GUESS=$UNAME_MACHINE-unknown-osf1
+	    GUESS=$UNAME_MACHINE-${VENDOR}-osf1
 	fi
 	;;
    parisc*:Lites*:*:*)
@ -893,10 +904,10 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
 	;;
    sparc*:BSD/OS:*:*)
-	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+	GUESS=sparc-${VENDOR}-bsdi$UNAME_RELEASE
 	;;
    *:BSD/OS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-bsdi$UNAME_RELEASE
 	;;
    arm:FreeBSD:*:*)
 	UNAME_PROCESSOR=`uname -p`
@ -905,10 +916,10 @@ EOF
 	    | grep -q __ARM_PCS_VFP
 	then
 	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+	    GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabi
 	else
 	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+	    GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL-gnueabihf
 	fi
 	;;
    *:FreeBSD:*:*)
@ -920,7 +931,7 @@ EOF
 		UNAME_PROCESSOR=i586 ;;
 	esac
 	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+	GUESS=$UNAME_PROCESSOR-${VENDOR}-freebsd$FREEBSD_REL
 	;;
    i*:CYGWIN*:*)
 	GUESS=$UNAME_MACHINE-pc-cygwin
@ -946,10 +957,10 @@ EOF
 		GUESS=i586-pc-interix$UNAME_RELEASE
 		;;
 	    authenticamd | genuineintel | EM64T)
-		GUESS=x86_64-unknown-interix$UNAME_RELEASE
+		GUESS=x86_64-${VENDOR}-interix$UNAME_RELEASE
 		;;
 	    IA64)
-		GUESS=ia64-unknown-interix$UNAME_RELEASE
+		GUESS=ia64-${VENDOR}-interix$UNAME_RELEASE
 		;;
 	esac ;;
    i*:UWIN*:*)
@ -960,7 +971,7 @@ EOF
 	;;
    prep*:SunOS:5.*:*)
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
-	GUESS=powerpcle-unknown-solaris2$SUN_REL
+	GUESS=powerpcle-${VENDOR}-solaris2$SUN_REL
 	;;
    *:GNU:*:*)
 	# the GNU system
@ -978,10 +989,10 @@ EOF
 	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
 	;;
    *:[Mm]anagarm:*:*)
-	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+	GUESS="$UNAME_MACHINE-${VENDOR}-managarm-mlibc"
 	;;
    *:Minix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-minix
+	GUESS=$UNAME_MACHINE-${VENDOR}-minix
 	;;
    aarch64:Linux:*:*)
 	set_cc_for_build
@ -1004,11 +1015,11 @@ EOF
 		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
 	    esac
 	fi
-	GUESS=$CPU-unknown-linux-$LIBCABI
+	GUESS=$CPU-${VENDOR}-linux-$LIBCABI
 	;;
    aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
@ -1022,29 +1033,29 @@ EOF
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    arm*:Linux:*:*)
 	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	    GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
+		GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabi
 	    else
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
+		GUESS=$UNAME_MACHINE-${VENDOR}-linux-${LIBC}eabihf
 	    fi
 	fi
 	;;
    avr32*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    cris:Linux:*:*)
 	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
@ -1053,40 +1064,40 @@ EOF
 	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
 	;;
    e2k:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    frv:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    hexagon:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    i*86:Linux:*:*)
 	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
 	;;
    ia64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    k1om:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    kvx:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    kvx:cos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-cos
+	GUESS=$UNAME_MACHINE-${VENDOR}-cos
 	;;
    kvx:mbr:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mbr
+	GUESS=$UNAME_MACHINE-${VENDOR}-mbr
 	;;
    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    m32r*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    m68*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    mips:Linux:*:* | mips64:Linux:*:*)
 	set_cc_for_build
@ -1137,57 +1148,57 @@ EOF
 	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
 	;;
    mips64el:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    openrisc*:Linux:*:*)
-	GUESS=or1k-unknown-linux-$LIBC
+	GUESS=or1k-${VENDOR}-linux-$LIBC
 	;;
    or32:Linux:*:* | or1k*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    padre:Linux:*:*)
-	GUESS=sparc-unknown-linux-$LIBC
+	GUESS=sparc-${VENDOR}-linux-$LIBC
 	;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	GUESS=hppa64-unknown-linux-$LIBC
+	GUESS=hppa64-${VENDOR}-linux-$LIBC
 	;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
-	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
-	  *)    GUESS=hppa-unknown-linux-$LIBC ;;
+	  PA7*) GUESS=hppa1.1-${VENDOR}-linux-$LIBC ;;
+	  PA8*) GUESS=hppa2.0-${VENDOR}-linux-$LIBC ;;
+	  *)    GUESS=hppa-${VENDOR}-linux-$LIBC ;;
 	esac
 	;;
    ppc64:Linux:*:*)
-	GUESS=powerpc64-unknown-linux-$LIBC
+	GUESS=powerpc64-${VENDOR}-linux-$LIBC
 	;;
    ppc:Linux:*:*)
-	GUESS=powerpc-unknown-linux-$LIBC
+	GUESS=powerpc-${VENDOR}-linux-$LIBC
 	;;
    ppc64le:Linux:*:*)
-	GUESS=powerpc64le-unknown-linux-$LIBC
+	GUESS=powerpc64le-${VENDOR}-linux-$LIBC
 	;;
    ppcle:Linux:*:*)
-	GUESS=powerpcle-unknown-linux-$LIBC
+	GUESS=powerpcle-${VENDOR}-linux-$LIBC
 	;;
    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
 	;;
    sh64*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    sh*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    tile*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    vax:Linux:*:*)
 	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
@ -1217,7 +1228,7 @@ EOF
 	GUESS=$CPU-pc-linux-$LIBCABI
 	;;
    xtensa*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC
 	;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@ -1239,16 +1250,16 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
    i*86:XTS-300:*:STOP)
-	GUESS=$UNAME_MACHINE-unknown-stop
+	GUESS=$UNAME_MACHINE-${VENDOR}-stop
 	;;
    i*86:atheos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-atheos
+	GUESS=$UNAME_MACHINE-${VENDOR}-atheos
 	;;
    i*86:syllable:*:*)
 	GUESS=$UNAME_MACHINE-pc-syllable
 	;;
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	GUESS=i386-unknown-lynxos$UNAME_RELEASE
+	GUESS=i386-${VENDOR}-lynxos$UNAME_RELEASE
 	;;
    i*86:*DOS:*:*)
 	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
@ -1268,7 +1279,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	GUESS=$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	;;
    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@ -1307,7 +1318,7 @@ EOF
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
+	  GUESS=i860-${VENDOR}-sysv$UNAME_RELEASE     # Unknown i860-SVR4
 	fi
 	;;
    mini*:CTIX:SYS*5:*)
@ -1344,19 +1355,19 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+	GUESS=m68k-${VENDOR}-lynxos$UNAME_RELEASE
 	;;
    mc68030:UNIX_System_V:4.*:*)
 	GUESS=m68k-atari-sysv4
 	;;
    TSUNAMI:LynxOS:2.*:*)
-	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+	GUESS=sparc-${VENDOR}-lynxos$UNAME_RELEASE
 	;;
    rs6000:LynxOS:2.*:*)
-	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+	GUESS=rs6000-${VENDOR}-lynxos$UNAME_RELEASE
 	;;
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+	GUESS=powerpc-${VENDOR}-lynxos$UNAME_RELEASE
 	;;
    SM[BE]S:UNIX_SV:*:*)
 	GUESS=mips-dde-sysv$UNAME_RELEASE
@ -1406,7 +1417,7 @@ EOF
 	if test -d /usr/nec; then
 		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
-		GUESS=mips-unknown-sysv$UNAME_RELEASE
+		GUESS=mips-${VENDOR}-sysv$UNAME_RELEASE
 	fi
 	;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@ -1425,7 +1436,7 @@ EOF
 	GUESS=powerpc-apple-haiku
 	;;
    *:Haiku:*:*)	# Haiku modern gcc (not bound by BeOS compat)
-	GUESS=$UNAME_MACHINE-unknown-haiku
+	GUESS=$UNAME_MACHINE-${VENDOR}-haiku
 	;;
    SX-4:SUPER-UX:*:*)
 	GUESS=sx4-nec-superux$UNAME_RELEASE
@ -1538,13 +1549,13 @@ EOF
 	elif test "x${cputype-}" != x; then
 	    UNAME_MACHINE=$cputype
 	fi
-	GUESS=$UNAME_MACHINE-unknown-plan9
+	GUESS=$UNAME_MACHINE-${VENDOR}-plan9
 	;;
    *:TOPS-10:*:*)
-	GUESS=pdp10-unknown-tops10
+	GUESS=pdp10-${VENDOR}-tops10
 	;;
    *:TENEX:*:*)
-	GUESS=pdp10-unknown-tenex
+	GUESS=pdp10-${VENDOR}-tenex
 	;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	GUESS=pdp10-dec-tops20
@ -1553,17 +1564,17 @@ EOF
 	GUESS=pdp10-xkl-tops20
 	;;
    *:TOPS-20:*:*)
-	GUESS=pdp10-unknown-tops20
+	GUESS=pdp10-${VENDOR}-tops20
 	;;
    *:ITS:*:*)
-	GUESS=pdp10-unknown-its
+	GUESS=pdp10-${VENDOR}-its
 	;;
    SEI:*:*:SEIUX)
 	GUESS=mips-sei-seiux$UNAME_RELEASE
 	;;
    *:DragonFly:*:*)
 	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
-	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+	GUESS=$UNAME_MACHINE-${VENDOR}-dragonfly$DRAGONFLY_REL
 	;;
    *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
@ -1586,19 +1597,19 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-fiwix
 	;;
    *:AROS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-aros
+	GUESS=$UNAME_MACHINE-${VENDOR}-aros
 	;;
    x86_64:VMkernel:*:*)
-	GUESS=$UNAME_MACHINE-unknown-esx
+	GUESS=$UNAME_MACHINE-${VENDOR}-esx
 	;;
    amd64:Isilon\ OneFS:*:*)
-	GUESS=x86_64-unknown-onefs
+	GUESS=x86_64-${VENDOR}-onefs
 	;;
    *:Unleashed:*:*)
-	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+	GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE
 	;;
    *:Ironclad:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ironclad
+	GUESS=$UNAME_MACHINE-${VENDOR}-ironclad
 	;;
 esac

--- a/ac/config.sub
+++ b/ac/config.sub
@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2024 Free Software Foundation, Inc.

--- a/ac/depcomp
+++ b/ac/depcomp
@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2024-06-19.01; # UTC
+scriptversion=2025-06-18.21; # UTC

-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2025 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -784,9 +784,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ac/install-sh
+++ b/ac/install-sh
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile

-scriptversion=2024-06-19.01; # UTC
+scriptversion=2025-06-18.21; # UTC

 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -533,9 +533,9 @@ do
 done

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ac/ltmain.sh
+++ b/ac/ltmain.sh
--- a/ac/missing
+++ b/ac/missing
@ -1,11 +1,11 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU and other programs.

-scriptversion=2024-06-07.14; # UTC
+scriptversion=2025-06-18.21; # UTC

 # shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells

-# Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2025 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

 # This program is free software; you can redistribute it and/or modify
@ -228,9 +228,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ac/tap-driver.sh
+++ b/ac/tap-driver.sh
@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2024 Free Software Foundation, Inc.
+# Copyright (C) 2011-2025 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.

-scriptversion=2024-06-19.01; # UTC
+scriptversion=2025-06-18.21; # UTC

 # Make unconditional expansion of undefined variables an error.  This
 # helps a lot in preventing typo-related bugs.
@ -52,8 +52,9 @@ Usage:
                [--expect-failure {yes|no}] [--color-tests {yes|no}]
                [--enable-hard-errors {yes|no}] [--ignore-exit]
                [--diagnostic-string STRING] [--merge|--no-merge]
-                [--comments|--no-comments] [--] TEST-COMMAND
-The '--test-name', '-log-file' and '--trs-file' options are mandatory.
+                [--stderr-prefix STRING] [--comments|--no-comments]
+                [--] TEST-COMMAND
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.

 Report bugs to <bug-automake@gnu.org>.
 GNU Automake home page: <https://www.gnu.org/software/automake/>.
@ -69,6 +70,7 @@ trs_file=  # Where to save the metadata of the test run.
 expect_failure=0
 color_tests=0
 merge=0
+stderr_prefix=
 ignore_exit=0
 comments=0
 diag_string='#'
@ -84,6 +86,7 @@ while test $# -gt 0; do
  --enable-hard-errors) shift;; # No-op.
  --merge) merge=1;;
  --no-merge) merge=0;;
+  --stderr-prefix) stderr_prefix=$2; shift;;
  --ignore-exit) ignore_exit=1;;
  --comments) comments=1;;
  --no-comments) comments=0;;
@ -94,6 +97,44 @@ while test $# -gt 0; do
  shift
 done

+# Quadrigraph substitutions for `--stderr-prefix'.  Note that the empty
+# substitution MUST be done last, otherwise `@%@&t@:@' will become `#', not
+# `@%:@'.
+for q_r in '@%:@ #' '@&t@ '; do
+  q=${q_r%% *} # quadrigraph
+  r=${q_r#* } # replacement
+  while true; do
+    case $stderr_prefix in
+    *"$q"*) stderr_prefix=${stderr_prefix%%"$q"*}$r${stderr_prefix#*"$q"};;
+    *) break;;
+    esac
+  done
+done
+
+# Prefixes each line of its stdin with the first argument and writes the result
+# to stdout.  If the final line of stdin is non-empty and does not end with a
+# terminating newline, a newline is added.
+prefix_lines() {
+  # Implementation note: This function is used to prefix the test script's
+  # stderr lines.  Preserving the order of the test script's stdout and stderr
+  # lines is important for debugging, so this function is sensitive to input and
+  # output buffering.  A shell loop is used to prefix the lines instead of
+  # `$AM_TAP_AWK' (which would probably be more efficient) because `mawk'
+  # aggressively buffers its input (except with the `-Winteractive' command-line
+  # option), which would defeat the purpose of the `--merge' option.  `sed' or
+  # `perl' could be used instead of a shell loop, but those would add a
+  # dependency to this script.
+
+  # <https://stackoverflow.com/a/6399568> explains `IFS='.  The `||' check
+  # ensures that stdin's final line is written to stdout even if it is missing a
+  # terminating newline.
+  while IFS= read -r line || test -n "$line"; do
+    # `printf' is preferred over `echo' because `echo' might process backslash
+    # escapes or behave unexpectedly if its argument looks like an option.
+    printf %s\\n "$1$line"
+  done
+}
+
 test $# -gt 0 || usage_error "missing test command"

 case $expect_failure in
@ -139,13 +180,61 @@ fi
    # <https://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
    trap : 1 3 2 13 15
+    # Duplicate the stdout fd (which connects to awk's stdin) to fd 4 so that we
+    # can reuse fd 1 for pipelines and command substitutions below.
+    exec 4>&1
+    # Determine where to send the test script's stderr.  Only the test's stderr
+    # should go here; if `exec 2>&$stderr_fd' were run, this script's stderr
+    # (e.g., `set -x' output, if turned on to help with debugging) would mix
+    # with the test script's stderr and go to the log (via `awk', if `--merge'
+    # is enabled), not the terminal.
    if test $merge -gt 0; then
-      exec 2>&1
+      stderr_fd=4  # send stderr to awk, which will copy it to the log
    else
-      exec 2>&3
+      stderr_fd=3  # send stderr directly to the log file
    fi
-    "$@"
-    echo $?
+    if test -n "$stderr_prefix"; then
+      # Set to the test script's numeric exit status.
+      status=$(
+        exec 5>&1
+        {
+          {
+            "$@" 5>&-
+            # Capturing the status in a variable then writing the variable value
+            # to awk below may seem like unnecessary steps: Why not just write
+            # the status directly to awk here?  This avoids a race condition:
+            # The awk script below *requires* the final line of its input to be
+            # the test program's exit status.  Writing to fd 4 here would not
+            # provide that guarantee because this `echo' is running concurrently
+            # with `prefix_lines', which is writing to fd 4 if `--merge' is
+            # enabled.  Thus, a prefixed and merged stderr line could be written
+            # to fd 4 /after/ this status is written, which would break the awk
+            # script if the status was written directly to awk here.
+            printf %s\\n "$?" 1>&5
+          } |
+          # Each line of the test program's stdout is read then written
+          # unchanged to stdout.  This is an attempt to subvert buffering so
+          # that stderr and stdout lines are processed in approximately the same
+          # order as written by the test program.  (A less racy approach would
+          # be to use a select or poll loop over both stderr and stdout, but
+          # there is no portable (POSIX) way to do that from a shell script.)
+          #
+          # This also adds a terminating newline to the test program's final
+          # stdout line if missing.
+          while IFS= read -r line || test -n "$line"; do
+            printf %s\\n "$line"
+          done
+        } 2>&1 1>&4 3>&- 4>&- | prefix_lines "$stderr_prefix" 1>&$stderr_fd
+      )
+    else
+      # Avoid using `prefix_lines' for stderr if `$stderr_prefix' is the empty
+      # string.  This ensures that the test program's stderr and stdout are sent
+      # to awk in the order they were written by the test program.  (Only
+      # relevant if `--merge' is enabled.)
+      "$@" 2>&$stderr_fd 3>&- 4>&-
+      status=$?
+    fi
+    printf %s\\n "$status"
  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
        -v me="$me" \
        -v test_script_name="$test_name" \
@ -455,7 +544,7 @@ function get_test_exit_message(status)
  if (status == 0)
    return ""
  if (status !~ /^[1-9][0-9]*$/)
-    abort("getting exit status")
+    abort("getting exit status: not an integer: " status)
  if (status < 127)
    exit_details = ""
  else if (status == 127)
@ -638,8 +727,6 @@ exit 0

 } # End of "BEGIN" block.
 '
-
-# TODO: document that we consume the file descriptor 3 :-(
 } 3>"$log_file"

 test $? -eq 0 || fatal "I/O or internal error"
@ -647,9 +734,10 @@ test $? -eq 0 || fatal "I/O or internal error"
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
+# time-stamp-line-limit: 50
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/ac/test-driver
+++ b/ac/test-driver
@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.

-scriptversion=2024-06-19.01; # UTC
+scriptversion=2025-06-18.21; # UTC

-# Copyright (C) 2011-2024 Free Software Foundation, Inc.
+# Copyright (C) 2011-2025 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -152,9 +152,9 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End: