Merge remote-tracking branch 'origin/master' into feature/android

4 files changed, 41 insertions, 30 deletions

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 69188da73d7..354a8ccde42 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-01-01'
+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
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help         print this help, then exit
@@ -66,7 +66,7 @@ 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
@@ -102,8 +102,8 @@ GUESS=
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# 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.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -459,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
                 UNAME_RELEASE=`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=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
         GUESS=sparc-sun-sunos$SUN_REL
         ;;
@@ -1197,7 +1197,7 @@ EOF
         GUESS=$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=$UNAME_MACHINE-pc-os2-emx
         ;;
@@ -1338,7 +1338,7 @@ EOF
                 GUESS=ns32k-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 <Richard.M.Bartel@ccMail.Census.GOV>
         GUESS=i586-unisys-sysv4
         ;;
diff --git a/build-aux/config.sub b/build-aux/config.sub
index de4259e4047..9865d6ea4d1 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-01-21'
+timestamp='2023-06-26'
 
 # 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
@@ -82,7 +82,7 @@ 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,8 @@ 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* | managarm-*)
+                        | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+                        | windows-* )
                                 basic_machine=$field1
                                 basic_os=$maybe_os
                                 ;;
@@ -943,7 +944,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)
@@ -1285,7 +1286,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
@@ -1766,11 +1767,11 @@ case $os in
                 ;;
         none)
                 ;;
-        kernel* )
+        kernel* | msvc* )
                 # 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
@@ -1785,18 +1786,24 @@ case $kernel-$os in
                 ;;
         managarm-mlibc* | managarm-kernel* )
                 ;;
+        windows*-gnu* | windows*-msvc*)
+                ;;
         -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
+                echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
                 exit 1
                 ;;
         *-kernel* )
-                echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2
+                echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
+                exit 1
+                ;;
+        *-msvc* )
+                echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
                 exit 1
                 ;;
         kfreebsd*-gnu* | kopensolaris*-gnu*)
@@ -1813,7 +1820,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
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 4678bad1050..43e4a37adf4 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -35,7 +35,7 @@
 eval 'exec perl -wSx "$0" "$@"'
      if 0;
 
-my $VERSION = '2022-01-27 18:49'; # UTC
+my $VERSION = '2023-06-24 21:59'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -355,7 +355,7 @@ sub git_dir_option($)
           . "(expected date/author/email):\n$author_line\n";
 
       # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
-      # `(tiny change)' annotation.
+      # '(tiny change)' annotation.
       my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line)
                   ? '  (tiny change)' : '');
 
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 99196fceef6..0343eaa72c1 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -98,7 +98,8 @@
 #   6. Blank lines, even if preceded by the prefix, do not appear
 #      within the FSF copyright statement.
 #   7. Each copyright year is 2 or 4 digits, and years are separated by
-#      commas, "-", or "--".  Whitespace may appear after commas.
+#      commas, "-", "--", or "\(en" (for troff).  Whitespace may appear
+#      after commas.
 #
 # Environment variables:
 #
@@ -137,7 +138,7 @@
 eval 'exec perl -wSx -0777 -pi "$0" "$@"'
      if 0;
 
-my $VERSION = '2023-01-11.04:24'; # UTC
+my $VERSION = '2023-06-18.01:14'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -148,6 +149,7 @@ use warnings;
 
 my $copyright_re = 'Copyright';
 my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|&copy;|©)';
+my $ndash_re = '(?:--?|\\\\\(en)';
 my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
 $holder ||= 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
@@ -192,7 +194,7 @@ while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
     $holder_re =~ s/\s/$ws_re/g;
     my $stmt_remainder_re =
       "(?:$ws_re$circle_c_re)?"
-      . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|--?))*"
+      . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|$ndash_re))*"
       . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re";
     if (/\G$stmt_remainder_re/)
       {
@@ -215,7 +217,7 @@ if (defined $stmt_re)
     if ($final_year != $this_year)
       {
         # Update the year.
-        $stmt =~ s/\b$final_year_orig\b/$final_year, $this_year/;
+        $stmt =~ s/(^|[^\d])$final_year_orig\b/$1$final_year, $this_year/;
       }
     if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
       {
@@ -231,17 +233,19 @@ if (defined $stmt_re)
         # Make the use of intervals consistent.
         if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
           {
-            $stmt =~ s/(\d{4})--?(\d{4})/join(', ', $1..$2)/eg;
+            $stmt =~ s/(\d{4})$ndash_re(\d{4})/join(', ', $1..$2)/eg;
           }
         else
           {
-            my $ndash = $ARGV =~ /\.tex(i(nfo)?)?$/ ? "--" : "-";
+            my $ndash = ($ARGV =~ /\.tex(i(nfo)?)?$/ ? "--"
+                         : $ARGV =~ /\.(\d[a-z]*|man)$/ ? "\\(en"
+                         : "-");
 
             $stmt =~
               s/
                 (\d{4})
                 (?:
-                  (,\ |--?)
+                  (,\ |$ndash_re)
                   ((??{
                     if   ($2 ne ', ') { '\d{4}'; }
                     elsif (!$3)       { $1 + 1;  }
@@ -252,7 +256,7 @@ if (defined $stmt_re)
 
             # When it's 2, emit a single range encompassing all year numbers.
             $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
-              and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1$ndash$2/;
+              and $stmt =~ s/(^|[^\d])(\d{4})\b.*(?:[^\d])(\d{4})\b/$1$2$ndash$3/;
           }
 
         # Format within margin.