Diff of the two buildlogs:

--
--- b1/build.log	2025-03-28 18:03:05.290950237 +0000
+++ b2/build.log	2025-03-28 18:05:13.349181452 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Thu Apr 30 12:20:26 -12 2026
-I: pbuilder-time-stamp: 1777594826
+I: Current time: Sat Mar 29 08:03:08 +14 2025
+I: pbuilder-time-stamp: 1743184988
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -25,52 +25,84 @@
 dpkg-source: info: applying 32b5167940ec817e454431956040734af405a9de.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/2099186/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3719207/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink04-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 Mar 28 18: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/3719207/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3719207/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='trixie'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='12ec29e90b8842b9a3b116198534ac2f'
-  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='2099186'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=c100525a85ff440f8e5b7379091f383f
+  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=3719207
   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.mWtLhiSB/pbuilderrc_zwQo --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.mWtLhiSB/b1 --logfile b1/build.log lbzip2_2.5-4.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.mWtLhiSB/pbuilderrc_fNpc --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.mWtLhiSB/b2 --logfile b2/build.log lbzip2_2.5-4.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 codethink03-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  2025 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/2099186/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Mar  4 11:20 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/3719207/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -139,7 +171,7 @@
 Get: 29 http://deb.debian.org/debian trixie/main arm64 po-debconf all 1.0.21+nmu1 [248 kB]
 Get: 30 http://deb.debian.org/debian trixie/main arm64 debhelper all 13.24.1 [920 kB]
 Get: 31 http://deb.debian.org/debian trixie/main arm64 gnulib all 20250303-1 [92.3 MB]
-Fetched 113 MB in 0s (258 MB/s)
+Fetched 113 MB in 0s (271 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package sensible-utils.
 (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 ... 19920 files and directories currently installed.)
@@ -283,7 +315,11 @@
 fakeroot is already the newest version (1.37.1.1-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/reproducible-path/lbzip2-2.5/ && 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  > ../lbzip2_2.5-4_source.changes
+I: user script /srv/workspace/pbuilder/3719207/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/3719207/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/lbzip2-2.5/ && 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  > ../lbzip2_2.5-4_source.changes
 dpkg-buildpackage: info: source package lbzip2
 dpkg-buildpackage: info: source version 2.5-4
 dpkg-buildpackage: info: source distribution unstable
@@ -1332,7 +1368,7 @@
 checking whether pthread_once works... yes
 checking for pthread_rwlock_init... yes
 checking whether pthread_rwlock_timedrdlock is declared... yes
-checking for reasonable pthread_rwlock wait queue handling... yes
+checking for reasonable pthread_rwlock wait queue handling... no
 checking whether pthread_create exists as a global function... yes
 checking whether pthread_mutex_timedlock is declared... yes
 checking for pthread_mutex_timedlock... yes
@@ -1408,8 +1444,6 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./fcntl.in.h > fcntl.h-t
-mv alloca.h-t alloca.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' \
@@ -1418,6 +1452,9 @@
       -e 's|@''NEXT_FLOAT_H''@|<float.h>|g' \
       -e 's|@''REPLACE_ITOLD''@|0|g' \
       ./float.in.h > float.h-t
+mv alloca.h-t alloca.h
+mv fcntl.h-t fcntl.h
+mv float.h-t float.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' \
@@ -1454,9 +1491,6 @@
       -e 's|@''PRAGMA_COLUMNS''@||g' \
       -e 's|@''NEXT_LIMITS_H''@|<limits.h>|g' \
       ./limits.in.h > limits.h-t
-mv float.h-t float.h
-mv inttypes.h-t inttypes.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_AS_FIRST_DIRECTIVE''@|include_next|g' \
@@ -1543,50 +1577,8 @@
       -e 's|@''HAVE_PTHREAD_JOIN''@|1|g' \
       -e 's|@''HAVE_PTHREAD_EXIT''@|1|g' \
       < ./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 ./c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      ./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''@/1/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''@/0/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 ./c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      ./signal.in.h > signal.h-t
+mv inttypes.h-t inttypes.h
+mv limits.h-t limits.h
 sed \
       -e 's/@''GNULIB_ILOGB''@/0/g' \
       -e 's/@''GNULIB_ILOGBF''@/0/g' \
@@ -1705,8 +1697,51 @@
       -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|1|g' \
       -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|1|g' \
       < pthread.h-t1 > pthread.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 ./c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      ./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''@/1/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''@/0/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 ./c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      ./signal.in.h > signal.h-t
 mv sched.h-t sched.h
-mv signal.h-t signal.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' \
@@ -1719,86 +1754,6 @@
       -e 's|@''HAVE_MAX_ALIGN_T''@|1|g' \
       ./stddef.in.h > stddef.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' \
@@ -1822,8 +1777,8 @@
       -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_RWLOCK_INIT''@|1|g' \
+      -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|1|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' \
@@ -1834,6 +1789,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
 mv stddef.h-t stddef.h
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -1974,67 +1930,6 @@
       -e 's/@''GNULIB_MDA_MKTEMP''@/1/g' \
       -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
       < ./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
-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 ./c++defs.h' \
-      -e '/definition of _Noreturn/r ./_Noreturn.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./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' \
@@ -2088,122 +1983,108 @@
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ./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
-sed \
-      -e 's|@''HAVE__EXIT''@|1|g' \
-      -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
-      -e 's|@''HAVE_ATOLL''@|1|g' \
-      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|1|g' \
-      -e 's|@''HAVE_DECL_ECVT''@|1|g' \
-      -e 's|@''HAVE_DECL_FCVT''@|1|g' \
-      -e 's|@''HAVE_DECL_GCVT''@|1|g' \
-      -e 's|@''HAVE_DECL_GETLOADAVG''@|1|g' \
-      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|1|g' \
-      -e 's|@''HAVE_GETPROGNAME''@|1|g' \
-      -e 's|@''HAVE_GETSUBOPT''@|1|g' \
-      -e 's|@''HAVE_GRANTPT''@|1|g' \
-      -e 's|@''HAVE_INITSTATE''@|1|g' \
-      -e 's|@''HAVE_DECL_INITSTATE''@|1|g' \
-      -e 's|@''HAVE_MBTOWC''@|1|g' \
-      -e 's|@''HAVE_MKDTEMP''@|1|g' \
-      -e 's|@''HAVE_MKOSTEMP''@|1|g' \
-      -e 's|@''HAVE_MKOSTEMPS''@|1|g' \
-      -e 's|@''HAVE_MKSTEMP''@|1|g' \
-      -e 's|@''HAVE_MKSTEMPS''@|1|g' \
-      -e 's|@''HAVE_POSIX_MEMALIGN''@|1|g' \
-      -e 's|@''HAVE_POSIX_OPENPT''@|1|g' \
-      -e 's|@''HAVE_PTSNAME''@|1|g' \
-      -e 's|@''HAVE_PTSNAME_R''@|1|g' \
-      -e 's|@''HAVE_QSORT_R''@|1|g' \
-      -e 's|@''HAVE_RANDOM''@|1|g' \
-      -e 's|@''HAVE_RANDOM_H''@|1|g' \
-      -e 's|@''HAVE_RANDOM_R''@|1|g' \
-      -e 's|@''HAVE_REALLOCARRAY''@|1|g' \
-      -e 's|@''HAVE_REALPATH''@|1|g' \
-      -e 's|@''HAVE_RPMATCH''@|1|g' \
-      -e 's|@''HAVE_SECURE_GETENV''@|1|g' \
-      -e 's|@''HAVE_DECL_SETENV''@|1|g' \
-      -e 's|@''HAVE_SETSTATE''@|1|g' \
-      -e 's|@''HAVE_DECL_SETSTATE''@|1|g' \
-      -e 's|@''HAVE_STRTOD''@|1|g' \
-      -e 's|@''HAVE_STRTOF''@|1|g' \
-      -e 's|@''HAVE_STRTOL''@|1|g' \
-      -e 's|@''HAVE_STRTOLD''@|1|g' \
-      -e 's|@''HAVE_STRTOLL''@|1|g' \
-      -e 's|@''HAVE_STRTOUL''@|1|g' \
-      -e 's|@''HAVE_STRTOULL''@|1|g' \
-      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|1|g' \
-      -e 's|@''HAVE_SYS_LOADAVG_H''@|0|g' \
-      -e 's|@''HAVE_UNLOCKPT''@|1|g' \
-      -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
-      < stdlib.h-t1 > stdlib.h-t2
+      -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 ./c++defs.h' \
+      -e '/definition of _Noreturn/r ./_Noreturn.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      < pthread.h-t3 > pthread.h-t4
 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
+      -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|@''HAVE_EXPLICIT_BZERO''@|1|g' \
       -e 's|@''HAVE_FFSL''@|1|g' \
@@ -2256,6 +2137,95 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       < string.h-t1 > string.h-t2
+/usr/bin/mkdir -p 'sys'
+sed \
+      -e 's|@''HAVE__EXIT''@|1|g' \
+      -e 's|@''HAVE_ALIGNED_ALLOC''@|1|g' \
+      -e 's|@''HAVE_ATOLL''@|1|g' \
+      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|1|g' \
+      -e 's|@''HAVE_DECL_ECVT''@|1|g' \
+      -e 's|@''HAVE_DECL_FCVT''@|1|g' \
+      -e 's|@''HAVE_DECL_GCVT''@|1|g' \
+      -e 's|@''HAVE_DECL_GETLOADAVG''@|1|g' \
+      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|1|g' \
+      -e 's|@''HAVE_GETPROGNAME''@|1|g' \
+      -e 's|@''HAVE_GETSUBOPT''@|1|g' \
+      -e 's|@''HAVE_GRANTPT''@|1|g' \
+      -e 's|@''HAVE_INITSTATE''@|1|g' \
+      -e 's|@''HAVE_DECL_INITSTATE''@|1|g' \
+      -e 's|@''HAVE_MBTOWC''@|1|g' \
+      -e 's|@''HAVE_MKDTEMP''@|1|g' \
+      -e 's|@''HAVE_MKOSTEMP''@|1|g' \
+      -e 's|@''HAVE_MKOSTEMPS''@|1|g' \
+      -e 's|@''HAVE_MKSTEMP''@|1|g' \
+      -e 's|@''HAVE_MKSTEMPS''@|1|g' \
+      -e 's|@''HAVE_POSIX_MEMALIGN''@|1|g' \
+      -e 's|@''HAVE_POSIX_OPENPT''@|1|g' \
+      -e 's|@''HAVE_PTSNAME''@|1|g' \
+      -e 's|@''HAVE_PTSNAME_R''@|1|g' \
+      -e 's|@''HAVE_QSORT_R''@|1|g' \
+      -e 's|@''HAVE_RANDOM''@|1|g' \
+      -e 's|@''HAVE_RANDOM_H''@|1|g' \
+      -e 's|@''HAVE_RANDOM_R''@|1|g' \
+      -e 's|@''HAVE_REALLOCARRAY''@|1|g' \
+      -e 's|@''HAVE_REALPATH''@|1|g' \
+      -e 's|@''HAVE_RPMATCH''@|1|g' \
+      -e 's|@''HAVE_SECURE_GETENV''@|1|g' \
+      -e 's|@''HAVE_DECL_SETENV''@|1|g' \
+      -e 's|@''HAVE_SETSTATE''@|1|g' \
+      -e 's|@''HAVE_DECL_SETSTATE''@|1|g' \
+      -e 's|@''HAVE_STRTOD''@|1|g' \
+      -e 's|@''HAVE_STRTOF''@|1|g' \
+      -e 's|@''HAVE_STRTOL''@|1|g' \
+      -e 's|@''HAVE_STRTOLD''@|1|g' \
+      -e 's|@''HAVE_STRTOLL''@|1|g' \
+      -e 's|@''HAVE_STRTOUL''@|1|g' \
+      -e 's|@''HAVE_STRTOULL''@|1|g' \
+      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|1|g' \
+      -e 's|@''HAVE_SYS_LOADAVG_H''@|0|g' \
+      -e 's|@''HAVE_UNLOCKPT''@|1|g' \
+      -e 's|@''HAVE_DECL_UNSETENV''@|1|g' \
+      < stdlib.h-t1 > stdlib.h-t2
+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
+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|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_SYS_SELECT_H''@|<sys/select.h>|g' \
+      -e 's|@''HAVE_SYS_SELECT_H''@|1|g' \
+      -e 's/@''GNULIB_PSELECT''@/1/g' \
+      -e 's/@''GNULIB_SELECT''@/1/g' \
+      -e 's|@''HAVE_WINSOCK2_H''@|0|g' \
+      -e 's|@''HAVE_PSELECT''@|1|g' \
+      -e 's|@''REPLACE_PSELECT''@|0|g' \
+      -e 's|@''REPLACE_SELECT''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      ./sys_select.in.h > sys/select.h-t
+mv pthread.h-t4 pthread.h
+rm -f string.h-t1
 sed \
       -e 's|@''REPLACE_DPRINTF''@|0|g' \
       -e 's|@''REPLACE_FCLOSE''@|0|g' \
@@ -2344,84 +2314,97 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       < stdlib.h-t2 > stdlib.h-t3
+mv sys/select.h-t sys/select.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 ./c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      < math.h-t5 > math.h-t6
-mv pthread.h-t4 pthread.h
-rm -f string.h-t1
-rm -f stdio.h-t1 stdio.h-t2
-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
+      -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
 mv string.h-t2 string.h
+rm -f stdio.h-t1 stdio.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
 mv stdio.h-t3 stdio.h
-mv stdlib.h-t3 stdlib.h
-mv math.h-t6 math.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' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_SELECT_H''@|<sys/select.h>|g' \
-      -e 's|@''HAVE_SYS_SELECT_H''@|1|g' \
-      -e 's/@''GNULIB_PSELECT''@/1/g' \
-      -e 's/@''GNULIB_SELECT''@/1/g' \
-      -e 's|@''HAVE_WINSOCK2_H''@|0|g' \
-      -e 's|@''HAVE_PSELECT''@|1|g' \
-      -e 's|@''REPLACE_PSELECT''@|0|g' \
-      -e 's|@''REPLACE_SELECT''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      ./sys_select.in.h > sys/select.h-t
-/usr/bin/mkdir -p 'sys'
-mv sys/select.h-t sys/select.h
+rm -f stdlib.h-t1 stdlib.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' \
@@ -2455,6 +2438,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_socket.in.h > sys/socket.h-t
+mv stdlib.h-t3 stdlib.h
+/usr/bin/mkdir -p 'sys'
 /usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -2513,9 +2498,57 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_stat.in.h > sys/stat.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 ./c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      < math.h-t5 > math.h-t6
 mv sys/socket.h-t sys/socket.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' \
@@ -2534,7 +2567,6 @@
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_time.in.h > sys/time.h-t
 /usr/bin/mkdir -p 'sys'
-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' \
       -e 's|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2545,16 +2577,12 @@
       -e 's|@''HAVE_OFF64_T''@|1|g' \
       -e 's|@''WINDOWS_STAT_INODES''@|0|g' \
       ./sys_types.in.h > sys/types.h-t
-/usr/bin/mkdir -p 'sys'
+mv sys/stat.h-t sys/stat.h
+mv sys/time.h-t sys/time.h
+rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
 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' \
-      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
-      -e 's|@''PRAGMA_COLUMNS''@||g' \
-      -e 's|@''NEXT_SYS_UIO_H''@|<sys/uio.h>|g' \
-      -e 's|@''HAVE_SYS_UIO_H''@|1|g' \
-      ./sys_uio.in.h > sys/uio.h-t
+mv math.h-t6 math.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' \
@@ -2607,7 +2635,14 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./time.in.h > time.h-t
-mv sys/uio.h-t sys/uio.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_SYS_UIO_H''@|<sys/uio.h>|g' \
+      -e 's|@''HAVE_SYS_UIO_H''@|1|g' \
+      ./sys_uio.in.h > sys/uio.h-t
 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' \
@@ -2640,7 +2675,6 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ./unistd.in.h > unistd.h-t1
-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_UTIME_H''@/1/g' \
@@ -2656,6 +2690,64 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./utime.in.h > utime.h-t
+mv sys/uio.h-t sys/uio.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|@''HAVE_FEATURES_H''@|1|g' \
+      -e 's|@''NEXT_WCHAR_H''@|<wchar.h>|g' \
+      -e 's|@''HAVE_WCHAR_H''@|1|g' \
+      -e 's/@''HAVE_CRTDEFS_H''@/0/g' \
+      -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/0/g' \
+      -e 's/@''GNULIB_BTOWC''@/0/g' \
+      -e 's/@''GNULIB_WCTOB''@/0/g' \
+      -e 's/@''GNULIB_MBSINIT''@/0/g' \
+      -e 's/@''GNULIB_MBSZERO''@/1/g' \
+      -e 's/@''GNULIB_MBRTOWC''@/0/g' \
+      -e 's/@''GNULIB_MBRLEN''@/0/g' \
+      -e 's/@''GNULIB_MBSRTOWCS''@/0/g' \
+      -e 's/@''GNULIB_MBSNRTOWCS''@/0/g' \
+      -e 's/@''GNULIB_WCRTOMB''@/0/g' \
+      -e 's/@''GNULIB_WCSRTOMBS''@/0/g' \
+      -e 's/@''GNULIB_WCSNRTOMBS''@/0/g' \
+      -e 's/@''GNULIB_WCWIDTH''@/0/g' \
+      -e 's/@''GNULIB_WMEMCHR''@/0/g' \
+      -e 's/@''GNULIB_WMEMCMP''@/0/g' \
+      -e 's/@''GNULIB_WMEMCPY''@/0/g' \
+      -e 's/@''GNULIB_WMEMMOVE''@/0/g' \
+      -e 's/@''GNULIB_WMEMPCPY''@/0/g' \
+      -e 's/@''GNULIB_WMEMSET''@/0/g' \
+      -e 's/@''GNULIB_WCSLEN''@/0/g' \
+      -e 's/@''GNULIB_WCSNLEN''@/0/g' \
+      -e 's/@''GNULIB_WCSCPY''@/0/g' \
+      -e 's/@''GNULIB_WCPCPY''@/0/g' \
+      -e 's/@''GNULIB_WCSNCPY''@/0/g' \
+      -e 's/@''GNULIB_WCPNCPY''@/0/g' \
+      -e 's/@''GNULIB_WCSCAT''@/0/g' \
+      -e 's/@''GNULIB_WCSNCAT''@/0/g' \
+      -e 's/@''GNULIB_WCSCMP''@/0/g' \
+      -e 's/@''GNULIB_WCSNCMP''@/0/g' \
+      -e 's/@''GNULIB_WCSCASECMP''@/0/g' \
+      -e 's/@''GNULIB_WCSNCASECMP''@/0/g' \
+      -e 's/@''GNULIB_WCSCOLL''@/0/g' \
+      -e 's/@''GNULIB_WCSXFRM''@/0/g' \
+      -e 's/@''GNULIB_WCSDUP''@/0/g' \
+      -e 's/@''GNULIB_WCSCHR''@/0/g' \
+      -e 's/@''GNULIB_WCSRCHR''@/0/g' \
+      -e 's/@''GNULIB_WCSCSPN''@/0/g' \
+      -e 's/@''GNULIB_WCSSPN''@/0/g' \
+      -e 's/@''GNULIB_WCSPBRK''@/0/g' \
+      -e 's/@''GNULIB_WCSSTR''@/0/g' \
+      -e 's/@''GNULIB_WCSTOK''@/0/g' \
+      -e 's/@''GNULIB_WCSWIDTH''@/0/g' \
+      -e 's/@''GNULIB_WCSFTIME''@/0/g' \
+      -e 's/@''GNULIB_WGETCWD''@/0/g' \
+      -e 's/@''GNULIB_MDA_WCSDUP''@/1/g' \
+      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
+      < ./wchar.in.h > wchar.h-t1
+mv time.h-t time.h
 sed \
       -e 's/@''GNULIB_GETCWD''@/0/g' \
       -e 's/@''GNULIB_GETDOMAINNAME''@/0/g' \
@@ -2719,64 +2811,53 @@
       -e 's/@''GNULIB_MDA_UNLINK''@/1/g' \
       -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 \
-      -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|@''HAVE_FEATURES_H''@|1|g' \
-      -e 's|@''NEXT_WCHAR_H''@|<wchar.h>|g' \
-      -e 's|@''HAVE_WCHAR_H''@|1|g' \
-      -e 's/@''HAVE_CRTDEFS_H''@/0/g' \
-      -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/0/g' \
-      -e 's/@''GNULIB_BTOWC''@/0/g' \
-      -e 's/@''GNULIB_WCTOB''@/0/g' \
-      -e 's/@''GNULIB_MBSINIT''@/0/g' \
-      -e 's/@''GNULIB_MBSZERO''@/1/g' \
-      -e 's/@''GNULIB_MBRTOWC''@/0/g' \
-      -e 's/@''GNULIB_MBRLEN''@/0/g' \
-      -e 's/@''GNULIB_MBSRTOWCS''@/0/g' \
-      -e 's/@''GNULIB_MBSNRTOWCS''@/0/g' \
-      -e 's/@''GNULIB_WCRTOMB''@/0/g' \
-      -e 's/@''GNULIB_WCSRTOMBS''@/0/g' \
-      -e 's/@''GNULIB_WCSNRTOMBS''@/0/g' \
-      -e 's/@''GNULIB_WCWIDTH''@/0/g' \
-      -e 's/@''GNULIB_WMEMCHR''@/0/g' \
-      -e 's/@''GNULIB_WMEMCMP''@/0/g' \
-      -e 's/@''GNULIB_WMEMCPY''@/0/g' \
-      -e 's/@''GNULIB_WMEMMOVE''@/0/g' \
-      -e 's/@''GNULIB_WMEMPCPY''@/0/g' \
-      -e 's/@''GNULIB_WMEMSET''@/0/g' \
-      -e 's/@''GNULIB_WCSLEN''@/0/g' \
-      -e 's/@''GNULIB_WCSNLEN''@/0/g' \
-      -e 's/@''GNULIB_WCSCPY''@/0/g' \
-      -e 's/@''GNULIB_WCPCPY''@/0/g' \
-      -e 's/@''GNULIB_WCSNCPY''@/0/g' \
-      -e 's/@''GNULIB_WCPNCPY''@/0/g' \
-      -e 's/@''GNULIB_WCSCAT''@/0/g' \
-      -e 's/@''GNULIB_WCSNCAT''@/0/g' \
-      -e 's/@''GNULIB_WCSCMP''@/0/g' \
-      -e 's/@''GNULIB_WCSNCMP''@/0/g' \
-      -e 's/@''GNULIB_WCSCASECMP''@/0/g' \
-      -e 's/@''GNULIB_WCSNCASECMP''@/0/g' \
-      -e 's/@''GNULIB_WCSCOLL''@/0/g' \
-      -e 's/@''GNULIB_WCSXFRM''@/0/g' \
-      -e 's/@''GNULIB_WCSDUP''@/0/g' \
-      -e 's/@''GNULIB_WCSCHR''@/0/g' \
-      -e 's/@''GNULIB_WCSRCHR''@/0/g' \
-      -e 's/@''GNULIB_WCSCSPN''@/0/g' \
-      -e 's/@''GNULIB_WCSSPN''@/0/g' \
-      -e 's/@''GNULIB_WCSPBRK''@/0/g' \
-      -e 's/@''GNULIB_WCSSTR''@/0/g' \
-      -e 's/@''GNULIB_WCSTOK''@/0/g' \
-      -e 's/@''GNULIB_WCSWIDTH''@/0/g' \
-      -e 's/@''GNULIB_WCSFTIME''@/0/g' \
-      -e 's/@''GNULIB_WGETCWD''@/0/g' \
-      -e 's/@''GNULIB_MDA_WCSDUP''@/1/g' \
-      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
-      < ./wchar.in.h > wchar.h-t1
 mv utime.h-t utime.h
 sed \
+      -e 's|@''HAVE_WINT_T''@|1|g' \
+      -e 's|@''HAVE_BTOWC''@|1|g' \
+      -e 's|@''HAVE_MBSINIT''@|1|g' \
+      -e 's|@''HAVE_MBRTOWC''@|1|g' \
+      -e 's|@''HAVE_MBRLEN''@|1|g' \
+      -e 's|@''HAVE_MBSRTOWCS''@|1|g' \
+      -e 's|@''HAVE_MBSNRTOWCS''@|1|g' \
+      -e 's|@''HAVE_WCRTOMB''@|1|g' \
+      -e 's|@''HAVE_WCSRTOMBS''@|1|g' \
+      -e 's|@''HAVE_WCSNRTOMBS''@|1|g' \
+      -e 's|@''HAVE_WMEMCHR''@|1|g' \
+      -e 's|@''HAVE_WMEMCMP''@|1|g' \
+      -e 's|@''HAVE_WMEMCPY''@|1|g' \
+      -e 's|@''HAVE_WMEMMOVE''@|1|g' \
+      -e 's|@''HAVE_WMEMPCPY''@|1|g' \
+      -e 's|@''HAVE_WMEMSET''@|1|g' \
+      -e 's|@''HAVE_WCSLEN''@|1|g' \
+      -e 's|@''HAVE_WCSNLEN''@|1|g' \
+      -e 's|@''HAVE_WCSCPY''@|1|g' \
+      -e 's|@''HAVE_WCPCPY''@|1|g' \
+      -e 's|@''HAVE_WCSNCPY''@|1|g' \
+      -e 's|@''HAVE_WCPNCPY''@|1|g' \
+      -e 's|@''HAVE_WCSCAT''@|1|g' \
+      -e 's|@''HAVE_WCSNCAT''@|1|g' \
+      -e 's|@''HAVE_WCSCMP''@|1|g' \
+      -e 's|@''HAVE_WCSNCMP''@|1|g' \
+      -e 's|@''HAVE_WCSCASECMP''@|1|g' \
+      -e 's|@''HAVE_WCSNCASECMP''@|1|g' \
+      -e 's|@''HAVE_WCSCOLL''@|1|g' \
+      -e 's|@''HAVE_WCSXFRM''@|1|g' \
+      -e 's|@''HAVE_WCSDUP''@|1|g' \
+      -e 's|@''HAVE_WCSCHR''@|1|g' \
+      -e 's|@''HAVE_WCSRCHR''@|1|g' \
+      -e 's|@''HAVE_WCSCSPN''@|1|g' \
+      -e 's|@''HAVE_WCSSPN''@|1|g' \
+      -e 's|@''HAVE_WCSPBRK''@|1|g' \
+      -e 's|@''HAVE_WCSSTR''@|1|g' \
+      -e 's|@''HAVE_WCSTOK''@|1|g' \
+      -e 's|@''HAVE_WCSWIDTH''@|1|g' \
+      -e 's|@''HAVE_WCSFTIME''@|1|g' \
+      -e 's|@''HAVE_DECL_WCTOB''@|1|g' \
+      -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
+      -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
+      < wchar.h-t1 > wchar.h-t2
+sed \
       -e 's|@''HAVE_CHOWN''@|1|g' \
       -e 's|@''HAVE_COPY_FILE_RANGE''@|1|g' \
       -e 's|@''HAVE_DUP3''@|1|g' \
@@ -2826,50 +2907,32 @@
       -e 's|@''HAVE_SYS_PARAM_H''@|0|g' \
       < unistd.h-t2 > unistd.h-t3
 sed \
-      -e 's|@''HAVE_WINT_T''@|1|g' \
-      -e 's|@''HAVE_BTOWC''@|1|g' \
-      -e 's|@''HAVE_MBSINIT''@|1|g' \
-      -e 's|@''HAVE_MBRTOWC''@|1|g' \
-      -e 's|@''HAVE_MBRLEN''@|1|g' \
-      -e 's|@''HAVE_MBSRTOWCS''@|1|g' \
-      -e 's|@''HAVE_MBSNRTOWCS''@|1|g' \
-      -e 's|@''HAVE_WCRTOMB''@|1|g' \
-      -e 's|@''HAVE_WCSRTOMBS''@|1|g' \
-      -e 's|@''HAVE_WCSNRTOMBS''@|1|g' \
-      -e 's|@''HAVE_WMEMCHR''@|1|g' \
-      -e 's|@''HAVE_WMEMCMP''@|1|g' \
-      -e 's|@''HAVE_WMEMCPY''@|1|g' \
-      -e 's|@''HAVE_WMEMMOVE''@|1|g' \
-      -e 's|@''HAVE_WMEMPCPY''@|1|g' \
-      -e 's|@''HAVE_WMEMSET''@|1|g' \
-      -e 's|@''HAVE_WCSLEN''@|1|g' \
-      -e 's|@''HAVE_WCSNLEN''@|1|g' \
-      -e 's|@''HAVE_WCSCPY''@|1|g' \
-      -e 's|@''HAVE_WCPCPY''@|1|g' \
-      -e 's|@''HAVE_WCSNCPY''@|1|g' \
-      -e 's|@''HAVE_WCPNCPY''@|1|g' \
-      -e 's|@''HAVE_WCSCAT''@|1|g' \
-      -e 's|@''HAVE_WCSNCAT''@|1|g' \
-      -e 's|@''HAVE_WCSCMP''@|1|g' \
-      -e 's|@''HAVE_WCSNCMP''@|1|g' \
-      -e 's|@''HAVE_WCSCASECMP''@|1|g' \
-      -e 's|@''HAVE_WCSNCASECMP''@|1|g' \
-      -e 's|@''HAVE_WCSCOLL''@|1|g' \
-      -e 's|@''HAVE_WCSXFRM''@|1|g' \
-      -e 's|@''HAVE_WCSDUP''@|1|g' \
-      -e 's|@''HAVE_WCSCHR''@|1|g' \
-      -e 's|@''HAVE_WCSRCHR''@|1|g' \
-      -e 's|@''HAVE_WCSCSPN''@|1|g' \
-      -e 's|@''HAVE_WCSSPN''@|1|g' \
-      -e 's|@''HAVE_WCSPBRK''@|1|g' \
-      -e 's|@''HAVE_WCSSTR''@|1|g' \
-      -e 's|@''HAVE_WCSTOK''@|1|g' \
-      -e 's|@''HAVE_WCSWIDTH''@|1|g' \
-      -e 's|@''HAVE_WCSFTIME''@|1|g' \
-      -e 's|@''HAVE_DECL_WCTOB''@|1|g' \
-      -e 's|@''HAVE_DECL_WCSDUP''@|1|g' \
-      -e 's|@''HAVE_DECL_WCWIDTH''@|1|g' \
-      < wchar.h-t1 > wchar.h-t2
+      -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
+      -e 's|@''REPLACE_BTOWC''@|0|g' \
+      -e 's|@''REPLACE_WCTOB''@|0|g' \
+      -e 's|@''REPLACE_FREE''@|0|g' \
+      -e 's|@''REPLACE_MBSINIT''@|0|g' \
+      -e 's|@''REPLACE_MBRTOWC''@|0|g' \
+      -e 's|@''REPLACE_MBRLEN''@|0|g' \
+      -e 's|@''REPLACE_MBSRTOWCS''@|0|g' \
+      -e 's|@''REPLACE_MBSNRTOWCS''@|0|g' \
+      -e 's|@''REPLACE_WCRTOMB''@|0|g' \
+      -e 's|@''REPLACE_WCSRTOMBS''@|0|g' \
+      -e 's|@''REPLACE_WCSNRTOMBS''@|0|g' \
+      -e 's|@''REPLACE_WCWIDTH''@|0|g' \
+      -e 's|@''REPLACE_WCSWIDTH''@|0|g' \
+      -e 's|@''REPLACE_WCSFTIME''@|0|g' \
+      -e 's|@''REPLACE_WCSCMP''@|0|g' \
+      -e 's|@''REPLACE_WCSNCAT''@|0|g' \
+      -e 's|@''REPLACE_WCSNCMP''@|0|g' \
+      -e 's|@''REPLACE_WCSSTR''@|0|g' \
+      -e 's|@''REPLACE_WCSTOK''@|0|g' \
+      -e 's|@''REPLACE_WMEMCMP''@|0|g' \
+      -e 's|@''REPLACE_WMEMPCPY''@|0|g' \
+      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
+      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
+      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
+      < wchar.h-t2 > wchar.h-t3
 sed \
       -e 's|@''REPLACE_ACCESS''@|0|g' \
       -e 's|@''REPLACE_CHOWN''@|0|g' \
@@ -2929,37 +2992,10 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       < unistd.h-t3 > unistd.h-t4
-sed \
-      -e 's|@''REPLACE_MBSTATE_T''@|0|g' \
-      -e 's|@''REPLACE_BTOWC''@|0|g' \
-      -e 's|@''REPLACE_WCTOB''@|0|g' \
-      -e 's|@''REPLACE_FREE''@|0|g' \
-      -e 's|@''REPLACE_MBSINIT''@|0|g' \
-      -e 's|@''REPLACE_MBRTOWC''@|0|g' \
-      -e 's|@''REPLACE_MBRLEN''@|0|g' \
-      -e 's|@''REPLACE_MBSRTOWCS''@|0|g' \
-      -e 's|@''REPLACE_MBSNRTOWCS''@|0|g' \
-      -e 's|@''REPLACE_WCRTOMB''@|0|g' \
-      -e 's|@''REPLACE_WCSRTOMBS''@|0|g' \
-      -e 's|@''REPLACE_WCSNRTOMBS''@|0|g' \
-      -e 's|@''REPLACE_WCWIDTH''@|0|g' \
-      -e 's|@''REPLACE_WCSWIDTH''@|0|g' \
-      -e 's|@''REPLACE_WCSFTIME''@|0|g' \
-      -e 's|@''REPLACE_WCSCMP''@|0|g' \
-      -e 's|@''REPLACE_WCSNCAT''@|0|g' \
-      -e 's|@''REPLACE_WCSNCMP''@|0|g' \
-      -e 's|@''REPLACE_WCSSTR''@|0|g' \
-      -e 's|@''REPLACE_WCSTOK''@|0|g' \
-      -e 's|@''REPLACE_WMEMCMP''@|0|g' \
-      -e 's|@''REPLACE_WMEMPCPY''@|0|g' \
-      -e '/definitions of _GL_FUNCDECL_RPL/r ./c++defs.h' \
-      -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
-      -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
-      < wchar.h-t2 > wchar.h-t3
-rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
 rm -f wchar.h-t1 wchar.h-t2
-mv unistd.h-t4 unistd.h
 mv wchar.h-t3 wchar.h
+rm -f unistd.h-t1 unistd.h-t2 unistd.h-t3
+mv unistd.h-t4 unistd.h
 make  all-recursive
 make[3]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
 make[4]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -2975,6 +3011,7 @@
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-nanosleep.o `test -f 'nanosleep.c' || echo './'`nanosleep.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-printf-frexp.o `test -f 'printf-frexp.c' || echo './'`printf-frexp.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-printf-frexpl.o `test -f 'printf-frexpl.c' || echo './'`printf-frexpl.c
+gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-pthread-rwlock.o `test -f 'pthread-rwlock.c' || echo './'`pthread-rwlock.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-realloc.o `test -f 'realloc.c' || echo './'`realloc.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-reallocarray.o `test -f 'reallocarray.c' || echo './'`reallocarray.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-sockets.o `test -f 'sockets.c' || echo './'`sockets.c
@@ -2995,7 +3032,7 @@
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o libgnu_a-vasnprintf.o `test -f 'vasnprintf.c' || echo './'`vasnprintf.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -D_FORTIFY_SOURCE=2  -Wno-cast-qual -Wno-conversion -Wno-float-equal -Wno-sign-compare -Wno-undef -Wno-unused-function -Wno-unused-parameter -Wno-float-conversion -Wimplicit-fallthrough -Wno-pedantic -Wno-sign-conversion -Wno-type-limits -Wno-unused-const-variable -Wno-unsuffixed-float-constants -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/lbzip2-2.5=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -c -o glthread/libgnu_a-threadlib.o `test -f 'glthread/threadlib.c' || echo './'`glthread/threadlib.c
 rm -f libgnu.a
-ar cr libgnu.a libgnu_a-dtotimespec.o  libgnu_a-fd-hook.o libgnu_a-float.o   libgnu_a-fseterr.o  libgnu_a-gettime.o  libgnu_a-ialloc.o  libgnu_a-malloca.o libgnu_a-math.o libgnu_a-mbszero.o    libgnu_a-nanosleep.o libgnu_a-printf-frexp.o libgnu_a-printf-frexpl.o            libgnu_a-realloc.o libgnu_a-reallocarray.o    libgnu_a-sockets.o  libgnu_a-stat-time.o   libgnu_a-stdlib.o libgnu_a-sys_socket.o glthread/libgnu_a-threadlib.o libgnu_a-timespec.o libgnu_a-timespec-add.o libgnu_a-timespec-sub.o libgnu_a-unistd.o  libgnu_a-utimens.o libgnu_a-vfzprintf.o         libgnu_a-xmalloc.o libgnu_a-xsize.o libgnu_a-asnprintf.o libgnu_a-printf-args.o libgnu_a-printf-parse.o libgnu_a-vasnprintf.o 
+ar cr libgnu.a libgnu_a-dtotimespec.o  libgnu_a-fd-hook.o libgnu_a-float.o   libgnu_a-fseterr.o  libgnu_a-gettime.o  libgnu_a-ialloc.o  libgnu_a-malloca.o libgnu_a-math.o libgnu_a-mbszero.o    libgnu_a-nanosleep.o libgnu_a-printf-frexp.o libgnu_a-printf-frexpl.o     libgnu_a-pthread-rwlock.o       libgnu_a-realloc.o libgnu_a-reallocarray.o    libgnu_a-sockets.o  libgnu_a-stat-time.o   libgnu_a-stdlib.o libgnu_a-sys_socket.o glthread/libgnu_a-threadlib.o libgnu_a-timespec.o libgnu_a-timespec-add.o libgnu_a-timespec-sub.o libgnu_a-unistd.o  libgnu_a-utimens.o libgnu_a-vfzprintf.o         libgnu_a-xmalloc.o libgnu_a-xsize.o libgnu_a-asnprintf.o libgnu_a-printf-args.o libgnu_a-printf-parse.o libgnu_a-vasnprintf.o 
 ranlib libgnu.a
 make[4]: Leaving directory '/build/reproducible-path/lbzip2-2.5/lib'
 make[3]: Leaving directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -3058,23 +3095,23 @@
 make[3]: Entering directory '/build/reproducible-path/lbzip2-2.5/tests'
 make[4]: Entering directory '/build/reproducible-path/lbzip2-2.5/tests'
 PASS: codelen20.bz2
-PASS: crc1.bz2
 PASS: 32767.bz2
 PASS: cve2.bz2
-PASS: cve.bz2
+PASS: crc1.bz2
 PASS: concat.bz2
-PASS: crc2.bz2
-PASS: empty.bz2
-PASS: incomp-1.bz2
 PASS: gap.bz2
-PASS: overrun.bz2
+PASS: incomp-1.bz2
+PASS: cve.bz2
+PASS: empty.bz2
+PASS: crc2.bz2
 PASS: load0.bz2
-PASS: overrun2.bz2
 PASS: incomp-2.bz2
-PASS: void.bz2
+PASS: overrun2.bz2
 PASS: rand.bz2
-PASS: trash.bz2
+PASS: void.bz2
+PASS: overrun.bz2
 PASS: repet.bz2
+PASS: trash.bz2
 PASS: fib.bz2
 PASS: ch255.bz2
 ============================================================================
@@ -3165,8 +3202,8 @@
    dh_gencontrol
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'lbzip2' in '../lbzip2_2.5-4_arm64.deb'.
 dpkg-deb: building package 'lbzip2-dbgsym' in '../lbzip2-dbgsym_2.5-4_arm64.deb'.
+dpkg-deb: building package 'lbzip2' in '../lbzip2_2.5-4_arm64.deb'.
  dpkg-genbuildinfo --build=binary -O../lbzip2_2.5-4_arm64.buildinfo
  dpkg-genchanges --build=binary -O../lbzip2_2.5-4_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -3174,12 +3211,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/3719207/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3719207/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/2099186 and its subdirectories
-I: Current time: Thu Apr 30 12:26:03 -12 2026
-I: pbuilder-time-stamp: 1777595163
+I: removing directory /srv/workspace/pbuilder/3719207 and its subdirectories
+I: Current time: Sat Mar 29 08:05:12 +14 2025
+I: pbuilder-time-stamp: 1743185112