Diff of the two buildlogs:

--
--- b1/build.log	2025-04-07 12:40:12.635447379 +0000
+++ b2/build.log	2025-04-07 12:48:23.344583081 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Mon Apr  7 00:30:54 -12 2025
-I: pbuilder-time-stamp: 1744029054
+I: Current time: Mon May 11 09:03:15 +14 2026
+I: pbuilder-time-stamp: 1778439795
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz]
 I: copying local configuration
@@ -23,52 +23,84 @@
 dpkg-source: info: unpacking nano_8.4-1.debian.tar.xz
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/240440/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink03-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 May 10 19:03 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='unstable'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=unstable
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='a3803008d75b429db1672394eee1e849'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='240440'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=0e4a0c6e3b28414080faeadc6a16bf73
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=3824761
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.aSEoItmG/pbuilderrc_MO6o --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.aSEoItmG/b1 --logfile b1/build.log nano_8.4-1.dsc'
-  SUDO_GID='109'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.aSEoItmG/pbuilderrc_78wF --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.aSEoItmG/b2 --logfile b2/build.log nano_8.4-1.dsc'
+  SUDO_GID=109
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink04-arm64 6.1.0-32-cloud-arm64 #1 SMP Debian 6.1.129-1 (2025-03-06) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-32-cloud-arm64 #1 SMP Debian 6.1.129-1 (2025-03-06) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Mar  4 11:20 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/240440/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Mar  4  2025 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -157,7 +189,7 @@
 Get: 45 http://deb.debian.org/debian unstable/main arm64 tex-common all 6.19 [29.4 kB]
 Get: 46 http://deb.debian.org/debian unstable/main arm64 texinfo-lib arm64 7.1.1-1+b1 [220 kB]
 Get: 47 http://deb.debian.org/debian unstable/main arm64 texinfo all 7.1.1-1 [1753 kB]
-Fetched 14.9 MB in 0s (39.4 MB/s)
+Fetched 14.9 MB in 0s (66.2 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libproc2-0:arm64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19945 files and directories currently installed.)
@@ -369,7 +401,11 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/reproducible-path/nano-8.4/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../nano_8.4-1_source.changes
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for unstable
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/nano-8.4/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../nano_8.4-1_source.changes
 dpkg-buildpackage: info: source package nano
 dpkg-buildpackage: info: source version 8.4-1
 dpkg-buildpackage: info: source distribution unstable
@@ -2054,6 +2090,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/ctype.in.h > ctype.h-t
+mv alloca.h-t alloca.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_DIRENT_H''@|1|g' \
@@ -2089,6 +2126,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/dirent.in.h > dirent.h-t
+mv ctype.h-t ctype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_ERROR_H''@|1|g' \
@@ -2100,6 +2138,7 @@
       -e 's|@''REPLACE_ERROR_AT_LINE''@|0|g' \
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       ../../lib/error.in.h > error.h-t
+mv dirent.h-t dirent.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2123,11 +2162,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/fcntl.in.h > fcntl.h-t
-mv alloca.h-t alloca.h
-mv ctype.h-t ctype.h
-mv dirent.h-t dirent.h
 mv error.h-t error.h
-mv fcntl.h-t fcntl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2136,13 +2171,13 @@
       -e 's|@''NEXT_FLOAT_H''@|<float.h>|g' \
       -e 's|@''REPLACE_ITOLD''@|0|g' \
       ../../lib/float.in.h > float.h-t
-/usr/bin/mkdir -p 'malloc'
+mv fcntl.h-t fcntl.h
 mv float.h-t float.h
+/usr/bin/mkdir -p 'malloc'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
   -e '/libc_hidden_proto/d' \
   ../../lib/malloc/dynarray.h > malloc/dynarray.gl.h-t
 /usr/bin/mkdir -p 'malloc'
-mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
       -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
@@ -2151,8 +2186,16 @@
       -e 's|__glibc_likely|_GL_LIKELY|g' \
       -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
       ../../lib/malloc/dynarray-skeleton.c > malloc/dynarray-skeleton.gl.h-t
+mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
+mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
 /usr/bin/mkdir -p 'malloc'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
+      -e 's|__glibc_likely|_GL_LIKELY|g' \
+      -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
+      -e '/libc_hidden_proto/d' \
+      ../../lib/malloc/scratch_buffer.h > malloc/scratch_buffer.gl.h-t
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e '/__BEGIN_DECLS/{ s/__BEGIN_DECLS/#ifdef __cplusplus%extern "C" {%#endif/; y/%/\n/; }' \
       -e '/__END_DECLS/{ s/__END_DECLS/#ifdef __cplusplus%}%#endif/; y/%/\n/; }' \
       -e 's|__THROWNL||g' \
@@ -2162,14 +2205,6 @@
       -e 's|ifdef __USE_GNU|if 1|' \
       -e 's|ifdef __USE_LARGEFILE64|if 0|' \
       ../../lib/glob-libc.h > glob-libc.gl.h-t
-mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
-      -e 's|__glibc_likely|_GL_LIKELY|g' \
-      -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
-      -e '/libc_hidden_proto/d' \
-      ../../lib/malloc/scratch_buffer.h > malloc/scratch_buffer.gl.h-t
-mv glob-libc.gl.h-t glob-libc.gl.h
 mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's/@''HAVE_INTTYPES_H''@/1/g' \
@@ -2200,6 +2235,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/inttypes.in.h > inttypes.h-t
+mv glob-libc.gl.h-t glob-libc.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_LANGINFO_H''@|1|g' \
@@ -2262,7 +2298,6 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/locale.in.h > locale.h-t
 mv limits.h-t limits.h
-mv locale.h-t locale.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|include_next|g' \
@@ -2317,6 +2352,7 @@
       -e 's/@''GNULIB_HYPOTF''@/0/g' \
       -e 's/@''GNULIB_HYPOTL''@/0/g' \
       < ../../lib/math.in.h > math.h-t1
+mv locale.h-t locale.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_PTHREAD_H''@|1|g' \
@@ -2393,17 +2429,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/signal.in.h > signal.h-t
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_STDDEF_H''@|<stddef.h>|g' \
-      -e 's|@''NULLPTR_T_NEEDS_STDDEF''@|0|g' \
-      -e 's|@''STDDEF_NOT_IDEMPOTENT''@|0|g' \
-      -e 's|@''REPLACE_NULL''@|0|g' \
-      -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
-      ../../lib/stddef.in.h > stddef.h-t
 sed \
       -e 's/@''GNULIB_ILOGB''@/0/g' \
       -e 's/@''GNULIB_ILOGBF''@/0/g' \
@@ -2524,7 +2549,17 @@
       < pthread.h-t1 > pthread.h-t2
 mv sched.h-t sched.h
 mv signal.h-t signal.h
-mv stddef.h-t stddef.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_STDDEF_H''@|<stddef.h>|g' \
+      -e 's|@''NULLPTR_T_NEEDS_STDDEF''@|0|g' \
+      -e 's|@''STDDEF_NOT_IDEMPOTENT''@|0|g' \
+      -e 's|@''REPLACE_NULL''@|0|g' \
+      -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
+      ../../lib/stddef.in.h > stddef.h-t
 sed \
       -e 's|@''HAVE_ACOSF''@|1|g' \
       -e 's|@''HAVE_ACOSL''@|1|g' \
@@ -2641,6 +2676,30 @@
       -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
       -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
       < pthread.h-t2 > pthread.h-t3
+mv stddef.h-t stddef.h
+sed \
+      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < pthread.h-t3 > pthread.h-t4
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2720,6 +2779,46 @@
       -e 's/@''GNULIB_MDA_PUTW''@/1/g' \
       -e 's/@''GNULIB_MDA_TEMPNAM''@/1/g' \
       < ../../lib/stdio.in.h > stdio.h-t1
+sed \
+      -e 's|@''HAVE_DECL_ACOSL''@|1|g' \
+      -e 's|@''HAVE_DECL_ASINL''@|1|g' \
+      -e 's|@''HAVE_DECL_ATANL''@|1|g' \
+      -e 's|@''HAVE_DECL_CBRTF''@|1|g' \
+      -e 's|@''HAVE_DECL_CBRTL''@|1|g' \
+      -e 's|@''HAVE_DECL_CEILF''@|1|g' \
+      -e 's|@''HAVE_DECL_CEILL''@|1|g' \
+      -e 's|@''HAVE_DECL_COPYSIGNF''@|1|g' \
+      -e 's|@''HAVE_DECL_COSL''@|1|g' \
+      -e 's|@''HAVE_DECL_EXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2F''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2L''@|1|g' \
+      -e 's|@''HAVE_DECL_EXPM1L''@|1|g' \
+      -e 's|@''HAVE_DECL_FLOORF''@|1|g' \
+      -e 's|@''HAVE_DECL_FLOORL''@|1|g' \
+      -e 's|@''HAVE_DECL_FREXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_LDEXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_LOGL''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG10L''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2F''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2L''@|1|g' \
+      -e 's|@''HAVE_DECL_LOGB''@|1|g' \
+      -e 's|@''HAVE_DECL_REMAINDER''@|1|g' \
+      -e 's|@''HAVE_DECL_REMAINDERL''@|1|g' \
+      -e 's|@''HAVE_DECL_RINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUND''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUNDF''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUNDL''@|1|g' \
+      -e 's|@''HAVE_DECL_SINL''@|1|g' \
+      -e 's|@''HAVE_DECL_SQRTL''@|1|g' \
+      -e 's|@''HAVE_DECL_TANL''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNC''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCF''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCL''@|1|g' \
+      < math.h-t3 > math.h-t4
+rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
+mv pthread.h-t4 pthread.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2781,66 +2880,73 @@
       -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
       < ../../lib/stdlib.in.h > stdlib.h-t1
 sed \
-      -e 's|@''HAVE_DECL_ACOSL''@|1|g' \
-      -e 's|@''HAVE_DECL_ASINL''@|1|g' \
-      -e 's|@''HAVE_DECL_ATANL''@|1|g' \
-      -e 's|@''HAVE_DECL_CBRTF''@|1|g' \
-      -e 's|@''HAVE_DECL_CBRTL''@|1|g' \
-      -e 's|@''HAVE_DECL_CEILF''@|1|g' \
-      -e 's|@''HAVE_DECL_CEILL''@|1|g' \
-      -e 's|@''HAVE_DECL_COPYSIGNF''@|1|g' \
-      -e 's|@''HAVE_DECL_COSL''@|1|g' \
-      -e 's|@''HAVE_DECL_EXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2F''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2L''@|1|g' \
-      -e 's|@''HAVE_DECL_EXPM1L''@|1|g' \
-      -e 's|@''HAVE_DECL_FLOORF''@|1|g' \
-      -e 's|@''HAVE_DECL_FLOORL''@|1|g' \
-      -e 's|@''HAVE_DECL_FREXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_LDEXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_LOGL''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG10L''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2F''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2L''@|1|g' \
-      -e 's|@''HAVE_DECL_LOGB''@|1|g' \
-      -e 's|@''HAVE_DECL_REMAINDER''@|1|g' \
-      -e 's|@''HAVE_DECL_REMAINDERL''@|1|g' \
-      -e 's|@''HAVE_DECL_RINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUND''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUNDF''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUNDL''@|1|g' \
-      -e 's|@''HAVE_DECL_SINL''@|1|g' \
-      -e 's|@''HAVE_DECL_SQRTL''@|1|g' \
-      -e 's|@''HAVE_DECL_TANL''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNC''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCF''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCL''@|1|g' \
-      < math.h-t3 > math.h-t4
+      -e 's|@''REPLACE_ACOSF''@|0|g' \
+      -e 's|@''REPLACE_ASINF''@|0|g' \
+      -e 's|@''REPLACE_ATANF''@|0|g' \
+      -e 's|@''REPLACE_ATAN2F''@|0|g' \
+      -e 's|@''REPLACE_CBRTF''@|0|g' \
+      -e 's|@''REPLACE_CBRTL''@|0|g' \
+      -e 's|@''REPLACE_CEIL''@|0|g' \
+      -e 's|@''REPLACE_CEILF''@|0|g' \
+      -e 's|@''REPLACE_CEILL''@|0|g' \
+      -e 's|@''REPLACE_COSF''@|0|g' \
+      -e 's|@''REPLACE_COSHF''@|0|g' \
+      -e 's|@''REPLACE_EXPF''@|0|g' \
+      -e 's|@''REPLACE_EXPL''@|0|g' \
+      -e 's|@''REPLACE_EXPM1''@|0|g' \
+      -e 's|@''REPLACE_EXPM1F''@|0|g' \
+      -e 's|@''REPLACE_EXPM1L''@|0|g' \
+      -e 's|@''REPLACE_EXP2''@|0|g' \
+      -e 's|@''REPLACE_EXP2L''@|0|g' \
+      -e 's|@''REPLACE_FABSL''@|0|g' \
+      -e 's|@''REPLACE_FLOOR''@|0|g' \
+      -e 's|@''REPLACE_FLOORF''@|0|g' \
+      -e 's|@''REPLACE_FLOORL''@|0|g' \
+      -e 's|@''REPLACE_FMA''@|0|g' \
+      -e 's|@''REPLACE_FMAF''@|0|g' \
+      -e 's|@''REPLACE_FMAL''@|0|g' \
+      -e 's|@''REPLACE_FMOD''@|0|g' \
+      -e 's|@''REPLACE_FMODF''@|0|g' \
+      -e 's|@''REPLACE_FMODL''@|0|g' \
+      -e 's|@''REPLACE_FREXPF''@|0|g' \
+      -e 's|@''REPLACE_FREXP''@|0|g' \
+      -e 's|@''REPLACE_FREXPL''@|0|g' \
+      -e 's|@''REPLACE_GETPAYLOAD''@|0|g' \
+      -e 's|@''REPLACE_GETPAYLOADF''@|0|g' \
+      -e 's|@''REPLACE_GETPAYLOADL''@|0|g' \
+      -e 's|@''REPLACE_HUGE_VAL''@|0|g' \
+      -e 's|@''REPLACE_HYPOT''@|0|g' \
+      -e 's|@''REPLACE_HYPOTF''@|0|g' \
+      -e 's|@''REPLACE_HYPOTL''@|0|g' \
+      -e 's|@''REPLACE_ILOGB''@|0|g' \
+      -e 's|@''REPLACE_ILOGBF''@|0|g' \
+      -e 's|@''REPLACE_ILOGBL''@|0|g' \
+      -e 's|@''REPLACE_ISFINITE''@|0|g' \
+      -e 's|@''REPLACE_ISINF''@|0|g' \
+      -e 's|@''REPLACE_ISNAN''@|0|g' \
+      -e 's|@''REPLACE_ITOLD''@|0|g' \
+      < math.h-t4 > math.h-t5
 sed \
-      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < pthread.h-t3 > pthread.h-t4
+      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
+      -e 's|@''HAVE_DECL_FPURGE''@|1|g' \
+      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETW''@|1|g' \
+      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
+      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DPRINTF''@|1|g' \
+      -e 's|@''HAVE_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_FTELLO''@|1|g' \
+      -e 's|@''HAVE_PCLOSE''@|1|g' \
+      -e 's|@''HAVE_POPEN''@|1|g' \
+      -e 's|@''HAVE_RENAMEAT''@|1|g' \
+      -e 's|@''HAVE_VASPRINTF''@|1|g' \
+      -e 's|@''HAVE_VDPRINTF''@|1|g' \
+      < stdio.h-t1 > stdio.h-t2
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2899,26 +3005,94 @@
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ../../lib/string.in.h > string.h-t1
 sed \
-      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
-      -e 's|@''HAVE_DECL_FPURGE''@|1|g' \
-      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETW''@|1|g' \
-      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
-      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DPRINTF''@|1|g' \
-      -e 's|@''HAVE_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_FTELLO''@|1|g' \
-      -e 's|@''HAVE_PCLOSE''@|1|g' \
-      -e 's|@''HAVE_POPEN''@|1|g' \
-      -e 's|@''HAVE_RENAMEAT''@|1|g' \
-      -e 's|@''HAVE_VASPRINTF''@|1|g' \
-      -e 's|@''HAVE_VDPRINTF''@|1|g' \
-      < stdio.h-t1 > stdio.h-t2
+      -e 's|@''REPLACE_DPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FCLOSE''@|0|g' \
+      -e 's|@''REPLACE_FDOPEN''@|0|g' \
+      -e 's|@''REPLACE_FFLUSH''@|0|g' \
+      -e 's|@''REPLACE_FOPEN''@|0|g' \
+      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|0|g' \
+      -e 's|@''REPLACE_FPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FPURGE''@|0|g' \
+      -e 's|@''REPLACE_FREOPEN''@|0|g' \
+      -e 's|@''REPLACE_FSEEK''@|0|g' \
+      -e 's|@''REPLACE_FSEEKO''@|0|g' \
+      -e 's|@''REPLACE_FTELL''@|0|g' \
+      -e 's|@''REPLACE_FTELLO''@|0|g' \
+      -e 's|@''REPLACE_GETDELIM''@|0|g' \
+      -e 's|@''REPLACE_GETLINE''@|0|g' \
+      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_PERROR''@|0|g' \
+      -e 's|@''REPLACE_POPEN''@|0|g' \
+      -e 's|@''REPLACE_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_REMOVE''@|0|g' \
+      -e 's|@''REPLACE_RENAME''@|0|g' \
+      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
+      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_SPRINTF''@|0|g' \
+      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_TMPFILE''@|0|g' \
+      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
+      -e 's|@''ASM_SYMBOL_PREFIX''@||g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < stdio.h-t2 > stdio.h-t3
+sed \
+      -e 's|@''REPLACE_LDEXP''@|0|g' \
+      -e 's|@''REPLACE_LDEXPL''@|0|g' \
+      -e 's|@''REPLACE_LOG''@|0|g' \
+      -e 's|@''REPLACE_LOGF''@|0|g' \
+      -e 's|@''REPLACE_LOGL''@|0|g' \
+      -e 's|@''REPLACE_LOG10''@|0|g' \
+      -e 's|@''REPLACE_LOG10F''@|0|g' \
+      -e 's|@''REPLACE_LOG10L''@|0|g' \
+      -e 's|@''REPLACE_LOG1P''@|0|g' \
+      -e 's|@''REPLACE_LOG1PF''@|0|g' \
+      -e 's|@''REPLACE_LOG1PL''@|0|g' \
+      -e 's|@''REPLACE_LOG2''@|0|g' \
+      -e 's|@''REPLACE_LOG2F''@|0|g' \
+      -e 's|@''REPLACE_LOG2L''@|0|g' \
+      -e 's|@''REPLACE_LOGB''@|0|g' \
+      -e 's|@''REPLACE_LOGBF''@|0|g' \
+      -e 's|@''REPLACE_LOGBL''@|0|g' \
+      -e 's|@''REPLACE_MODF''@|0|g' \
+      -e 's|@''REPLACE_MODFF''@|0|g' \
+      -e 's|@''REPLACE_MODFL''@|0|g' \
+      -e 's|@''REPLACE_NAN''@|0|g' \
+      -e 's|@''REPLACE_REMAINDER''@|0|g' \
+      -e 's|@''REPLACE_REMAINDERF''@|0|g' \
+      -e 's|@''REPLACE_REMAINDERL''@|0|g' \
+      -e 's|@''REPLACE_RINTL''@|0|g' \
+      -e 's|@''REPLACE_ROUND''@|0|g' \
+      -e 's|@''REPLACE_ROUNDF''@|0|g' \
+      -e 's|@''REPLACE_ROUNDL''@|0|g' \
+      -e 's|@''REPLACE_SIGNBIT''@|0|g' \
+      -e 's|@''REPLACE_SIGNBIT_USING_BUILTINS''@|1|g' \
+      -e 's|@''REPLACE_SINF''@|0|g' \
+      -e 's|@''REPLACE_SINHF''@|0|g' \
+      -e 's|@''REPLACE_SQRTF''@|0|g' \
+      -e 's|@''REPLACE_SQRTL''@|0|g' \
+      -e 's|@''REPLACE_TANF''@|0|g' \
+      -e 's|@''REPLACE_TANHF''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDER''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERF''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERL''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERMAG''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERMAGF''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERMAGL''@|0|g' \
+      -e 's|@''REPLACE_TRUNC''@|0|g' \
+      -e 's|@''REPLACE_TRUNCF''@|0|g' \
+      -e 's|@''REPLACE_TRUNCL''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < math.h-t5 > math.h-t6
 sed \
       -e 's|@''HAVE__EXIT''@|1|g' \
       -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
@@ -2967,54 +3141,32 @@
       -e 's|@''HAVE_UNLOCKPT''@|1|g' \
       -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
       < stdlib.h-t1 > stdlib.h-t2
-sed \
-      -e 's|@''REPLACE_ACOSF''@|0|g' \
-      -e 's|@''REPLACE_ASINF''@|0|g' \
-      -e 's|@''REPLACE_ATANF''@|0|g' \
-      -e 's|@''REPLACE_ATAN2F''@|0|g' \
-      -e 's|@''REPLACE_CBRTF''@|0|g' \
-      -e 's|@''REPLACE_CBRTL''@|0|g' \
-      -e 's|@''REPLACE_CEIL''@|0|g' \
-      -e 's|@''REPLACE_CEILF''@|0|g' \
-      -e 's|@''REPLACE_CEILL''@|0|g' \
-      -e 's|@''REPLACE_COSF''@|0|g' \
-      -e 's|@''REPLACE_COSHF''@|0|g' \
-      -e 's|@''REPLACE_EXPF''@|0|g' \
-      -e 's|@''REPLACE_EXPL''@|0|g' \
-      -e 's|@''REPLACE_EXPM1''@|0|g' \
-      -e 's|@''REPLACE_EXPM1F''@|0|g' \
-      -e 's|@''REPLACE_EXPM1L''@|0|g' \
-      -e 's|@''REPLACE_EXP2''@|0|g' \
-      -e 's|@''REPLACE_EXP2L''@|0|g' \
-      -e 's|@''REPLACE_FABSL''@|0|g' \
-      -e 's|@''REPLACE_FLOOR''@|0|g' \
-      -e 's|@''REPLACE_FLOORF''@|0|g' \
-      -e 's|@''REPLACE_FLOORL''@|0|g' \
-      -e 's|@''REPLACE_FMA''@|0|g' \
-      -e 's|@''REPLACE_FMAF''@|0|g' \
-      -e 's|@''REPLACE_FMAL''@|0|g' \
-      -e 's|@''REPLACE_FMOD''@|0|g' \
-      -e 's|@''REPLACE_FMODF''@|0|g' \
-      -e 's|@''REPLACE_FMODL''@|0|g' \
-      -e 's|@''REPLACE_FREXPF''@|0|g' \
-      -e 's|@''REPLACE_FREXP''@|0|g' \
-      -e 's|@''REPLACE_FREXPL''@|0|g' \
-      -e 's|@''REPLACE_GETPAYLOAD''@|0|g' \
-      -e 's|@''REPLACE_GETPAYLOADF''@|0|g' \
-      -e 's|@''REPLACE_GETPAYLOADL''@|0|g' \
-      -e 's|@''REPLACE_HUGE_VAL''@|0|g' \
-      -e 's|@''REPLACE_HYPOT''@|0|g' \
-      -e 's|@''REPLACE_HYPOTF''@|0|g' \
-      -e 's|@''REPLACE_HYPOTL''@|0|g' \
-      -e 's|@''REPLACE_ILOGB''@|0|g' \
-      -e 's|@''REPLACE_ILOGBF''@|0|g' \
-      -e 's|@''REPLACE_ILOGBL''@|0|g' \
-      -e 's|@''REPLACE_ISFINITE''@|0|g' \
-      -e 's|@''REPLACE_ISINF''@|0|g' \
-      -e 's|@''REPLACE_ISNAN''@|0|g' \
-      -e 's|@''REPLACE_ITOLD''@|0|g' \
-      < math.h-t4 > math.h-t5
-rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''HAVE_STRINGS_H''@|1|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_STRINGS_H''@|<strings.h>|g' \
+      -e 's/@''GNULIB_FFS''@/0/g' \
+      -e 's/@''GNULIB_STRCASECMP''@/1/g' \
+      -e 's/@''GNULIB_STRCASECMP_L''@/0/g' \
+      -e 's/@''GNULIB_STRNCASECMP''@/1/g' \
+      -e 's/@''GNULIB_STRNCASECMP_L''@/0/g' \
+      -e 's|@''HAVE_FFS''@|1|g' \
+      -e 's|@''HAVE_STRCASECMP''@|1|g' \
+      -e 's|@''HAVE_STRCASECMP_L''@|1|g' \
+      -e 's|@''HAVE_STRNCASECMP''@|1|g' \
+      -e 's|@''HAVE_STRNCASECMP_L''@|1|g' \
+      -e 's|@''HAVE_DECL_STRNCASECMP''@|1|g' \
+      -e 's|@''REPLACE_STRCASECMP''@|0|g' \
+      -e 's|@''REPLACE_STRCASECMP_L''@|0|g' \
+      -e 's|@''REPLACE_STRNCASECMP''@|0|g' \
+      -e 's|@''REPLACE_STRNCASECMP_L''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/strings.in.h > strings.h-t
 sed \
       -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
       -e 's|@''HAVE_FFSL''@|1|g' \
@@ -3069,45 +3221,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < string.h-t1 > string.h-t2
-sed \
-      -e 's|@''REPLACE_DPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FCLOSE''@|0|g' \
-      -e 's|@''REPLACE_FDOPEN''@|0|g' \
-      -e 's|@''REPLACE_FFLUSH''@|0|g' \
-      -e 's|@''REPLACE_FOPEN''@|0|g' \
-      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|0|g' \
-      -e 's|@''REPLACE_FPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FPURGE''@|0|g' \
-      -e 's|@''REPLACE_FREOPEN''@|0|g' \
-      -e 's|@''REPLACE_FSEEK''@|0|g' \
-      -e 's|@''REPLACE_FSEEKO''@|0|g' \
-      -e 's|@''REPLACE_FTELL''@|0|g' \
-      -e 's|@''REPLACE_FTELLO''@|0|g' \
-      -e 's|@''REPLACE_GETDELIM''@|0|g' \
-      -e 's|@''REPLACE_GETLINE''@|0|g' \
-      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_PERROR''@|0|g' \
-      -e 's|@''REPLACE_POPEN''@|0|g' \
-      -e 's|@''REPLACE_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_REMOVE''@|0|g' \
-      -e 's|@''REPLACE_RENAME''@|0|g' \
-      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
-      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_SPRINTF''@|0|g' \
-      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_TMPFILE''@|0|g' \
-      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
-      -e 's|@''ASM_SYMBOL_PREFIX''@||g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < stdio.h-t2 > stdio.h-t3
+rm -f stdio.h-t1 stdio.h-t2
+rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
 sed \
       -e 's|@''REPLACE__EXIT''@|0|g' \
       -e 's|@''REPLACE_ABORT''@|0|g' \
@@ -3157,94 +3272,14 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
-sed \
-      -e 's|@''REPLACE_LDEXP''@|0|g' \
-      -e 's|@''REPLACE_LDEXPL''@|0|g' \
-      -e 's|@''REPLACE_LOG''@|0|g' \
-      -e 's|@''REPLACE_LOGF''@|0|g' \
-      -e 's|@''REPLACE_LOGL''@|0|g' \
-      -e 's|@''REPLACE_LOG10''@|0|g' \
-      -e 's|@''REPLACE_LOG10F''@|0|g' \
-      -e 's|@''REPLACE_LOG10L''@|0|g' \
-      -e 's|@''REPLACE_LOG1P''@|0|g' \
-      -e 's|@''REPLACE_LOG1PF''@|0|g' \
-      -e 's|@''REPLACE_LOG1PL''@|0|g' \
-      -e 's|@''REPLACE_LOG2''@|0|g' \
-      -e 's|@''REPLACE_LOG2F''@|0|g' \
-      -e 's|@''REPLACE_LOG2L''@|0|g' \
-      -e 's|@''REPLACE_LOGB''@|0|g' \
-      -e 's|@''REPLACE_LOGBF''@|0|g' \
-      -e 's|@''REPLACE_LOGBL''@|0|g' \
-      -e 's|@''REPLACE_MODF''@|0|g' \
-      -e 's|@''REPLACE_MODFF''@|0|g' \
-      -e 's|@''REPLACE_MODFL''@|0|g' \
-      -e 's|@''REPLACE_NAN''@|0|g' \
-      -e 's|@''REPLACE_REMAINDER''@|0|g' \
-      -e 's|@''REPLACE_REMAINDERF''@|0|g' \
-      -e 's|@''REPLACE_REMAINDERL''@|0|g' \
-      -e 's|@''REPLACE_RINTL''@|0|g' \
-      -e 's|@''REPLACE_ROUND''@|0|g' \
-      -e 's|@''REPLACE_ROUNDF''@|0|g' \
-      -e 's|@''REPLACE_ROUNDL''@|0|g' \
-      -e 's|@''REPLACE_SIGNBIT''@|0|g' \
-      -e 's|@''REPLACE_SIGNBIT_USING_BUILTINS''@|1|g' \
-      -e 's|@''REPLACE_SINF''@|0|g' \
-      -e 's|@''REPLACE_SINHF''@|0|g' \
-      -e 's|@''REPLACE_SQRTF''@|0|g' \
-      -e 's|@''REPLACE_SQRTL''@|0|g' \
-      -e 's|@''REPLACE_TANF''@|0|g' \
-      -e 's|@''REPLACE_TANHF''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDER''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERF''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERL''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERMAG''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERMAGF''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERMAGL''@|0|g' \
-      -e 's|@''REPLACE_TRUNC''@|0|g' \
-      -e 's|@''REPLACE_TRUNCF''@|0|g' \
-      -e 's|@''REPLACE_TRUNCL''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < math.h-t5 > math.h-t6
-mv pthread.h-t4 pthread.h
+mv strings.h-t strings.h
 rm -f string.h-t1
-rm -f stdio.h-t1 stdio.h-t2
+mv stdio.h-t3 stdio.h
+mv math.h-t6 math.h
 rm -f stdlib.h-t1 stdlib.h-t2
-rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
 mv string.h-t2 string.h
-mv stdio.h-t3 stdio.h
 mv stdlib.h-t3 stdlib.h
-mv math.h-t6 math.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''HAVE_STRINGS_H''@|1|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_STRINGS_H''@|<strings.h>|g' \
-      -e 's/@''GNULIB_FFS''@/0/g' \
-      -e 's/@''GNULIB_STRCASECMP''@/1/g' \
-      -e 's/@''GNULIB_STRCASECMP_L''@/0/g' \
-      -e 's/@''GNULIB_STRNCASECMP''@/1/g' \
-      -e 's/@''GNULIB_STRNCASECMP_L''@/0/g' \
-      -e 's|@''HAVE_FFS''@|1|g' \
-      -e 's|@''HAVE_STRCASECMP''@|1|g' \
-      -e 's|@''HAVE_STRCASECMP_L''@|1|g' \
-      -e 's|@''HAVE_STRNCASECMP''@|1|g' \
-      -e 's|@''HAVE_STRNCASECMP_L''@|1|g' \
-      -e 's|@''HAVE_DECL_STRNCASECMP''@|1|g' \
-      -e 's|@''REPLACE_STRCASECMP''@|0|g' \
-      -e 's|@''REPLACE_STRCASECMP_L''@|0|g' \
-      -e 's|@''REPLACE_STRNCASECMP''@|0|g' \
-      -e 's|@''REPLACE_STRNCASECMP_L''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/strings.in.h > strings.h-t
-/usr/bin/mkdir -p 'sys'
 /usr/bin/mkdir -p 'sys'
-mv strings.h-t strings.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3259,6 +3294,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_random.in.h > sys/random.h-t
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3316,9 +3352,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_stat.in.h > sys/stat.h-t
-/usr/bin/mkdir -p 'sys'
 mv sys/random.h-t sys/random.h
-mv sys/stat.h-t sys/stat.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_TIME_H''@/1/g' \
@@ -3337,6 +3372,7 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_time.in.h > sys/time.h-t
 /usr/bin/mkdir -p 'sys'
+mv sys/stat.h-t sys/stat.h
 mv sys/time.h-t sys/time.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -3351,7 +3387,18 @@
       -e 's|@''HAVE_BLKCNT_T''@|1|g' \
       ../../lib/sys_types.in.h > sys/types.h-t
 /usr/bin/mkdir -p 'sys'
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SYS_WAIT_H''@|<sys/wait.h>|g' \
+      -e 's/@''GNULIB_WAITPID''@/0/g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/sys_wait.in.h > sys/wait.h-t
 mv sys/types.h-t sys/types.h
+mv sys/wait.h-t sys/wait.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -3473,23 +3520,13 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/uchar.in.h > uchar.h-t
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_WAIT_H''@|<sys/wait.h>|g' \
-      -e 's/@''GNULIB_WAITPID''@/0/g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/sys_wait.in.h > sys/wait.h-t
-mv time.h-t time.h
-mv uchar.h-t uchar.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       ../../lib/unicase.in.h > unicase.h-t
-mv sys/wait.h-t sys/wait.h
+mv time.h-t time.h
+mv unicase.h-t unicase.h
+mv uchar.h-t uchar.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3531,7 +3568,6 @@
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < ../../lib/unictype.in.h > unictype.h-t1
-mv unicase.h-t unicase.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3571,6 +3607,7 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ../../lib/unistd.in.h > unistd.h-t1
+mv uninorm.h-t uninorm.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3597,7 +3634,6 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t1 > unictype.h-t2
-mv uninorm.h-t uninorm.h
 sed \
       -e 's/@''GNULIB_GETCWD''@/1/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
@@ -3662,41 +3698,7 @@
       -e 's/@''GNULIB_MDA_WRITE''@/1/g' \
       < unistd.h-t1 > unistd.h-t2
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
-sed \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
-      < unictype.h-t2 > unictype.h-t3
+mv unistr.h-t unistr.h
 sed \
       -e 's|@''HAVE_CHOWN''@|1|g' \
       -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
@@ -3746,8 +3748,43 @@
       -e 's|@''HAVE_OS_H''@|0|g' \
       -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
       < unistd.h-t2 > unistd.h-t3
-mv unistr.h-t unistr.h
+sed \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
+      < unictype.h-t2 > unictype.h-t3
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
+mv unitypes.h-t unitypes.h
 sed \
       -e 's|@''REPLACE_ACCESS''@|0|g' \
       -e 's|@''REPLACE_CHOWN''@|0|g' \
@@ -3808,7 +3845,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < unistd.h-t3 > unistd.h-t4
-mv unitypes.h-t unitypes.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -3852,9 +3888,8 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t3 > unictype.h-t4
-rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
-mv unistd.h-t4 unistd.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
+mv uniwidth.h-t uniwidth.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UTIME_H''@/1/g' \
@@ -3870,9 +3905,10 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/utime.in.h > utime.h-t
+rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
 rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
-mv uniwidth.h-t uniwidth.h
 mv utime.h-t utime.h
+mv unistd.h-t4 unistd.h
 mv unictype.h-t4 unictype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -4238,7 +4274,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/ctype.in.h > ctype.h-t
-mv alloca.h-t alloca.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_DIRENT_H''@|1|g' \
@@ -4274,6 +4309,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/dirent.in.h > dirent.h-t
+mv alloca.h-t alloca.h
+mv ctype.h-t ctype.h
+mv dirent.h-t dirent.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_ERROR_H''@|1|g' \
@@ -4285,9 +4323,6 @@
       -e 's|@''REPLACE_ERROR_AT_LINE''@|0|g' \
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       ../../lib/error.in.h > error.h-t
-mv ctype.h-t ctype.h
-mv dirent.h-t dirent.h
-mv error.h-t error.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4311,6 +4346,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/fcntl.in.h > fcntl.h-t
+mv error.h-t error.h
+mv fcntl.h-t fcntl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4319,14 +4356,13 @@
       -e 's|@''NEXT_FLOAT_H''@|<float.h>|g' \
       -e 's|@''REPLACE_ITOLD''@|0|g' \
       ../../lib/float.in.h > float.h-t
-mv fcntl.h-t fcntl.h
 /usr/bin/mkdir -p 'malloc'
-mv float.h-t float.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
   -e '/libc_hidden_proto/d' \
   ../../lib/malloc/dynarray.h > malloc/dynarray.gl.h-t
+mv float.h-t float.h
 /usr/bin/mkdir -p 'malloc'
-/usr/bin/mkdir -p 'malloc'
+mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
       -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
@@ -4335,13 +4371,15 @@
       -e 's|__glibc_likely|_GL_LIKELY|g' \
       -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
       ../../lib/malloc/dynarray-skeleton.c > malloc/dynarray-skeleton.gl.h-t
-mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
+/usr/bin/mkdir -p 'malloc'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
       -e 's|__glibc_likely|_GL_LIKELY|g' \
       -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
       -e '/libc_hidden_proto/d' \
       ../../lib/malloc/scratch_buffer.h > malloc/scratch_buffer.gl.h-t
+mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
+mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e '/__BEGIN_DECLS/{ s/__BEGIN_DECLS/#ifdef __cplusplus%extern "C" {%#endif/; y/%/\n/; }' \
       -e '/__END_DECLS/{ s/__END_DECLS/#ifdef __cplusplus%}%#endif/; y/%/\n/; }' \
@@ -4352,8 +4390,6 @@
       -e 's|ifdef __USE_GNU|if 1|' \
       -e 's|ifdef __USE_LARGEFILE64|if 0|' \
       ../../lib/glob-libc.h > glob-libc.gl.h-t
-mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
-mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's/@''HAVE_INTTYPES_H''@/1/g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -4446,6 +4482,7 @@
       ../../lib/locale.in.h > locale.h-t
 mv langinfo.h-t langinfo.h
 mv limits.h-t limits.h
+mv locale.h-t locale.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|include_next|g' \
@@ -4500,7 +4537,6 @@
       -e 's/@''GNULIB_HYPOTF''@/0/g' \
       -e 's/@''GNULIB_HYPOTL''@/0/g' \
       < ../../lib/math.in.h > math.h-t1
-mv locale.h-t locale.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_PTHREAD_H''@|1|g' \
@@ -4548,6 +4584,79 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sched.in.h > sched.h-t
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SIGNAL_H''@|<signal.h>|g' \
+      -e 's/@''GNULIB_PTHREAD_SIGMASK''@/0/g' \
+      -e 's/@''GNULIB_RAISE''@/1/g' \
+      -e 's/@''GNULIB_SIG2STR''@/0/g' \
+      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/0/g' \
+      -e 's/@''GNULIB_SIGPROCMASK''@/1/g' \
+      -e 's/@''GNULIB_SIGACTION''@/1/g' \
+      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SIGMASK''@|1|g' \
+      -e 's|@''HAVE_RAISE''@|1|g' \
+      -e 's|@''HAVE_SIG2STR''@|1|g' \
+      -e 's|@''HAVE_SIGSET_T''@|1|g' \
+      -e 's|@''HAVE_SIGINFO_T''@|1|g' \
+      -e 's|@''HAVE_SIGACTION''@|1|g' \
+      -e 's|@''HAVE_STR2SIG''@|1|g' \
+      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|1|g' \
+      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|1|g' \
+      -e 's|@''HAVE_SIGHANDLER_T''@|1|g' \
+      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|0|g' \
+      -e 's|@''REPLACE_RAISE''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/signal.in.h > signal.h-t
+sed \
+      -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_WAIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
+      -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
+      < pthread.h-t1 > pthread.h-t2
+mv sched.h-t sched.h
 sed \
       -e 's/@''GNULIB_ILOGB''@/0/g' \
       -e 's/@''GNULIB_ILOGBF''@/0/g' \
@@ -4623,195 +4732,6 @@
       -e 's/@''GNULIB_MDA_Y1''@/1/g' \
       -e 's/@''GNULIB_MDA_YN''@/1/g' \
       < math.h-t1 > math.h-t2
-sed \
-      -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_WAIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
-      < pthread.h-t1 > pthread.h-t2
-mv sched.h-t sched.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SIGNAL_H''@|<signal.h>|g' \
-      -e 's/@''GNULIB_PTHREAD_SIGMASK''@/0/g' \
-      -e 's/@''GNULIB_RAISE''@/1/g' \
-      -e 's/@''GNULIB_SIG2STR''@/0/g' \
-      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/0/g' \
-      -e 's/@''GNULIB_SIGPROCMASK''@/1/g' \
-      -e 's/@''GNULIB_SIGACTION''@/1/g' \
-      -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|1|g' \
-      -e 's|@''HAVE_PTHREAD_SIGMASK''@|1|g' \
-      -e 's|@''HAVE_RAISE''@|1|g' \
-      -e 's|@''HAVE_SIG2STR''@|1|g' \
-      -e 's|@''HAVE_SIGSET_T''@|1|g' \
-      -e 's|@''HAVE_SIGINFO_T''@|1|g' \
-      -e 's|@''HAVE_SIGACTION''@|1|g' \
-      -e 's|@''HAVE_STR2SIG''@|1|g' \
-      -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|1|g' \
-      -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|1|g' \
-      -e 's|@''HAVE_SIGHANDLER_T''@|1|g' \
-      -e 's|@''REPLACE_PTHREAD_SIGMASK''@|0|g' \
-      -e 's|@''REPLACE_RAISE''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/signal.in.h > signal.h-t
-sed \
-      -e 's|@''HAVE_ACOSF''@|1|g' \
-      -e 's|@''HAVE_ACOSL''@|1|g' \
-      -e 's|@''HAVE_ASINF''@|1|g' \
-      -e 's|@''HAVE_ASINL''@|1|g' \
-      -e 's|@''HAVE_ATANF''@|1|g' \
-      -e 's|@''HAVE_ATANL''@|1|g' \
-      -e 's|@''HAVE_ATAN2F''@|1|g' \
-      -e 's|@''HAVE_CBRT''@|1|g' \
-      -e 's|@''HAVE_CBRTF''@|1|g' \
-      -e 's|@''HAVE_CBRTL''@|1|g' \
-      -e 's|@''HAVE_COPYSIGN''@|1|g' \
-      -e 's|@''HAVE_COPYSIGNL''@|1|g' \
-      -e 's|@''HAVE_COSF''@|1|g' \
-      -e 's|@''HAVE_COSL''@|1|g' \
-      -e 's|@''HAVE_COSHF''@|1|g' \
-      -e 's|@''HAVE_EXPF''@|1|g' \
-      -e 's|@''HAVE_EXPL''@|1|g' \
-      -e 's|@''HAVE_EXPM1''@|1|g' \
-      -e 's|@''HAVE_EXPM1F''@|1|g' \
-      -e 's|@''HAVE_FABSF''@|1|g' \
-      -e 's|@''HAVE_FABSL''@|1|g' \
-      -e 's|@''HAVE_FMA''@|1|g' \
-      -e 's|@''HAVE_FMAF''@|1|g' \
-      -e 's|@''HAVE_FMAL''@|1|g' \
-      -e 's|@''HAVE_FMODF''@|1|g' \
-      -e 's|@''HAVE_FMODL''@|1|g' \
-      -e 's|@''HAVE_FREXPF''@|1|g' \
-      -e 's|@''HAVE_GETPAYLOAD''@|1|g' \
-      -e 's|@''HAVE_GETPAYLOADF''@|1|g' \
-      -e 's|@''HAVE_GETPAYLOADL''@|1|g' \
-      -e 's|@''HAVE_HYPOTF''@|1|g' \
-      -e 's|@''HAVE_HYPOTL''@|1|g' \
-      -e 's|@''HAVE_ILOGB''@|1|g' \
-      -e 's|@''HAVE_ILOGBF''@|1|g' \
-      -e 's|@''HAVE_ILOGBL''@|1|g' \
-      -e 's|@''HAVE_ISNANF''@|1|g' \
-      -e 's|@''HAVE_ISNAND''@|1|g' \
-      -e 's|@''HAVE_ISNANL''@|1|g' \
-      -e 's|@''HAVE_LDEXPF''@|1|g' \
-      -e 's|@''HAVE_LOGF''@|1|g' \
-      -e 's|@''HAVE_LOGL''@|1|g' \
-      -e 's|@''HAVE_LOG10F''@|1|g' \
-      -e 's|@''HAVE_LOG10L''@|1|g' \
-      -e 's|@''HAVE_LOG1P''@|1|g' \
-      -e 's|@''HAVE_LOG1PF''@|1|g' \
-      -e 's|@''HAVE_LOG1PL''@|1|g' \
-      -e 's|@''HAVE_LOGBF''@|1|g' \
-      -e 's|@''HAVE_LOGBL''@|1|g' \
-      -e 's|@''HAVE_LOGP1''@|1|g' \
-      -e 's|@''HAVE_LOGP1F''@|1|g' \
-      -e 's|@''HAVE_LOGP1L''@|1|g' \
-      -e 's|@''HAVE_MODFF''@|1|g' \
-      -e 's|@''HAVE_MODFL''@|1|g' \
-      -e 's|@''HAVE_POWF''@|1|g' \
-      -e 's|@''HAVE_REMAINDER''@|1|g' \
-      -e 's|@''HAVE_REMAINDERF''@|1|g' \
-      -e 's|@''HAVE_RINT''@|1|g' \
-      -e 's|@''HAVE_RINTL''@|1|g' \
-      -e 's|@''HAVE_SETPAYLOAD''@|1|g' \
-      -e 's|@''HAVE_SETPAYLOADF''@|1|g' \
-      -e 's|@''HAVE_SETPAYLOADL''@|1|g' \
-      -e 's|@''HAVE_SETPAYLOADSIG''@|1|g' \
-      -e 's|@''HAVE_SETPAYLOADSIGF''@|1|g' \
-      -e 's|@''HAVE_SETPAYLOADSIGL''@|1|g' \
-      -e 's|@''HAVE_SINF''@|1|g' \
-      -e 's|@''HAVE_SINL''@|1|g' \
-      -e 's|@''HAVE_SINHF''@|1|g' \
-      -e 's|@''HAVE_SQRTF''@|1|g' \
-      -e 's|@''HAVE_SQRTL''@|1|g' \
-      -e 's|@''HAVE_TANF''@|1|g' \
-      -e 's|@''HAVE_TANL''@|1|g' \
-      -e 's|@''HAVE_TANHF''@|1|g' \
-      -e 's|@''HAVE_TOTALORDER''@|1|g' \
-      -e 's|@''HAVE_TOTALORDERF''@|1|g' \
-      -e 's|@''HAVE_TOTALORDERL''@|1|g' \
-      -e 's|@''HAVE_TOTALORDERMAG''@|1|g' \
-      -e 's|@''HAVE_TOTALORDERMAGF''@|1|g' \
-      -e 's|@''HAVE_TOTALORDERMAGL''@|1|g' \
-      < math.h-t2 > math.h-t3
-sed \
-      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
-      < pthread.h-t2 > pthread.h-t3
 mv signal.h-t signal.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -4904,67 +4824,42 @@
       -e 's/@''GNULIB_MDA_TEMPNAM''@/1/g' \
       < ../../lib/stdio.in.h > stdio.h-t1
 sed \
-      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
-      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < pthread.h-t3 > pthread.h-t4
+      -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SELF''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EQUAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_DETACH''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_JOIN''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_EXIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_ONCE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
+      < pthread.h-t2 > pthread.h-t3
 mv stddef.h-t stddef.h
-sed \
-      -e 's|@''HAVE_DECL_ACOSL''@|1|g' \
-      -e 's|@''HAVE_DECL_ASINL''@|1|g' \
-      -e 's|@''HAVE_DECL_ATANL''@|1|g' \
-      -e 's|@''HAVE_DECL_CBRTF''@|1|g' \
-      -e 's|@''HAVE_DECL_CBRTL''@|1|g' \
-      -e 's|@''HAVE_DECL_CEILF''@|1|g' \
-      -e 's|@''HAVE_DECL_CEILL''@|1|g' \
-      -e 's|@''HAVE_DECL_COPYSIGNF''@|1|g' \
-      -e 's|@''HAVE_DECL_COSL''@|1|g' \
-      -e 's|@''HAVE_DECL_EXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2F''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2L''@|1|g' \
-      -e 's|@''HAVE_DECL_EXPM1L''@|1|g' \
-      -e 's|@''HAVE_DECL_FLOORF''@|1|g' \
-      -e 's|@''HAVE_DECL_FLOORL''@|1|g' \
-      -e 's|@''HAVE_DECL_FREXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_LDEXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_LOGL''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG10L''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2F''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2L''@|1|g' \
-      -e 's|@''HAVE_DECL_LOGB''@|1|g' \
-      -e 's|@''HAVE_DECL_REMAINDER''@|1|g' \
-      -e 's|@''HAVE_DECL_REMAINDERL''@|1|g' \
-      -e 's|@''HAVE_DECL_RINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUND''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUNDF''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUNDL''@|1|g' \
-      -e 's|@''HAVE_DECL_SINL''@|1|g' \
-      -e 's|@''HAVE_DECL_SQRTL''@|1|g' \
-      -e 's|@''HAVE_DECL_TANL''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNC''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCF''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCL''@|1|g' \
-      < math.h-t3 > math.h-t4
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5103,54 +4998,148 @@
       -e 's|@''HAVE_VASPRINTF''@|1|g' \
       -e 's|@''HAVE_VDPRINTF''@|1|g' \
       < stdio.h-t1 > stdio.h-t2
-rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
 sed \
-      -e 's|@''REPLACE_ACOSF''@|0|g' \
-      -e 's|@''REPLACE_ASINF''@|0|g' \
-      -e 's|@''REPLACE_ATANF''@|0|g' \
-      -e 's|@''REPLACE_ATAN2F''@|0|g' \
-      -e 's|@''REPLACE_CBRTF''@|0|g' \
-      -e 's|@''REPLACE_CBRTL''@|0|g' \
-      -e 's|@''REPLACE_CEIL''@|0|g' \
-      -e 's|@''REPLACE_CEILF''@|0|g' \
-      -e 's|@''REPLACE_CEILL''@|0|g' \
-      -e 's|@''REPLACE_COSF''@|0|g' \
-      -e 's|@''REPLACE_COSHF''@|0|g' \
-      -e 's|@''REPLACE_EXPF''@|0|g' \
-      -e 's|@''REPLACE_EXPL''@|0|g' \
-      -e 's|@''REPLACE_EXPM1''@|0|g' \
-      -e 's|@''REPLACE_EXPM1F''@|0|g' \
-      -e 's|@''REPLACE_EXPM1L''@|0|g' \
-      -e 's|@''REPLACE_EXP2''@|0|g' \
-      -e 's|@''REPLACE_EXP2L''@|0|g' \
-      -e 's|@''REPLACE_FABSL''@|0|g' \
-      -e 's|@''REPLACE_FLOOR''@|0|g' \
-      -e 's|@''REPLACE_FLOORF''@|0|g' \
-      -e 's|@''REPLACE_FLOORL''@|0|g' \
-      -e 's|@''REPLACE_FMA''@|0|g' \
-      -e 's|@''REPLACE_FMAF''@|0|g' \
-      -e 's|@''REPLACE_FMAL''@|0|g' \
-      -e 's|@''REPLACE_FMOD''@|0|g' \
-      -e 's|@''REPLACE_FMODF''@|0|g' \
-      -e 's|@''REPLACE_FMODL''@|0|g' \
-      -e 's|@''REPLACE_FREXPF''@|0|g' \
-      -e 's|@''REPLACE_FREXP''@|0|g' \
-      -e 's|@''REPLACE_FREXPL''@|0|g' \
-      -e 's|@''REPLACE_GETPAYLOAD''@|0|g' \
-      -e 's|@''REPLACE_GETPAYLOADF''@|0|g' \
-      -e 's|@''REPLACE_GETPAYLOADL''@|0|g' \
-      -e 's|@''REPLACE_HUGE_VAL''@|0|g' \
-      -e 's|@''REPLACE_HYPOT''@|0|g' \
-      -e 's|@''REPLACE_HYPOTF''@|0|g' \
-      -e 's|@''REPLACE_HYPOTL''@|0|g' \
-      -e 's|@''REPLACE_ILOGB''@|0|g' \
-      -e 's|@''REPLACE_ILOGBF''@|0|g' \
-      -e 's|@''REPLACE_ILOGBL''@|0|g' \
-      -e 's|@''REPLACE_ISFINITE''@|0|g' \
-      -e 's|@''REPLACE_ISINF''@|0|g' \
-      -e 's|@''REPLACE_ISNAN''@|0|g' \
-      -e 's|@''REPLACE_ITOLD''@|0|g' \
-      < math.h-t4 > math.h-t5
+      -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|0|g' \
+      -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _Noreturn/r ../../lib/_Noreturn.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < pthread.h-t3 > pthread.h-t4
+sed \
+      -e 's|@''HAVE_ACOSF''@|1|g' \
+      -e 's|@''HAVE_ACOSL''@|1|g' \
+      -e 's|@''HAVE_ASINF''@|1|g' \
+      -e 's|@''HAVE_ASINL''@|1|g' \
+      -e 's|@''HAVE_ATANF''@|1|g' \
+      -e 's|@''HAVE_ATANL''@|1|g' \
+      -e 's|@''HAVE_ATAN2F''@|1|g' \
+      -e 's|@''HAVE_CBRT''@|1|g' \
+      -e 's|@''HAVE_CBRTF''@|1|g' \
+      -e 's|@''HAVE_CBRTL''@|1|g' \
+      -e 's|@''HAVE_COPYSIGN''@|1|g' \
+      -e 's|@''HAVE_COPYSIGNL''@|1|g' \
+      -e 's|@''HAVE_COSF''@|1|g' \
+      -e 's|@''HAVE_COSL''@|1|g' \
+      -e 's|@''HAVE_COSHF''@|1|g' \
+      -e 's|@''HAVE_EXPF''@|1|g' \
+      -e 's|@''HAVE_EXPL''@|1|g' \
+      -e 's|@''HAVE_EXPM1''@|1|g' \
+      -e 's|@''HAVE_EXPM1F''@|1|g' \
+      -e 's|@''HAVE_FABSF''@|1|g' \
+      -e 's|@''HAVE_FABSL''@|1|g' \
+      -e 's|@''HAVE_FMA''@|1|g' \
+      -e 's|@''HAVE_FMAF''@|1|g' \
+      -e 's|@''HAVE_FMAL''@|1|g' \
+      -e 's|@''HAVE_FMODF''@|1|g' \
+      -e 's|@''HAVE_FMODL''@|1|g' \
+      -e 's|@''HAVE_FREXPF''@|1|g' \
+      -e 's|@''HAVE_GETPAYLOAD''@|1|g' \
+      -e 's|@''HAVE_GETPAYLOADF''@|1|g' \
+      -e 's|@''HAVE_GETPAYLOADL''@|1|g' \
+      -e 's|@''HAVE_HYPOTF''@|1|g' \
+      -e 's|@''HAVE_HYPOTL''@|1|g' \
+      -e 's|@''HAVE_ILOGB''@|1|g' \
+      -e 's|@''HAVE_ILOGBF''@|1|g' \
+      -e 's|@''HAVE_ILOGBL''@|1|g' \
+      -e 's|@''HAVE_ISNANF''@|1|g' \
+      -e 's|@''HAVE_ISNAND''@|1|g' \
+      -e 's|@''HAVE_ISNANL''@|1|g' \
+      -e 's|@''HAVE_LDEXPF''@|1|g' \
+      -e 's|@''HAVE_LOGF''@|1|g' \
+      -e 's|@''HAVE_LOGL''@|1|g' \
+      -e 's|@''HAVE_LOG10F''@|1|g' \
+      -e 's|@''HAVE_LOG10L''@|1|g' \
+      -e 's|@''HAVE_LOG1P''@|1|g' \
+      -e 's|@''HAVE_LOG1PF''@|1|g' \
+      -e 's|@''HAVE_LOG1PL''@|1|g' \
+      -e 's|@''HAVE_LOGBF''@|1|g' \
+      -e 's|@''HAVE_LOGBL''@|1|g' \
+      -e 's|@''HAVE_LOGP1''@|1|g' \
+      -e 's|@''HAVE_LOGP1F''@|1|g' \
+      -e 's|@''HAVE_LOGP1L''@|1|g' \
+      -e 's|@''HAVE_MODFF''@|1|g' \
+      -e 's|@''HAVE_MODFL''@|1|g' \
+      -e 's|@''HAVE_POWF''@|1|g' \
+      -e 's|@''HAVE_REMAINDER''@|1|g' \
+      -e 's|@''HAVE_REMAINDERF''@|1|g' \
+      -e 's|@''HAVE_RINT''@|1|g' \
+      -e 's|@''HAVE_RINTL''@|1|g' \
+      -e 's|@''HAVE_SETPAYLOAD''@|1|g' \
+      -e 's|@''HAVE_SETPAYLOADF''@|1|g' \
+      -e 's|@''HAVE_SETPAYLOADL''@|1|g' \
+      -e 's|@''HAVE_SETPAYLOADSIG''@|1|g' \
+      -e 's|@''HAVE_SETPAYLOADSIGF''@|1|g' \
+      -e 's|@''HAVE_SETPAYLOADSIGL''@|1|g' \
+      -e 's|@''HAVE_SINF''@|1|g' \
+      -e 's|@''HAVE_SINL''@|1|g' \
+      -e 's|@''HAVE_SINHF''@|1|g' \
+      -e 's|@''HAVE_SQRTF''@|1|g' \
+      -e 's|@''HAVE_SQRTL''@|1|g' \
+      -e 's|@''HAVE_TANF''@|1|g' \
+      -e 's|@''HAVE_TANL''@|1|g' \
+      -e 's|@''HAVE_TANHF''@|1|g' \
+      -e 's|@''HAVE_TOTALORDER''@|1|g' \
+      -e 's|@''HAVE_TOTALORDERF''@|1|g' \
+      -e 's|@''HAVE_TOTALORDERL''@|1|g' \
+      -e 's|@''HAVE_TOTALORDERMAG''@|1|g' \
+      -e 's|@''HAVE_TOTALORDERMAGF''@|1|g' \
+      -e 's|@''HAVE_TOTALORDERMAGL''@|1|g' \
+      < math.h-t2 > math.h-t3
+sed \
+      -e 's|@''REPLACE_DPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FCLOSE''@|0|g' \
+      -e 's|@''REPLACE_FDOPEN''@|0|g' \
+      -e 's|@''REPLACE_FFLUSH''@|0|g' \
+      -e 's|@''REPLACE_FOPEN''@|0|g' \
+      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|0|g' \
+      -e 's|@''REPLACE_FPRINTF''@|0|g' \
+      -e 's|@''REPLACE_FPURGE''@|0|g' \
+      -e 's|@''REPLACE_FREOPEN''@|0|g' \
+      -e 's|@''REPLACE_FSEEK''@|0|g' \
+      -e 's|@''REPLACE_FSEEKO''@|0|g' \
+      -e 's|@''REPLACE_FTELL''@|0|g' \
+      -e 's|@''REPLACE_FTELLO''@|0|g' \
+      -e 's|@''REPLACE_GETDELIM''@|0|g' \
+      -e 's|@''REPLACE_GETLINE''@|0|g' \
+      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_PERROR''@|0|g' \
+      -e 's|@''REPLACE_POPEN''@|0|g' \
+      -e 's|@''REPLACE_PRINTF''@|0|g' \
+      -e 's|@''REPLACE_REMOVE''@|0|g' \
+      -e 's|@''REPLACE_RENAME''@|0|g' \
+      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
+      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_SPRINTF''@|0|g' \
+      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
+      -e 's|@''REPLACE_TMPFILE''@|0|g' \
+      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
+      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
+      -e 's|@''ASM_SYMBOL_PREFIX''@||g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < stdio.h-t2 > stdio.h-t3
 sed \
       -e 's|@''HAVE__EXIT''@|1|g' \
       -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
@@ -5253,123 +5242,10 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < string.h-t1 > string.h-t2
-sed \
-      -e 's|@''REPLACE_DPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FCLOSE''@|0|g' \
-      -e 's|@''REPLACE_FDOPEN''@|0|g' \
-      -e 's|@''REPLACE_FFLUSH''@|0|g' \
-      -e 's|@''REPLACE_FOPEN''@|0|g' \
-      -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|0|g' \
-      -e 's|@''REPLACE_FPRINTF''@|0|g' \
-      -e 's|@''REPLACE_FPURGE''@|0|g' \
-      -e 's|@''REPLACE_FREOPEN''@|0|g' \
-      -e 's|@''REPLACE_FSEEK''@|0|g' \
-      -e 's|@''REPLACE_FSEEKO''@|0|g' \
-      -e 's|@''REPLACE_FTELL''@|0|g' \
-      -e 's|@''REPLACE_FTELLO''@|0|g' \
-      -e 's|@''REPLACE_GETDELIM''@|0|g' \
-      -e 's|@''REPLACE_GETLINE''@|0|g' \
-      -e 's|@''REPLACE_OBSTACK_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_PERROR''@|0|g' \
-      -e 's|@''REPLACE_POPEN''@|0|g' \
-      -e 's|@''REPLACE_PRINTF''@|0|g' \
-      -e 's|@''REPLACE_REMOVE''@|0|g' \
-      -e 's|@''REPLACE_RENAME''@|0|g' \
-      -e 's|@''REPLACE_RENAMEAT''@|0|g' \
-      -e 's|@''REPLACE_SNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_SPRINTF''@|0|g' \
-      -e 's|@''REPLACE_STDIO_READ_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|0|g' \
-      -e 's|@''REPLACE_TMPFILE''@|0|g' \
-      -e 's|@''REPLACE_VASPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VDPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VFPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSNPRINTF''@|0|g' \
-      -e 's|@''REPLACE_VSPRINTF''@|0|g' \
-      -e 's|@''ASM_SYMBOL_PREFIX''@||g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < stdio.h-t2 > stdio.h-t3
+rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
+rm -f stdio.h-t1 stdio.h-t2
 mv pthread.h-t4 pthread.h
 sed \
-      -e 's|@''REPLACE_LDEXP''@|0|g' \
-      -e 's|@''REPLACE_LDEXPL''@|0|g' \
-      -e 's|@''REPLACE_LOG''@|0|g' \
-      -e 's|@''REPLACE_LOGF''@|0|g' \
-      -e 's|@''REPLACE_LOGL''@|0|g' \
-      -e 's|@''REPLACE_LOG10''@|0|g' \
-      -e 's|@''REPLACE_LOG10F''@|0|g' \
-      -e 's|@''REPLACE_LOG10L''@|0|g' \
-      -e 's|@''REPLACE_LOG1P''@|0|g' \
-      -e 's|@''REPLACE_LOG1PF''@|0|g' \
-      -e 's|@''REPLACE_LOG1PL''@|0|g' \
-      -e 's|@''REPLACE_LOG2''@|0|g' \
-      -e 's|@''REPLACE_LOG2F''@|0|g' \
-      -e 's|@''REPLACE_LOG2L''@|0|g' \
-      -e 's|@''REPLACE_LOGB''@|0|g' \
-      -e 's|@''REPLACE_LOGBF''@|0|g' \
-      -e 's|@''REPLACE_LOGBL''@|0|g' \
-      -e 's|@''REPLACE_MODF''@|0|g' \
-      -e 's|@''REPLACE_MODFF''@|0|g' \
-      -e 's|@''REPLACE_MODFL''@|0|g' \
-      -e 's|@''REPLACE_NAN''@|0|g' \
-      -e 's|@''REPLACE_REMAINDER''@|0|g' \
-      -e 's|@''REPLACE_REMAINDERF''@|0|g' \
-      -e 's|@''REPLACE_REMAINDERL''@|0|g' \
-      -e 's|@''REPLACE_RINTL''@|0|g' \
-      -e 's|@''REPLACE_ROUND''@|0|g' \
-      -e 's|@''REPLACE_ROUNDF''@|0|g' \
-      -e 's|@''REPLACE_ROUNDL''@|0|g' \
-      -e 's|@''REPLACE_SIGNBIT''@|0|g' \
-      -e 's|@''REPLACE_SIGNBIT_USING_BUILTINS''@|1|g' \
-      -e 's|@''REPLACE_SINF''@|0|g' \
-      -e 's|@''REPLACE_SINHF''@|0|g' \
-      -e 's|@''REPLACE_SQRTF''@|0|g' \
-      -e 's|@''REPLACE_SQRTL''@|0|g' \
-      -e 's|@''REPLACE_TANF''@|0|g' \
-      -e 's|@''REPLACE_TANHF''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDER''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERF''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERL''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERMAG''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERMAGF''@|0|g' \
-      -e 's|@''REPLACE_TOTALORDERMAGL''@|0|g' \
-      -e 's|@''REPLACE_TRUNC''@|0|g' \
-      -e 's|@''REPLACE_TRUNCF''@|0|g' \
-      -e 's|@''REPLACE_TRUNCL''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < math.h-t5 > math.h-t6
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''HAVE_STRINGS_H''@|1|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_STRINGS_H''@|<strings.h>|g' \
-      -e 's/@''GNULIB_FFS''@/0/g' \
-      -e 's/@''GNULIB_STRCASECMP''@/1/g' \
-      -e 's/@''GNULIB_STRCASECMP_L''@/0/g' \
-      -e 's/@''GNULIB_STRNCASECMP''@/1/g' \
-      -e 's/@''GNULIB_STRNCASECMP_L''@/0/g' \
-      -e 's|@''HAVE_FFS''@|1|g' \
-      -e 's|@''HAVE_STRCASECMP''@|1|g' \
-      -e 's|@''HAVE_STRCASECMP_L''@|1|g' \
-      -e 's|@''HAVE_STRNCASECMP''@|1|g' \
-      -e 's|@''HAVE_STRNCASECMP_L''@|1|g' \
-      -e 's|@''HAVE_DECL_STRNCASECMP''@|1|g' \
-      -e 's|@''REPLACE_STRCASECMP''@|0|g' \
-      -e 's|@''REPLACE_STRCASECMP_L''@|0|g' \
-      -e 's|@''REPLACE_STRNCASECMP''@|0|g' \
-      -e 's|@''REPLACE_STRNCASECMP_L''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/strings.in.h > strings.h-t
-sed \
       -e 's|@''REPLACE__EXIT''@|0|g' \
       -e 's|@''REPLACE_ABORT''@|0|g' \
       -e 's|@''REPLACE_ALIGNED_ALLOC''@|0|g' \
@@ -5418,16 +5294,123 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
+sed \
+      -e 's|@''HAVE_DECL_ACOSL''@|1|g' \
+      -e 's|@''HAVE_DECL_ASINL''@|1|g' \
+      -e 's|@''HAVE_DECL_ATANL''@|1|g' \
+      -e 's|@''HAVE_DECL_CBRTF''@|1|g' \
+      -e 's|@''HAVE_DECL_CBRTL''@|1|g' \
+      -e 's|@''HAVE_DECL_CEILF''@|1|g' \
+      -e 's|@''HAVE_DECL_CEILL''@|1|g' \
+      -e 's|@''HAVE_DECL_COPYSIGNF''@|1|g' \
+      -e 's|@''HAVE_DECL_COSL''@|1|g' \
+      -e 's|@''HAVE_DECL_EXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2F''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2L''@|1|g' \
+      -e 's|@''HAVE_DECL_EXPM1L''@|1|g' \
+      -e 's|@''HAVE_DECL_FLOORF''@|1|g' \
+      -e 's|@''HAVE_DECL_FLOORL''@|1|g' \
+      -e 's|@''HAVE_DECL_FREXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_LDEXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_LOGL''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG10L''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2F''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2L''@|1|g' \
+      -e 's|@''HAVE_DECL_LOGB''@|1|g' \
+      -e 's|@''HAVE_DECL_REMAINDER''@|1|g' \
+      -e 's|@''HAVE_DECL_REMAINDERL''@|1|g' \
+      -e 's|@''HAVE_DECL_RINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUND''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUNDF''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUNDL''@|1|g' \
+      -e 's|@''HAVE_DECL_SINL''@|1|g' \
+      -e 's|@''HAVE_DECL_SQRTL''@|1|g' \
+      -e 's|@''HAVE_DECL_TANL''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNC''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCF''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCL''@|1|g' \
+      < math.h-t3 > math.h-t4
 rm -f string.h-t1
-rm -f stdio.h-t1 stdio.h-t2
-rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
-mv strings.h-t strings.h
+mv stdio.h-t3 stdio.h
 rm -f stdlib.h-t1 stdlib.h-t2
 mv string.h-t2 string.h
-mv stdio.h-t3 stdio.h
-mv math.h-t6 math.h
 mv stdlib.h-t3 stdlib.h
-/usr/bin/mkdir -p 'sys'
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''HAVE_STRINGS_H''@|1|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_STRINGS_H''@|<strings.h>|g' \
+      -e 's/@''GNULIB_FFS''@/0/g' \
+      -e 's/@''GNULIB_STRCASECMP''@/1/g' \
+      -e 's/@''GNULIB_STRCASECMP_L''@/0/g' \
+      -e 's/@''GNULIB_STRNCASECMP''@/1/g' \
+      -e 's/@''GNULIB_STRNCASECMP_L''@/0/g' \
+      -e 's|@''HAVE_FFS''@|1|g' \
+      -e 's|@''HAVE_STRCASECMP''@|1|g' \
+      -e 's|@''HAVE_STRCASECMP_L''@|1|g' \
+      -e 's|@''HAVE_STRNCASECMP''@|1|g' \
+      -e 's|@''HAVE_STRNCASECMP_L''@|1|g' \
+      -e 's|@''HAVE_DECL_STRNCASECMP''@|1|g' \
+      -e 's|@''REPLACE_STRCASECMP''@|0|g' \
+      -e 's|@''REPLACE_STRCASECMP_L''@|0|g' \
+      -e 's|@''REPLACE_STRNCASECMP''@|0|g' \
+      -e 's|@''REPLACE_STRNCASECMP_L''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/strings.in.h > strings.h-t
+sed \
+      -e 's|@''REPLACE_ACOSF''@|0|g' \
+      -e 's|@''REPLACE_ASINF''@|0|g' \
+      -e 's|@''REPLACE_ATANF''@|0|g' \
+      -e 's|@''REPLACE_ATAN2F''@|0|g' \
+      -e 's|@''REPLACE_CBRTF''@|0|g' \
+      -e 's|@''REPLACE_CBRTL''@|0|g' \
+      -e 's|@''REPLACE_CEIL''@|0|g' \
+      -e 's|@''REPLACE_CEILF''@|0|g' \
+      -e 's|@''REPLACE_CEILL''@|0|g' \
+      -e 's|@''REPLACE_COSF''@|0|g' \
+      -e 's|@''REPLACE_COSHF''@|0|g' \
+      -e 's|@''REPLACE_EXPF''@|0|g' \
+      -e 's|@''REPLACE_EXPL''@|0|g' \
+      -e 's|@''REPLACE_EXPM1''@|0|g' \
+      -e 's|@''REPLACE_EXPM1F''@|0|g' \
+      -e 's|@''REPLACE_EXPM1L''@|0|g' \
+      -e 's|@''REPLACE_EXP2''@|0|g' \
+      -e 's|@''REPLACE_EXP2L''@|0|g' \
+      -e 's|@''REPLACE_FABSL''@|0|g' \
+      -e 's|@''REPLACE_FLOOR''@|0|g' \
+      -e 's|@''REPLACE_FLOORF''@|0|g' \
+      -e 's|@''REPLACE_FLOORL''@|0|g' \
+      -e 's|@''REPLACE_FMA''@|0|g' \
+      -e 's|@''REPLACE_FMAF''@|0|g' \
+      -e 's|@''REPLACE_FMAL''@|0|g' \
+      -e 's|@''REPLACE_FMOD''@|0|g' \
+      -e 's|@''REPLACE_FMODF''@|0|g' \
+      -e 's|@''REPLACE_FMODL''@|0|g' \
+      -e 's|@''REPLACE_FREXPF''@|0|g' \
+      -e 's|@''REPLACE_FREXP''@|0|g' \
+      -e 's|@''REPLACE_FREXPL''@|0|g' \
+      -e 's|@''REPLACE_GETPAYLOAD''@|0|g' \
+      -e 's|@''REPLACE_GETPAYLOADF''@|0|g' \
+      -e 's|@''REPLACE_GETPAYLOADL''@|0|g' \
+      -e 's|@''REPLACE_HUGE_VAL''@|0|g' \
+      -e 's|@''REPLACE_HYPOT''@|0|g' \
+      -e 's|@''REPLACE_HYPOTF''@|0|g' \
+      -e 's|@''REPLACE_HYPOTL''@|0|g' \
+      -e 's|@''REPLACE_ILOGB''@|0|g' \
+      -e 's|@''REPLACE_ILOGBF''@|0|g' \
+      -e 's|@''REPLACE_ILOGBL''@|0|g' \
+      -e 's|@''REPLACE_ISFINITE''@|0|g' \
+      -e 's|@''REPLACE_ISINF''@|0|g' \
+      -e 's|@''REPLACE_ISNAN''@|0|g' \
+      -e 's|@''REPLACE_ITOLD''@|0|g' \
+      < math.h-t4 > math.h-t5
+mv strings.h-t strings.h
 /usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -5443,6 +5426,59 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_random.in.h > sys/random.h-t
+sed \
+      -e 's|@''REPLACE_LDEXP''@|0|g' \
+      -e 's|@''REPLACE_LDEXPL''@|0|g' \
+      -e 's|@''REPLACE_LOG''@|0|g' \
+      -e 's|@''REPLACE_LOGF''@|0|g' \
+      -e 's|@''REPLACE_LOGL''@|0|g' \
+      -e 's|@''REPLACE_LOG10''@|0|g' \
+      -e 's|@''REPLACE_LOG10F''@|0|g' \
+      -e 's|@''REPLACE_LOG10L''@|0|g' \
+      -e 's|@''REPLACE_LOG1P''@|0|g' \
+      -e 's|@''REPLACE_LOG1PF''@|0|g' \
+      -e 's|@''REPLACE_LOG1PL''@|0|g' \
+      -e 's|@''REPLACE_LOG2''@|0|g' \
+      -e 's|@''REPLACE_LOG2F''@|0|g' \
+      -e 's|@''REPLACE_LOG2L''@|0|g' \
+      -e 's|@''REPLACE_LOGB''@|0|g' \
+      -e 's|@''REPLACE_LOGBF''@|0|g' \
+      -e 's|@''REPLACE_LOGBL''@|0|g' \
+      -e 's|@''REPLACE_MODF''@|0|g' \
+      -e 's|@''REPLACE_MODFF''@|0|g' \
+      -e 's|@''REPLACE_MODFL''@|0|g' \
+      -e 's|@''REPLACE_NAN''@|0|g' \
+      -e 's|@''REPLACE_REMAINDER''@|0|g' \
+      -e 's|@''REPLACE_REMAINDERF''@|0|g' \
+      -e 's|@''REPLACE_REMAINDERL''@|0|g' \
+      -e 's|@''REPLACE_RINTL''@|0|g' \
+      -e 's|@''REPLACE_ROUND''@|0|g' \
+      -e 's|@''REPLACE_ROUNDF''@|0|g' \
+      -e 's|@''REPLACE_ROUNDL''@|0|g' \
+      -e 's|@''REPLACE_SIGNBIT''@|0|g' \
+      -e 's|@''REPLACE_SIGNBIT_USING_BUILTINS''@|1|g' \
+      -e 's|@''REPLACE_SINF''@|0|g' \
+      -e 's|@''REPLACE_SINHF''@|0|g' \
+      -e 's|@''REPLACE_SQRTF''@|0|g' \
+      -e 's|@''REPLACE_SQRTL''@|0|g' \
+      -e 's|@''REPLACE_TANF''@|0|g' \
+      -e 's|@''REPLACE_TANHF''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDER''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERF''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERL''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERMAG''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERMAGF''@|0|g' \
+      -e 's|@''REPLACE_TOTALORDERMAGL''@|0|g' \
+      -e 's|@''REPLACE_TRUNC''@|0|g' \
+      -e 's|@''REPLACE_TRUNCF''@|0|g' \
+      -e 's|@''REPLACE_TRUNCL''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < math.h-t5 > math.h-t6
+mv sys/random.h-t sys/random.h
+/usr/bin/mkdir -p 'sys'
+rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5500,9 +5536,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_stat.in.h > sys/stat.h-t
-mv sys/random.h-t sys/random.h
+mv math.h-t6 math.h
 /usr/bin/mkdir -p 'sys'
-mv sys/stat.h-t sys/stat.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_TIME_H''@/1/g' \
@@ -5520,7 +5555,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_time.in.h > sys/time.h-t
-/usr/bin/mkdir -p 'sys'
+mv sys/stat.h-t sys/stat.h
+mv sys/time.h-t sys/time.h
 /usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -5534,7 +5570,7 @@
       -e 's|@''HAVE_BLKSIZE_T''@|1|g' \
       -e 's|@''HAVE_BLKCNT_T''@|1|g' \
       ../../lib/sys_types.in.h > sys/types.h-t
-mv sys/time.h-t sys/time.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5545,8 +5581,6 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_wait.in.h > sys/wait.h-t
-mv sys/types.h-t sys/types.h
-mv sys/wait.h-t sys/wait.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -5599,6 +5633,9 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/time.in.h > time.h-t
+mv sys/types.h-t sys/types.h
+mv sys/wait.h-t sys/wait.h
+mv time.h-t time.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UCHAR_H''@/1/g' \
@@ -5672,9 +5709,6 @@
       -e 's/@''GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       ../../lib/unicase.in.h > unicase.h-t
-mv time.h-t time.h
-mv uchar.h-t uchar.h
-mv unicase.h-t unicase.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|0|g' \
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -5723,6 +5757,8 @@
       -e 's/@''GNULIB_UNINORM_NFKD_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNINORM_NFKC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       ../../lib/uninorm.in.h > uninorm.h-t
+mv uchar.h-t uchar.h
+mv unicase.h-t unicase.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -5749,6 +5785,7 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t1 > unictype.h-t2
+mv uninorm.h-t uninorm.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_UNISTD_H''@|1|g' \
@@ -5781,7 +5818,7 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ../../lib/unistd.in.h > unistd.h-t1
-mv uninorm.h-t uninorm.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -5817,7 +5854,6 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t2 > unictype.h-t3
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
 sed \
       -e 's/@''GNULIB_GETCWD''@/1/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
@@ -5925,6 +5961,7 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t3 > unictype.h-t4
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
 sed \
       -e 's|@''HAVE_CHOWN''@|1|g' \
       -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
@@ -5974,10 +6011,11 @@
       -e 's|@''HAVE_OS_H''@|0|g' \
       -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
       < unistd.h-t2 > unistd.h-t3
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
-rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
 mv unitypes.h-t unitypes.h
+rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
+mv unictype.h-t4 unictype.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
+mv uniwidth.h-t uniwidth.h
 sed \
       -e 's|@''REPLACE_ACCESS''@|0|g' \
       -e 's|@''REPLACE_CHOWN''@|0|g' \
@@ -6038,8 +6076,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < unistd.h-t3 > unistd.h-t4
-mv uniwidth.h-t uniwidth.h
-mv unictype.h-t4 unictype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UTIME_H''@/1/g' \
@@ -6055,9 +6091,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/utime.in.h > utime.h-t
-rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
-mv utime.h-t utime.h
-mv unistd.h-t4 unistd.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6114,6 +6147,9 @@
       -e 's/@''GNULIB_MDA_WCSDUP''@/1/g' \
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ../../lib/wchar.in.h > wchar.h-t1
+rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
+mv utime.h-t utime.h
+mv unistd.h-t4 unistd.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_WCTYPE_H''@/1/g' \
@@ -6148,7 +6184,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/wctype.in.h > wctype.h-t
-mv wctype.h-t wctype.h
 sed \
       -e 's|@''HAVE_WINT_T''@|1|g' \
       -e 's|@''HAVE_BTOWC''@|1|g' \
@@ -6194,6 +6229,7 @@
       -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
       -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
       < wchar.h-t1 > wchar.h-t2
+mv wctype.h-t wctype.h
 sed \
       -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
       -e 's|@''REPLACE_BTOWC''@|1|g' \
@@ -6467,7 +6503,6 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       ../../lib/error.in.h > error.h-t
 mv dirent.h-t dirent.h
-mv error.h-t error.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6491,6 +6526,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/fcntl.in.h > fcntl.h-t
+mv error.h-t error.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6500,12 +6536,13 @@
       -e 's|@''REPLACE_ITOLD''@|0|g' \
       ../../lib/float.in.h > float.h-t
 mv fcntl.h-t fcntl.h
-mv float.h-t float.h
 /usr/bin/mkdir -p 'malloc'
+mv float.h-t float.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
   -e '/libc_hidden_proto/d' \
   ../../lib/malloc/dynarray.h > malloc/dynarray.gl.h-t
 /usr/bin/mkdir -p 'malloc'
+mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
       -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \
@@ -6514,8 +6551,6 @@
       -e 's|__glibc_likely|_GL_LIKELY|g' \
       -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \
       ../../lib/malloc/dynarray-skeleton.c > malloc/dynarray-skeleton.gl.h-t
-mv malloc/dynarray.gl.h-t malloc/dynarray.gl.h
-mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
 /usr/bin/mkdir -p 'malloc'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \
@@ -6533,7 +6568,9 @@
       -e 's|ifdef __USE_GNU|if 1|' \
       -e 's|ifdef __USE_LARGEFILE64|if 0|' \
       ../../lib/glob-libc.h > glob-libc.gl.h-t
+mv malloc/dynarray-skeleton.gl.h-t malloc/dynarray-skeleton.gl.h
 mv malloc/scratch_buffer.gl.h-t malloc/scratch_buffer.gl.h
+mv glob-libc.gl.h-t glob-libc.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's/@''HAVE_INTTYPES_H''@/1/g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6563,7 +6600,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/inttypes.in.h > inttypes.h-t
-mv glob-libc.gl.h-t glob-libc.gl.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_LANGINFO_H''@|1|g' \
@@ -6583,8 +6619,6 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/langinfo.in.h > langinfo.h-t
-mv inttypes.h-t inttypes.h
-mv langinfo.h-t langinfo.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6592,6 +6626,9 @@
       -e 's|@''PRAGMA_COLUMNS''@||g' \
       -e 's|@''NEXT_LIMITS_H''@|<limits.h>|g' \
       ../../lib/limits.in.h > limits.h-t
+mv inttypes.h-t inttypes.h
+mv langinfo.h-t langinfo.h
+mv limits.h-t limits.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6625,7 +6662,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/locale.in.h > locale.h-t
-mv limits.h-t limits.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|include_next|g' \
@@ -6680,7 +6716,6 @@
       -e 's/@''GNULIB_HYPOTF''@/0/g' \
       -e 's/@''GNULIB_HYPOTL''@/0/g' \
       < ../../lib/math.in.h > math.h-t1
-mv locale.h-t locale.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_PTHREAD_H''@|1|g' \
@@ -6713,6 +6748,22 @@
       -e 's|@''HAVE_PTHREAD_JOIN''@|1|g' \
       -e 's|@''HAVE_PTHREAD_EXIT''@|1|g' \
       < ../../lib/pthread.in.h > pthread.h-t1
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''HAVE_SCHED_H''@|1|g' \
+      -e 's|@''HAVE_SYS_CDEFS_H''@|1|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SCHED_H''@|<sched.h>|g' \
+      -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|1|g' \
+      -e 's/@''GNULIB_SCHED_YIELD''@/0/g' \
+      -e 's|@''HAVE_SCHED_YIELD''@|1|g' \
+      -e 's|@''REPLACE_SCHED_YIELD''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      ../../lib/sched.in.h > sched.h-t
+mv locale.h-t locale.h
 sed \
       -e 's/@''GNULIB_ILOGB''@/0/g' \
       -e 's/@''GNULIB_ILOGBF''@/0/g' \
@@ -6788,21 +6839,6 @@
       -e 's/@''GNULIB_MDA_Y1''@/1/g' \
       -e 's/@''GNULIB_MDA_YN''@/1/g' \
       < math.h-t1 > math.h-t2
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''HAVE_SCHED_H''@|1|g' \
-      -e 's|@''HAVE_SYS_CDEFS_H''@|1|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SCHED_H''@|<sched.h>|g' \
-      -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|1|g' \
-      -e 's/@''GNULIB_SCHED_YIELD''@/0/g' \
-      -e 's|@''HAVE_SCHED_YIELD''@|1|g' \
-      -e 's|@''REPLACE_SCHED_YIELD''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      ../../lib/sched.in.h > sched.h-t
 sed \
       -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
       -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
@@ -6846,6 +6882,7 @@
       -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
       -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
       < pthread.h-t1 > pthread.h-t2
+mv sched.h-t sched.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6875,7 +6912,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/signal.in.h > signal.h-t
-mv sched.h-t sched.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -6887,85 +6923,6 @@
       -e 's|@''REPLACE_NULL''@|0|g' \
       -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
       ../../lib/stddef.in.h > stddef.h-t
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_STDIO_H''@|<stdio.h>|g' \
-      -e 's/@''GNULIB_DPRINTF''@/0/g' \
-      -e 's/@''GNULIB_DZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_FCLOSE''@/0/g' \
-      -e 's/@''GNULIB_FDOPEN''@/0/g' \
-      -e 's/@''GNULIB_FFLUSH''@/0/g' \
-      -e 's/@''GNULIB_FGETC''@/1/g' \
-      -e 's/@''GNULIB_FGETS''@/1/g' \
-      -e 's/@''GNULIB_FOPEN''@/0/g' \
-      -e 's/@''GNULIB_FOPEN_GNU''@/0/g' \
-      -e 's/@''GNULIB_FPRINTF''@/1/g' \
-      -e 's/@''GNULIB_FPRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_FPURGE''@/0/g' \
-      -e 's/@''GNULIB_FPUTC''@/1/g' \
-      -e 's/@''GNULIB_FPUTS''@/1/g' \
-      -e 's/@''GNULIB_FREAD''@/1/g' \
-      -e 's/@''GNULIB_FREOPEN''@/0/g' \
-      -e 's/@''GNULIB_FSCANF''@/1/g' \
-      -e 's/@''GNULIB_FSEEK''@/0/g' \
-      -e 's/@''GNULIB_FSEEKO''@/0/g' \
-      -e 's/@''GNULIB_FTELL''@/0/g' \
-      -e 's/@''GNULIB_FTELLO''@/0/g' \
-      -e 's/@''GNULIB_FWRITE''@/1/g' \
-      -e 's/@''GNULIB_FZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_GETC''@/1/g' \
-      -e 's/@''GNULIB_GETCHAR''@/1/g' \
-      -e 's/@''GNULIB_GETDELIM''@/1/g' \
-      -e 's/@''GNULIB_GETLINE''@/1/g' \
-      -e 's/@''GNULIB_OBSTACK_PRINTF''@/0/g' \
-      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_OBSTACK_ZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_PCLOSE''@/0/g' \
-      -e 's/@''GNULIB_PERROR''@/0/g' \
-      -e 's/@''GNULIB_POPEN''@/0/g' \
-      -e 's/@''GNULIB_PRINTF''@/1/g' \
-      -e 's/@''GNULIB_PRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_PUTC''@/1/g' \
-      -e 's/@''GNULIB_PUTCHAR''@/1/g' \
-      -e 's/@''GNULIB_PUTS''@/1/g' \
-      -e 's/@''GNULIB_REMOVE''@/0/g' \
-      -e 's/@''GNULIB_RENAME''@/0/g' \
-      -e 's/@''GNULIB_RENAMEAT''@/0/g' \
-      -e 's/@''GNULIB_SCANF''@/1/g' \
-      -e 's/@''GNULIB_SNPRINTF''@/1/g' \
-      -e 's/@''GNULIB_SNZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_SPRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/0/g' \
-      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/0/g' \
-      -e 's/@''GNULIB_SZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_TMPFILE''@/0/g' \
-      -e 's/@''GNULIB_VASPRINTF''@/0/g' \
-      -e 's/@''GNULIB_VASZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_VDPRINTF''@/0/g' \
-      -e 's/@''GNULIB_VDZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_VFPRINTF''@/1/g' \
-      -e 's/@''GNULIB_VFPRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_VFZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_VFSCANF''@/0/g' \
-      -e 's/@''GNULIB_VSCANF''@/0/g' \
-      -e 's/@''GNULIB_VPRINTF''@/1/g' \
-      -e 's/@''GNULIB_VPRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_VSNPRINTF''@/1/g' \
-      -e 's/@''GNULIB_VSNZPRINTF''@/1/g' \
-      -e 's/@''GNULIB_VSPRINTF_POSIX''@/0/g' \
-      -e 's/@''GNULIB_VSZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_VZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_ZPRINTF''@/0/g' \
-      -e 's/@''GNULIB_MDA_FCLOSEALL''@/1/g' \
-      -e 's/@''GNULIB_MDA_FDOPEN''@/1/g' \
-      -e 's/@''GNULIB_MDA_FILENO''@/1/g' \
-      -e 's/@''GNULIB_MDA_GETW''@/1/g' \
-      -e 's/@''GNULIB_MDA_PUTW''@/1/g' \
-      -e 's/@''GNULIB_MDA_TEMPNAM''@/1/g' \
-      < ../../lib/stdio.in.h > stdio.h-t1
 sed \
       -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
       -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
@@ -7002,6 +6959,7 @@
       -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|0|g' \
       -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
       < pthread.h-t2 > pthread.h-t3
+mv signal.h-t signal.h
 sed \
       -e 's|@''HAVE_ACOSF''@|1|g' \
       -e 's|@''HAVE_ACOSL''@|1|g' \
@@ -7082,29 +7040,86 @@
       -e 's|@''HAVE_TOTALORDERMAGF''@|1|g' \
       -e 's|@''HAVE_TOTALORDERMAGL''@|1|g' \
       < math.h-t2 > math.h-t3
-mv signal.h-t signal.h
 mv stddef.h-t stddef.h
-sed \
-      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
-      -e 's|@''HAVE_DECL_FPURGE''@|1|g' \
-      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
-      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
-      -e 's|@''HAVE_DECL_GETW''@|1|g' \
-      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
-      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
-      -e 's|@''HAVE_DPRINTF''@|1|g' \
-      -e 's|@''HAVE_FSEEKO''@|1|g' \
-      -e 's|@''HAVE_FTELLO''@|1|g' \
-      -e 's|@''HAVE_PCLOSE''@|1|g' \
-      -e 's|@''HAVE_POPEN''@|1|g' \
-      -e 's|@''HAVE_RENAMEAT''@|1|g' \
-      -e 's|@''HAVE_VASPRINTF''@|1|g' \
-      -e 's|@''HAVE_VDPRINTF''@|1|g' \
-      < stdio.h-t1 > stdio.h-t2
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_STDIO_H''@|<stdio.h>|g' \
+      -e 's/@''GNULIB_DPRINTF''@/0/g' \
+      -e 's/@''GNULIB_DZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_FCLOSE''@/0/g' \
+      -e 's/@''GNULIB_FDOPEN''@/0/g' \
+      -e 's/@''GNULIB_FFLUSH''@/0/g' \
+      -e 's/@''GNULIB_FGETC''@/1/g' \
+      -e 's/@''GNULIB_FGETS''@/1/g' \
+      -e 's/@''GNULIB_FOPEN''@/0/g' \
+      -e 's/@''GNULIB_FOPEN_GNU''@/0/g' \
+      -e 's/@''GNULIB_FPRINTF''@/1/g' \
+      -e 's/@''GNULIB_FPRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_FPURGE''@/0/g' \
+      -e 's/@''GNULIB_FPUTC''@/1/g' \
+      -e 's/@''GNULIB_FPUTS''@/1/g' \
+      -e 's/@''GNULIB_FREAD''@/1/g' \
+      -e 's/@''GNULIB_FREOPEN''@/0/g' \
+      -e 's/@''GNULIB_FSCANF''@/1/g' \
+      -e 's/@''GNULIB_FSEEK''@/0/g' \
+      -e 's/@''GNULIB_FSEEKO''@/0/g' \
+      -e 's/@''GNULIB_FTELL''@/0/g' \
+      -e 's/@''GNULIB_FTELLO''@/0/g' \
+      -e 's/@''GNULIB_FWRITE''@/1/g' \
+      -e 's/@''GNULIB_FZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_GETC''@/1/g' \
+      -e 's/@''GNULIB_GETCHAR''@/1/g' \
+      -e 's/@''GNULIB_GETDELIM''@/1/g' \
+      -e 's/@''GNULIB_GETLINE''@/1/g' \
+      -e 's/@''GNULIB_OBSTACK_PRINTF''@/0/g' \
+      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_OBSTACK_ZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_PCLOSE''@/0/g' \
+      -e 's/@''GNULIB_PERROR''@/0/g' \
+      -e 's/@''GNULIB_POPEN''@/0/g' \
+      -e 's/@''GNULIB_PRINTF''@/1/g' \
+      -e 's/@''GNULIB_PRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_PUTC''@/1/g' \
+      -e 's/@''GNULIB_PUTCHAR''@/1/g' \
+      -e 's/@''GNULIB_PUTS''@/1/g' \
+      -e 's/@''GNULIB_REMOVE''@/0/g' \
+      -e 's/@''GNULIB_RENAME''@/0/g' \
+      -e 's/@''GNULIB_RENAMEAT''@/0/g' \
+      -e 's/@''GNULIB_SCANF''@/1/g' \
+      -e 's/@''GNULIB_SNPRINTF''@/1/g' \
+      -e 's/@''GNULIB_SNZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_SPRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/0/g' \
+      -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/0/g' \
+      -e 's/@''GNULIB_SZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_TMPFILE''@/0/g' \
+      -e 's/@''GNULIB_VASPRINTF''@/0/g' \
+      -e 's/@''GNULIB_VASZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_VDPRINTF''@/0/g' \
+      -e 's/@''GNULIB_VDZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_VFPRINTF''@/1/g' \
+      -e 's/@''GNULIB_VFPRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_VFZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_VFSCANF''@/0/g' \
+      -e 's/@''GNULIB_VSCANF''@/0/g' \
+      -e 's/@''GNULIB_VPRINTF''@/1/g' \
+      -e 's/@''GNULIB_VPRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_VSNPRINTF''@/1/g' \
+      -e 's/@''GNULIB_VSNZPRINTF''@/1/g' \
+      -e 's/@''GNULIB_VSPRINTF_POSIX''@/0/g' \
+      -e 's/@''GNULIB_VSZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_VZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_ZPRINTF''@/0/g' \
+      -e 's/@''GNULIB_MDA_FCLOSEALL''@/1/g' \
+      -e 's/@''GNULIB_MDA_FDOPEN''@/1/g' \
+      -e 's/@''GNULIB_MDA_FILENO''@/1/g' \
+      -e 's/@''GNULIB_MDA_GETW''@/1/g' \
+      -e 's/@''GNULIB_MDA_PUTW''@/1/g' \
+      -e 's/@''GNULIB_MDA_TEMPNAM''@/1/g' \
+      < ../../lib/stdio.in.h > stdio.h-t1
 sed \
       -e 's|@''REPLACE_PTHREAD_COND_INIT''@|0|g' \
       -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|0|g' \
@@ -7128,6 +7143,44 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < pthread.h-t3 > pthread.h-t4
+sed \
+      -e 's|@''HAVE_DECL_ACOSL''@|1|g' \
+      -e 's|@''HAVE_DECL_ASINL''@|1|g' \
+      -e 's|@''HAVE_DECL_ATANL''@|1|g' \
+      -e 's|@''HAVE_DECL_CBRTF''@|1|g' \
+      -e 's|@''HAVE_DECL_CBRTL''@|1|g' \
+      -e 's|@''HAVE_DECL_CEILF''@|1|g' \
+      -e 's|@''HAVE_DECL_CEILL''@|1|g' \
+      -e 's|@''HAVE_DECL_COPYSIGNF''@|1|g' \
+      -e 's|@''HAVE_DECL_COSL''@|1|g' \
+      -e 's|@''HAVE_DECL_EXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2F''@|1|g' \
+      -e 's|@''HAVE_DECL_EXP2L''@|1|g' \
+      -e 's|@''HAVE_DECL_EXPM1L''@|1|g' \
+      -e 's|@''HAVE_DECL_FLOORF''@|1|g' \
+      -e 's|@''HAVE_DECL_FLOORL''@|1|g' \
+      -e 's|@''HAVE_DECL_FREXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_LDEXPL''@|1|g' \
+      -e 's|@''HAVE_DECL_LOGL''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG10L''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2F''@|1|g' \
+      -e 's|@''HAVE_DECL_LOG2L''@|1|g' \
+      -e 's|@''HAVE_DECL_LOGB''@|1|g' \
+      -e 's|@''HAVE_DECL_REMAINDER''@|1|g' \
+      -e 's|@''HAVE_DECL_REMAINDERL''@|1|g' \
+      -e 's|@''HAVE_DECL_RINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUND''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUNDF''@|1|g' \
+      -e 's|@''HAVE_DECL_ROUNDL''@|1|g' \
+      -e 's|@''HAVE_DECL_SINL''@|1|g' \
+      -e 's|@''HAVE_DECL_SQRTL''@|1|g' \
+      -e 's|@''HAVE_DECL_TANL''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNC''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCF''@|1|g' \
+      -e 's|@''HAVE_DECL_TRUNCL''@|1|g' \
+      < math.h-t3 > math.h-t4
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -7189,43 +7242,27 @@
       -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
       < ../../lib/stdlib.in.h > stdlib.h-t1
 sed \
-      -e 's|@''HAVE_DECL_ACOSL''@|1|g' \
-      -e 's|@''HAVE_DECL_ASINL''@|1|g' \
-      -e 's|@''HAVE_DECL_ATANL''@|1|g' \
-      -e 's|@''HAVE_DECL_CBRTF''@|1|g' \
-      -e 's|@''HAVE_DECL_CBRTL''@|1|g' \
-      -e 's|@''HAVE_DECL_CEILF''@|1|g' \
-      -e 's|@''HAVE_DECL_CEILL''@|1|g' \
-      -e 's|@''HAVE_DECL_COPYSIGNF''@|1|g' \
-      -e 's|@''HAVE_DECL_COSL''@|1|g' \
-      -e 's|@''HAVE_DECL_EXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2F''@|1|g' \
-      -e 's|@''HAVE_DECL_EXP2L''@|1|g' \
-      -e 's|@''HAVE_DECL_EXPM1L''@|1|g' \
-      -e 's|@''HAVE_DECL_FLOORF''@|1|g' \
-      -e 's|@''HAVE_DECL_FLOORL''@|1|g' \
-      -e 's|@''HAVE_DECL_FREXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_LDEXPL''@|1|g' \
-      -e 's|@''HAVE_DECL_LOGL''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG10L''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2F''@|1|g' \
-      -e 's|@''HAVE_DECL_LOG2L''@|1|g' \
-      -e 's|@''HAVE_DECL_LOGB''@|1|g' \
-      -e 's|@''HAVE_DECL_REMAINDER''@|1|g' \
-      -e 's|@''HAVE_DECL_REMAINDERL''@|1|g' \
-      -e 's|@''HAVE_DECL_RINTF''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUND''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUNDF''@|1|g' \
-      -e 's|@''HAVE_DECL_ROUNDL''@|1|g' \
-      -e 's|@''HAVE_DECL_SINL''@|1|g' \
-      -e 's|@''HAVE_DECL_SQRTL''@|1|g' \
-      -e 's|@''HAVE_DECL_TANL''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNC''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCF''@|1|g' \
-      -e 's|@''HAVE_DECL_TRUNCL''@|1|g' \
-      < math.h-t3 > math.h-t4
+      -e 's|@''HAVE_DECL_FCLOSEALL''@|1|g' \
+      -e 's|@''HAVE_DECL_FPURGE''@|1|g' \
+      -e 's|@''HAVE_DECL_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_DECL_FTELLO''@|1|g' \
+      -e 's|@''HAVE_DECL_GETDELIM''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLINE''@|1|g' \
+      -e 's|@''HAVE_DECL_GETW''@|1|g' \
+      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_PUTW''@|1|g' \
+      -e 's|@''HAVE_DECL_SNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DECL_VSNPRINTF''@|1|g' \
+      -e 's|@''HAVE_DPRINTF''@|1|g' \
+      -e 's|@''HAVE_FSEEKO''@|1|g' \
+      -e 's|@''HAVE_FTELLO''@|1|g' \
+      -e 's|@''HAVE_PCLOSE''@|1|g' \
+      -e 's|@''HAVE_POPEN''@|1|g' \
+      -e 's|@''HAVE_RENAMEAT''@|1|g' \
+      -e 's|@''HAVE_VASPRINTF''@|1|g' \
+      -e 's|@''HAVE_VDPRINTF''@|1|g' \
+      < stdio.h-t1 > stdio.h-t2
+rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
 sed \
       -e 's|@''REPLACE_DPRINTF''@|0|g' \
       -e 's|@''REPLACE_FCLOSE''@|0|g' \
@@ -7265,65 +7302,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < stdio.h-t2 > stdio.h-t3
-rm -f pthread.h-t1 pthread.h-t2 pthread.h-t3
-mv pthread.h-t4 pthread.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
-      -e 's|@''GUARD_PREFIX''@|GL|g' \
-      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_STRING_H''@|<string.h>|g' \
-      -e 's/@''GNULIB_EXPLICIT_BZERO''@/0/g' \
-      -e 's/@''GNULIB_FFSL''@/0/g' \
-      -e 's/@''GNULIB_FFSLL''@/0/g' \
-      -e 's/@''GNULIB_MBSLEN''@/0/g' \
-      -e 's/@''GNULIB_MBSNLEN''@/0/g' \
-      -e 's/@''GNULIB_MBSCHR''@/0/g' \
-      -e 's/@''GNULIB_MBSRCHR''@/0/g' \
-      -e 's/@''GNULIB_MBSSTR''@/0/g' \
-      -e 's/@''GNULIB_MBSCASECMP''@/0/g' \
-      -e 's/@''GNULIB_MBSNCASECMP''@/0/g' \
-      -e 's/@''GNULIB_MBSPCASECMP''@/0/g' \
-      -e 's/@''GNULIB_MBSCASESTR''@/0/g' \
-      -e 's/@''GNULIB_MBSCSPN''@/0/g' \
-      -e 's/@''GNULIB_MBSPBRK''@/0/g' \
-      -e 's/@''GNULIB_MBSSPN''@/0/g' \
-      -e 's/@''GNULIB_MBSSEP''@/0/g' \
-      -e 's/@''GNULIB_MBSTOK_R''@/0/g' \
-      -e 's/@''GNULIB_MBS_ENDSWITH''@/0/g' \
-      -e 's/@''GNULIB_MBS_STARTSWITH''@/0/g' \
-      -e 's/@''GNULIB_MEMCHR''@/1/g' \
-      -e 's/@''GNULIB_MEMMEM''@/0/g' \
-      -e 's/@''GNULIB_MEMPCPY''@/1/g' \
-      -e 's/@''GNULIB_MEMRCHR''@/1/g' \
-      -e 's/@''GNULIB_MEMSET_EXPLICIT''@/0/g' \
-      -e 's/@''GNULIB_RAWMEMCHR''@/1/g' \
-      -e 's/@''GNULIB_STPCPY''@/0/g' \
-      -e 's/@''GNULIB_STPNCPY''@/0/g' \
-      -e 's/@''GNULIB_STRCHRNUL''@/0/g' \
-      -e 's/@''GNULIB_STRDUP''@/1/g' \
-      -e 's/@''GNULIB_STRNCAT''@/0/g' \
-      -e 's/@''GNULIB_STRNDUP''@/0/g' \
-      -e 's/@''GNULIB_STRNLEN''@/1/g' \
-      -e 's/@''GNULIB_STRPBRK''@/0/g' \
-      -e 's/@''GNULIB_STRSEP''@/0/g' \
-      -e 's/@''GNULIB_STRSTR''@/0/g' \
-      -e 's/@''GNULIB_STRCASESTR''@/1/g' \
-      -e 's/@''GNULIB_STRTOK_R''@/0/g' \
-      -e 's/@''GNULIB_STR_ENDSWITH''@/0/g' \
-      -e 's/@''GNULIB_STR_STARTSWITH''@/0/g' \
-      -e 's/@''GNULIB_STRERROR''@/1/g' \
-      -e 's/@''GNULIB_STRERROR_R''@/0/g' \
-      -e 's/@''GNULIB_STRERROR_L''@/0/g' \
-      -e 's/@''GNULIB_STRERRORNAME_NP''@/0/g' \
-      -e 's/@''GNULIB_SIGABBREV_NP''@/0/g' \
-      -e 's/@''GNULIB_SIGDESCR_NP''@/0/g' \
-      -e 's/@''GNULIB_STRSIGNAL''@/0/g' \
-      -e 's/@''GNULIB_STRVERSCMP''@/0/g' \
-      -e 's/@''GNULIB_MDA_MEMCCPY''@/1/g' \
-      -e 's/@''GNULIB_MDA_STRDUP''@/1/g' \
-      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
-      < ../../lib/string.in.h > string.h-t1
 sed \
       -e 's|@''REPLACE_ACOSF''@|0|g' \
       -e 's|@''REPLACE_ASINF''@|0|g' \
@@ -7419,61 +7397,9 @@
       -e 's|@''HAVE_UNLOCKPT''@|1|g' \
       -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
       < stdlib.h-t1 > stdlib.h-t2
+mv pthread.h-t4 pthread.h
 rm -f stdio.h-t1 stdio.h-t2
-sed \
-      -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
-      -e 's|@''HAVE_FFSL''@|1|g' \
-      -e 's|@''HAVE_FFSLL''@|1|g' \
-      -e 's|@''HAVE_MBSLEN''@|0|g' \
-      -e 's|@''HAVE_DECL_MEMMEM''@|1|g' \
-      -e 's|@''HAVE_MEMPCPY''@|1|g' \
-      -e 's|@''HAVE_DECL_MEMRCHR''@|1|g' \
-      -e 's|@''HAVE_MEMSET_EXPLICIT''@|1|g' \
-      -e 's|@''HAVE_RAWMEMCHR''@|1|g' \
-      -e 's|@''HAVE_STPCPY''@|1|g' \
-      -e 's|@''HAVE_STPNCPY''@|1|g' \
-      -e 's|@''HAVE_STRCHRNUL''@|1|g' \
-      -e 's|@''HAVE_DECL_STRDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_STRNDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_STRNLEN''@|1|g' \
-      -e 's|@''HAVE_STRPBRK''@|1|g' \
-      -e 's|@''HAVE_STRSEP''@|1|g' \
-      -e 's|@''HAVE_STRCASESTR''@|1|g' \
-      -e 's|@''HAVE_DECL_STRTOK_R''@|1|g' \
-      -e 's|@''HAVE_DECL_STRERROR_R''@|1|g' \
-      -e 's|@''HAVE_STRERROR_L''@|1|g' \
-      -e 's|@''HAVE_STRERRORNAME_NP''@|1|g' \
-      -e 's|@''HAVE_SIGABBREV_NP''@|1|g' \
-      -e 's|@''HAVE_SIGDESCR_NP''@|1|g' \
-      -e 's|@''HAVE_DECL_STRSIGNAL''@|1|g' \
-      -e 's|@''HAVE_STRVERSCMP''@|1|g' \
-      -e 's|@''REPLACE_FFSLL''@|0|g' \
-      -e 's|@''REPLACE_MEMCHR''@|0|g' \
-      -e 's|@''REPLACE_MEMMEM''@|0|g' \
-      -e 's|@''REPLACE_MEMPCPY''@|0|g' \
-      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|0|g' \
-      -e 's|@''REPLACE_FREE''@|0|g' \
-      -e 's|@''REPLACE_STPCPY''@|0|g' \
-      -e 's|@''REPLACE_STPNCPY''@|0|g' \
-      -e 's|@''REPLACE_STRCHRNUL''@|0|g' \
-      -e 's|@''REPLACE_STRDUP''@|0|g' \
-      -e 's|@''REPLACE_STRNCAT''@|0|g' \
-      -e 's|@''REPLACE_STRNDUP''@|0|g' \
-      -e 's|@''REPLACE_STRNLEN''@|0|g' \
-      -e 's|@''REPLACE_STRSTR''@|0|g' \
-      -e 's|@''REPLACE_STRCASESTR''@|0|g' \
-      -e 's|@''REPLACE_STRTOK_R''@|0|g' \
-      -e 's|@''REPLACE_STRERROR''@|0|g' \
-      -e 's|@''REPLACE_STRERROR_R''@|0|g' \
-      -e 's|@''REPLACE_STRERROR_L''@|0|g' \
-      -e 's|@''REPLACE_STRERRORNAME_NP''@|0|g' \
-      -e 's|@''REPLACE_STRSIGNAL''@|0|g' \
-      -e 's|@''REPLACE_STRVERSCMP''@|0|g' \
-      -e 's|@''UNDEFINE_STRTOK_R''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
-      < string.h-t1 > string.h-t2
+mv stdio.h-t3 stdio.h
 sed \
       -e 's|@''REPLACE_LDEXP''@|0|g' \
       -e 's|@''REPLACE_LDEXPL''@|0|g' \
@@ -7524,7 +7450,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < math.h-t5 > math.h-t6
-mv stdio.h-t3 stdio.h
 sed \
       -e 's|@''REPLACE__EXIT''@|0|g' \
       -e 's|@''REPLACE_ABORT''@|0|g' \
@@ -7574,7 +7499,63 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
-rm -f string.h-t1
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
+      -e 's|@''GUARD_PREFIX''@|GL|g' \
+      -e 's|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_STRING_H''@|<string.h>|g' \
+      -e 's/@''GNULIB_EXPLICIT_BZERO''@/0/g' \
+      -e 's/@''GNULIB_FFSL''@/0/g' \
+      -e 's/@''GNULIB_FFSLL''@/0/g' \
+      -e 's/@''GNULIB_MBSLEN''@/0/g' \
+      -e 's/@''GNULIB_MBSNLEN''@/0/g' \
+      -e 's/@''GNULIB_MBSCHR''@/0/g' \
+      -e 's/@''GNULIB_MBSRCHR''@/0/g' \
+      -e 's/@''GNULIB_MBSSTR''@/0/g' \
+      -e 's/@''GNULIB_MBSCASECMP''@/0/g' \
+      -e 's/@''GNULIB_MBSNCASECMP''@/0/g' \
+      -e 's/@''GNULIB_MBSPCASECMP''@/0/g' \
+      -e 's/@''GNULIB_MBSCASESTR''@/0/g' \
+      -e 's/@''GNULIB_MBSCSPN''@/0/g' \
+      -e 's/@''GNULIB_MBSPBRK''@/0/g' \
+      -e 's/@''GNULIB_MBSSPN''@/0/g' \
+      -e 's/@''GNULIB_MBSSEP''@/0/g' \
+      -e 's/@''GNULIB_MBSTOK_R''@/0/g' \
+      -e 's/@''GNULIB_MBS_ENDSWITH''@/0/g' \
+      -e 's/@''GNULIB_MBS_STARTSWITH''@/0/g' \
+      -e 's/@''GNULIB_MEMCHR''@/1/g' \
+      -e 's/@''GNULIB_MEMMEM''@/0/g' \
+      -e 's/@''GNULIB_MEMPCPY''@/1/g' \
+      -e 's/@''GNULIB_MEMRCHR''@/1/g' \
+      -e 's/@''GNULIB_MEMSET_EXPLICIT''@/0/g' \
+      -e 's/@''GNULIB_RAWMEMCHR''@/1/g' \
+      -e 's/@''GNULIB_STPCPY''@/0/g' \
+      -e 's/@''GNULIB_STPNCPY''@/0/g' \
+      -e 's/@''GNULIB_STRCHRNUL''@/0/g' \
+      -e 's/@''GNULIB_STRDUP''@/1/g' \
+      -e 's/@''GNULIB_STRNCAT''@/0/g' \
+      -e 's/@''GNULIB_STRNDUP''@/0/g' \
+      -e 's/@''GNULIB_STRNLEN''@/1/g' \
+      -e 's/@''GNULIB_STRPBRK''@/0/g' \
+      -e 's/@''GNULIB_STRSEP''@/0/g' \
+      -e 's/@''GNULIB_STRSTR''@/0/g' \
+      -e 's/@''GNULIB_STRCASESTR''@/1/g' \
+      -e 's/@''GNULIB_STRTOK_R''@/0/g' \
+      -e 's/@''GNULIB_STR_ENDSWITH''@/0/g' \
+      -e 's/@''GNULIB_STR_STARTSWITH''@/0/g' \
+      -e 's/@''GNULIB_STRERROR''@/1/g' \
+      -e 's/@''GNULIB_STRERROR_R''@/0/g' \
+      -e 's/@''GNULIB_STRERROR_L''@/0/g' \
+      -e 's/@''GNULIB_STRERRORNAME_NP''@/0/g' \
+      -e 's/@''GNULIB_SIGABBREV_NP''@/0/g' \
+      -e 's/@''GNULIB_SIGDESCR_NP''@/0/g' \
+      -e 's/@''GNULIB_STRSIGNAL''@/0/g' \
+      -e 's/@''GNULIB_STRVERSCMP''@/0/g' \
+      -e 's/@''GNULIB_MDA_MEMCCPY''@/1/g' \
+      -e 's/@''GNULIB_MDA_STRDUP''@/1/g' \
+      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
+      < ../../lib/string.in.h > string.h-t1
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''HAVE_STRINGS_H''@|1|g' \
@@ -7601,12 +7582,65 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/strings.in.h > strings.h-t
-rm -f stdlib.h-t1 stdlib.h-t2
 rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
-mv string.h-t2 string.h
 mv strings.h-t strings.h
-mv stdlib.h-t3 stdlib.h
+rm -f stdlib.h-t1 stdlib.h-t2
 mv math.h-t6 math.h
+sed \
+      -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
+      -e 's|@''HAVE_FFSL''@|1|g' \
+      -e 's|@''HAVE_FFSLL''@|1|g' \
+      -e 's|@''HAVE_MBSLEN''@|0|g' \
+      -e 's|@''HAVE_DECL_MEMMEM''@|1|g' \
+      -e 's|@''HAVE_MEMPCPY''@|1|g' \
+      -e 's|@''HAVE_DECL_MEMRCHR''@|1|g' \
+      -e 's|@''HAVE_MEMSET_EXPLICIT''@|1|g' \
+      -e 's|@''HAVE_RAWMEMCHR''@|1|g' \
+      -e 's|@''HAVE_STPCPY''@|1|g' \
+      -e 's|@''HAVE_STPNCPY''@|1|g' \
+      -e 's|@''HAVE_STRCHRNUL''@|1|g' \
+      -e 's|@''HAVE_DECL_STRDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_STRNDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_STRNLEN''@|1|g' \
+      -e 's|@''HAVE_STRPBRK''@|1|g' \
+      -e 's|@''HAVE_STRSEP''@|1|g' \
+      -e 's|@''HAVE_STRCASESTR''@|1|g' \
+      -e 's|@''HAVE_DECL_STRTOK_R''@|1|g' \
+      -e 's|@''HAVE_DECL_STRERROR_R''@|1|g' \
+      -e 's|@''HAVE_STRERROR_L''@|1|g' \
+      -e 's|@''HAVE_STRERRORNAME_NP''@|1|g' \
+      -e 's|@''HAVE_SIGABBREV_NP''@|1|g' \
+      -e 's|@''HAVE_SIGDESCR_NP''@|1|g' \
+      -e 's|@''HAVE_DECL_STRSIGNAL''@|1|g' \
+      -e 's|@''HAVE_STRVERSCMP''@|1|g' \
+      -e 's|@''REPLACE_FFSLL''@|0|g' \
+      -e 's|@''REPLACE_MEMCHR''@|0|g' \
+      -e 's|@''REPLACE_MEMMEM''@|0|g' \
+      -e 's|@''REPLACE_MEMPCPY''@|0|g' \
+      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|0|g' \
+      -e 's|@''REPLACE_FREE''@|0|g' \
+      -e 's|@''REPLACE_STPCPY''@|0|g' \
+      -e 's|@''REPLACE_STPNCPY''@|0|g' \
+      -e 's|@''REPLACE_STRCHRNUL''@|0|g' \
+      -e 's|@''REPLACE_STRDUP''@|0|g' \
+      -e 's|@''REPLACE_STRNCAT''@|0|g' \
+      -e 's|@''REPLACE_STRNDUP''@|0|g' \
+      -e 's|@''REPLACE_STRNLEN''@|0|g' \
+      -e 's|@''REPLACE_STRSTR''@|0|g' \
+      -e 's|@''REPLACE_STRCASESTR''@|0|g' \
+      -e 's|@''REPLACE_STRTOK_R''@|0|g' \
+      -e 's|@''REPLACE_STRERROR''@|0|g' \
+      -e 's|@''REPLACE_STRERROR_R''@|0|g' \
+      -e 's|@''REPLACE_STRERROR_L''@|0|g' \
+      -e 's|@''REPLACE_STRERRORNAME_NP''@|0|g' \
+      -e 's|@''REPLACE_STRSIGNAL''@|0|g' \
+      -e 's|@''REPLACE_STRVERSCMP''@|0|g' \
+      -e 's|@''UNDEFINE_STRTOK_R''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
+      < string.h-t1 > string.h-t2
+mv stdlib.h-t3 stdlib.h
 /usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -7622,8 +7656,10 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_random.in.h > sys/random.h-t
-/usr/bin/mkdir -p 'sys'
+rm -f string.h-t1
 mv sys/random.h-t sys/random.h
+mv string.h-t2 string.h
+/usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -7682,7 +7718,6 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_stat.in.h > sys/stat.h-t
 /usr/bin/mkdir -p 'sys'
-mv sys/stat.h-t sys/stat.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_SYS_TIME_H''@/1/g' \
@@ -7701,6 +7736,7 @@
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_time.in.h > sys/time.h-t
 /usr/bin/mkdir -p 'sys'
+mv sys/stat.h-t sys/stat.h
 mv sys/time.h-t sys/time.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -7715,7 +7751,6 @@
       -e 's|@''HAVE_BLKCNT_T''@|1|g' \
       ../../lib/sys_types.in.h > sys/types.h-t
 /usr/bin/mkdir -p 'sys'
-mv sys/types.h-t sys/types.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -7726,6 +7761,7 @@
       -e '/definitions of _GL_FUNCDECL_RPL/r ../../lib/c++defs.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       ../../lib/sys_wait.in.h > sys/wait.h-t
+mv sys/types.h-t sys/types.h
 mv sys/wait.h-t sys/wait.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -7894,8 +7930,8 @@
       -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < ../../lib/unictype.in.h > unictype.h-t1
 mv time.h-t time.h
-mv unicase.h-t unicase.h
 mv uchar.h-t uchar.h
+mv unicase.h-t unicase.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -7961,7 +7997,6 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ../../lib/unistd.in.h > unistd.h-t1
-mv uninorm.h-t uninorm.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -7997,6 +8032,7 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t2 > unictype.h-t3
+mv uninorm.h-t uninorm.h
 sed \
       -e 's/@''GNULIB_GETCWD''@/1/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
@@ -8061,8 +8097,6 @@
       -e 's/@''GNULIB_MDA_WRITE''@/1/g' \
       < unistd.h-t1 > unistd.h-t2
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unistr.h-t' ../../lib/unistr.in.h
-mv unistr.h-t unistr.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
 sed \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
@@ -8106,6 +8140,8 @@
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/LIBUNISTRING_DLL_VARIABLE/g' \
       < unictype.h-t3 > unictype.h-t4
+mv unistr.h-t unistr.h
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w unitypes.h-t' ../../lib/unitypes.in.h
 sed \
       -e 's|@''HAVE_CHOWN''@|1|g' \
       -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
@@ -8156,8 +8192,8 @@
       -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
       < unistd.h-t2 > unistd.h-t3
 mv unitypes.h-t unitypes.h
-sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
 rm -f unictype.h-t1 unictype.h-t2 unictype.h-t3
+mv unictype.h-t4 unictype.h
 sed \
       -e 's|@''REPLACE_ACCESS''@|0|g' \
       -e 's|@''REPLACE_CHOWN''@|0|g' \
@@ -8218,8 +8254,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ../../lib/arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ../../lib/warn-on-use.h' \
       < unistd.h-t3 > unistd.h-t4
+sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G -n -e 'w uniwidth.h-t' ../../lib/uniwidth.in.h
 mv uniwidth.h-t uniwidth.h
-mv unictype.h-t4 unictype.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
       -e 's/@''HAVE_UTIME_H''@/1/g' \
@@ -8559,10 +8595,10 @@
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/doc/nano'
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/man/man1'
  /usr/bin/install -c -m 644 ../../doc/faq.html ../../doc/nano.html '/build/reproducible-path/nano-8.4/debian/nano/usr/share/doc/nano'
- /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/man/man5'
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/info'
- /usr/bin/install -c -m 644 ../../doc/nanorc.5 '/build/reproducible-path/nano-8.4/debian/nano/usr/share/man/man5'
+ /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/man/man5'
  /usr/bin/install -c -m 644 ../../doc/nano.1 ../../doc/rnano.1 '/build/reproducible-path/nano-8.4/debian/nano/usr/share/man/man1'
+ /usr/bin/install -c -m 644 ../../doc/nanorc.5 '/build/reproducible-path/nano-8.4/debian/nano/usr/share/man/man5'
  /usr/bin/install -c -m 644 ../../doc/nano.info '/build/reproducible-path/nano-8.4/debian/nano/usr/share/info'
 make[6]: Leaving directory '/build/reproducible-path/nano-8.4/build-nano/doc'
 make[5]: Leaving directory '/build/reproducible-path/nano-8.4/build-nano/doc'
@@ -8658,8 +8694,8 @@
 make[4]: Nothing to be done for 'install-exec-am'.
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/nano'
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/nano'
- /usr/bin/install -c -m 644 ../../syntax/asm.nanorc ../../syntax/autoconf.nanorc ../../syntax/awk.nanorc ../../syntax/changelog.nanorc ../../syntax/cmake.nanorc ../../syntax/c.nanorc ../../syntax/css.nanorc ../../syntax/default.nanorc ../../syntax/elisp.nanorc ../../syntax/email.nanorc ../../syntax/go.nanorc ../../syntax/groff.nanorc ../../syntax/guile.nanorc ../../syntax/html.nanorc ../../syntax/java.nanorc ../../syntax/javascript.nanorc ../../syntax/json.nanorc ../../syntax/lua.nanorc ../../syntax/makefile.nanorc ../../syntax/man.nanorc ../../syntax/markdown.nanorc ../../syntax/nanohelp.nanorc ../../syntax/nanorc.nanorc ../../syntax/nftables.nanorc ../../syntax/objc.nanorc ../../syntax/ocaml.nanorc ../../syntax/patch.nanorc ../../syntax/perl.nanorc ../../syntax/php.nanorc ../../syntax/po.nanorc ../../syntax/python.nanorc ../../syntax/ruby.nanorc ../../syntax/rust.nanorc ../../syntax/sh.nanorc ../../syntax/sql.nanorc ../../syntax/tcl.nanorc ../../syntax/tex.nanorc ../../syntax/texinfo.nanorc ../../syntax/xml.nanorc ../../syntax/yaml.nanorc '/build/reproducible-path/nano-8.4/debian/nano/usr/share/nano'
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano/usr/share/nano/extra'
+ /usr/bin/install -c -m 644 ../../syntax/asm.nanorc ../../syntax/autoconf.nanorc ../../syntax/awk.nanorc ../../syntax/changelog.nanorc ../../syntax/cmake.nanorc ../../syntax/c.nanorc ../../syntax/css.nanorc ../../syntax/default.nanorc ../../syntax/elisp.nanorc ../../syntax/email.nanorc ../../syntax/go.nanorc ../../syntax/groff.nanorc ../../syntax/guile.nanorc ../../syntax/html.nanorc ../../syntax/java.nanorc ../../syntax/javascript.nanorc ../../syntax/json.nanorc ../../syntax/lua.nanorc ../../syntax/makefile.nanorc ../../syntax/man.nanorc ../../syntax/markdown.nanorc ../../syntax/nanohelp.nanorc ../../syntax/nanorc.nanorc ../../syntax/nftables.nanorc ../../syntax/objc.nanorc ../../syntax/ocaml.nanorc ../../syntax/patch.nanorc ../../syntax/perl.nanorc ../../syntax/php.nanorc ../../syntax/po.nanorc ../../syntax/python.nanorc ../../syntax/ruby.nanorc ../../syntax/rust.nanorc ../../syntax/sh.nanorc ../../syntax/sql.nanorc ../../syntax/tcl.nanorc ../../syntax/tex.nanorc ../../syntax/texinfo.nanorc ../../syntax/xml.nanorc ../../syntax/yaml.nanorc '/build/reproducible-path/nano-8.4/debian/nano/usr/share/nano'
  /usr/bin/install -c -m 644  ../../syntax/extra/ada.nanorc ../../syntax/extra/fortran.nanorc ../../syntax/extra/haskell.nanorc ../../syntax/extra/povray.nanorc ../../syntax/extra/spec.nanorc '/build/reproducible-path/nano-8.4/debian/nano/usr/share/nano/extra'
 make[4]: Leaving directory '/build/reproducible-path/nano-8.4/build-nano/syntax'
 make[3]: Leaving directory '/build/reproducible-path/nano-8.4/build-nano/syntax'
@@ -8683,11 +8719,11 @@
 make[6]: Nothing to be done for 'install-exec-am'.
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/doc/nano'
  /usr/bin/install -c -m 644 ../../doc/faq.html ../../doc/nano.html '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/doc/nano'
- /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/info'
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/man/man1'
+ /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/info'
  /usr/bin/mkdir -p '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/man/man5'
- /usr/bin/install -c -m 644 ../../doc/nano.info '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/info'
  /usr/bin/install -c -m 644 ../../doc/nano.1 ../../doc/rnano.1 '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/man/man1'
+ /usr/bin/install -c -m 644 ../../doc/nano.info '/build/reproducible-path/nano-8.4/debian/nano-tiny/usr/share/info'
 make[6]: Leaving directory '/build/reproducible-path/nano-8.4/build-tiny/doc'
 make[5]: Leaving directory '/build/reproducible-path/nano-8.4/build-tiny/doc'
 make[4]: Leaving directory '/build/reproducible-path/nano-8.4/build-tiny/doc'
@@ -8838,44 +8874,44 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	Normalized debian/nano/usr/share/locale/nb/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ms/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ko/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ka/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/sl/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/sk/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ru/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ro/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/tr/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/sv/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/sr/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/sq/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ca/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/bg/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/hu/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/hr/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/gl/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/ga/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/pt_BR/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/pt/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/pl/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/nl/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/eo/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/de/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/da/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/cs/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/fr/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/fi/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/eu/LC_MESSAGES/nano.mo
-	Normalized debian/nano/usr/share/locale/es/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/zh_TW/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/zh_CN/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/vi/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/uk/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ca/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/bg/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/fr/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/fi/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/eu/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/es/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/hu/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/hr/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/gl/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ga/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/nb/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ms/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ko/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ka/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/ja/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/it/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/is/LC_MESSAGES/nano.mo
 	Normalized debian/nano/usr/share/locale/id/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/tr/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/sv/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/sr/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/sq/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/sl/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/sk/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ru/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/ro/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/pt_BR/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/pt/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/pl/LC_MESSAGES/nano.mo
+	Normalized debian/nano/usr/share/locale/nl/LC_MESSAGES/nano.mo
    dh_compress
    dh_fixperms
    dh_missing
@@ -8899,9 +8935,9 @@
    dh_gencontrol
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'nano-dbgsym' in '../nano-dbgsym_8.4-1_arm64.deb'.
 dpkg-deb: building package 'nano' in '../nano_8.4-1_arm64.deb'.
 dpkg-deb: building package 'nano-tiny' in '../nano-tiny_8.4-1_arm64.deb'.
+dpkg-deb: building package 'nano-dbgsym' in '../nano-dbgsym_8.4-1_arm64.deb'.
 dpkg-deb: building package 'nano-tiny-dbgsym' in '../nano-tiny-dbgsym_8.4-1_arm64.deb'.
 dpkg-deb: building package 'nano-udeb' in 'debian/.debhelper/scratch-space/build-nano-udeb/nano-udeb_8.4-1_arm64.deb'.
 	Renaming nano-udeb_8.4-1_arm64.deb to nano-udeb_8.4-1_arm64.udeb
@@ -8912,12 +8948,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: including full source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3824761/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/240440 and its subdirectories
-I: Current time: Mon Apr  7 00:40:11 -12 2025
-I: pbuilder-time-stamp: 1744029611
+I: removing directory /srv/workspace/pbuilder/3824761 and its subdirectories
+I: Current time: Mon May 11 09:11:21 +14 2026
+I: pbuilder-time-stamp: 1778440281