Diff of the two buildlogs:

--
--- b1/build.log	2025-01-20 19:35:09.679910086 +0000
+++ b2/build.log	2025-01-20 19:38:54.605776754 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Mon Jan 20 07:30:45 -12 2025
-I: pbuilder-time-stamp: 1737401445
+I: Current time: Tue Jan 21 09:35:19 +14 2025
+I: pbuilder-time-stamp: 1737401719
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/unstable-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/21532/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/7492/tmp/hooks/D01_modify_environment starting
+debug: Running on virt64b.
+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 Jan 20 19:35 /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/7492/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/7492/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='armhf'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 '
-  DISTRIBUTION='unstable'
-  HOME='/root'
-  HOST_ARCH='armhf'
+  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]="arm-unknown-linux-gnueabihf")
+  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=armhf
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 '
+  DIRSTACK=()
+  DISTRIBUTION=unstable
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='53124d75f7b943a681a66b73843509f0'
-  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='21532'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=68834b2eeba74c48a6f8ac97a4a3c963
+  LANG=C
+  LANGUAGE=it_CH:it
+  LC_ALL=C
+  MACHTYPE=arm-unknown-linux-gnueabihf
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnueabihf
+  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=7492
   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.hWTJdbs7/pbuilderrc_ntzg --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.hWTJdbs7/b1 --logfile b1/build.log lbzip2_2.5-4.dsc'
-  SUDO_GID='112'
-  SUDO_UID='106'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://10.0.0.15:3142/'
+  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.hWTJdbs7/pbuilderrc_YihQ --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.hWTJdbs7/b2 --logfile b2/build.log lbzip2_2.5-4.dsc'
+  SUDO_GID=113
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://10.0.0.15:3142/
 I: uname -a
-  Linux virt32b 6.1.0-30-armmp-lpae #1 SMP Debian 6.1.124-1 (2025-01-12) armv7l GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-30-arm64 #1 SMP Debian 6.1.124-1 (2025-01-12) aarch64 GNU/Linux
 I: ls -l /bin
   lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/21532/tmp/hooks/D02_print_environment finished
+I: user script /srv/workspace/pbuilder/7492/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 unstable/main armhf po-debconf all 1.0.21+nmu1 [248 kB]
 Get: 30 http://deb.debian.org/debian unstable/main armhf debhelper all 13.24.1 [920 kB]
 Get: 31 http://deb.debian.org/debian unstable/main armhf gnulib all 20250102-1 [82.5 MB]
-Fetched 102 MB in 7s (14.3 MB/s)
+Fetched 102 MB in 1s (70.3 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 ... 19564 files and directories currently installed.)
@@ -283,7 +315,11 @@
 fakeroot is already the newest version (1.36.2-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/7492/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for unstable
+I: user script /srv/workspace/pbuilder/7492/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
@@ -1376,7 +1412,7 @@
 config.status: creating lib/config.h
 config.status: executing depfiles commands
    dh_auto_build
-	make -j3
+	make -j4
 make[1]: Entering directory '/build/reproducible-path/lbzip2-2.5'
 Making all in lib
 make[2]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -1414,9 +1450,6 @@
       -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 float.h-t float.h
-mv fcntl.h-t fcntl.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' \
@@ -1446,6 +1479,7 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./inttypes.in.h > inttypes.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|@''INCLUDE_NEXT''@|include_next|g' \
@@ -1453,6 +1487,7 @@
       -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
 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' \
@@ -1507,7 +1542,9 @@
       -e 's/@''GNULIB_HYPOTF''@/0/g' \
       -e 's/@''GNULIB_HYPOTL''@/0/g' \
       < ./math.in.h > math.h-t1
+mv fcntl.h-t fcntl.h
 mv limits.h-t limits.h
+mv inttypes.h-t inttypes.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' \
@@ -1540,7 +1577,6 @@
       -e 's|@''HAVE_PTHREAD_JOIN''@|1|g' \
       -e 's|@''HAVE_PTHREAD_EXIT''@|1|g' \
       < ./pthread.in.h > pthread.h-t1
-mv inttypes.h-t inttypes.h
 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' \
@@ -1556,7 +1592,6 @@
       -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
-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' \
@@ -1586,6 +1621,99 @@
       -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
+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' \
+      ./stddef.in.h > stddef.h-t
+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' \
+      -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''@/1/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''@/0/g' \
+      -e 's/@''GNULIB_GETLINE''@/0/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''@/0/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''@/1/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''@/0/g' \
+      -e 's/@''GNULIB_VSNZPRINTF''@/0/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' \
+      < ./stdio.in.h > stdio.h-t1
+mv stddef.h-t stddef.h
 sed \
       -e 's|@''HAVE_PTHREAD_ONCE''@|1|g' \
       -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|1|g' \
@@ -1629,6 +1757,66 @@
       -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|@''INCLUDE_NEXT''@|include_next|g' \
+      -e 's|@''PRAGMA_SYSTEM_HEADER''@|#pragma GCC system_header|g' \
+      -e 's|@''PRAGMA_COLUMNS''@||g' \
+      -e 's|@''NEXT_STDLIB_H''@|<stdlib.h>|g' \
+      -e 's/@''GNULIB__EXIT''@/0/g' \
+      -e 's/@''GNULIB_ABORT_DEBUG''@/0/g' \
+      -e 's/@''GNULIB_ALIGNED_ALLOC''@/0/g' \
+      -e 's/@''GNULIB_ATOLL''@/0/g' \
+      -e 's/@''GNULIB_CALLOC_GNU''@/1/g' \
+      -e 's/@''GNULIB_CALLOC_POSIX''@/1/g' \
+      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/0/g' \
+      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
+      -e 's/@''GNULIB_GETLOADAVG''@/0/g' \
+      -e 's/@''GNULIB_GETPROGNAME''@/0/g' \
+      -e 's/@''GNULIB_GETSUBOPT''@/0/g' \
+      -e 's/@''GNULIB_GRANTPT''@/0/g' \
+      -e 's/@''GNULIB_MALLOC_GNU''@/1/g' \
+      -e 's/@''GNULIB_MALLOC_POSIX''@/1/g' \
+      -e 's/@''GNULIB_MBSTOWCS''@/0/g' \
+      -e 's/@''GNULIB_MBTOWC''@/0/g' \
+      -e 's/@''GNULIB_MKDTEMP''@/0/g' \
+      -e 's/@''GNULIB_MKOSTEMP''@/0/g' \
+      -e 's/@''GNULIB_MKOSTEMPS''@/0/g' \
+      -e 's/@''GNULIB_MKSTEMP''@/0/g' \
+      -e 's/@''GNULIB_MKSTEMPS''@/0/g' \
+      -e 's/@''GNULIB_POSIX_MEMALIGN''@/0/g' \
+      -e 's/@''GNULIB_POSIX_OPENPT''@/0/g' \
+      -e 's/@''GNULIB_PTSNAME''@/0/g' \
+      -e 's/@''GNULIB_PTSNAME_R''@/0/g' \
+      -e 's/@''GNULIB_PUTENV''@/0/g' \
+      -e 's/@''GNULIB_QSORT_R''@/0/g' \
+      -e 's/@''GNULIB_RAND''@/0/g' \
+      -e 's/@''GNULIB_RANDOM''@/0/g' \
+      -e 's/@''GNULIB_RANDOM_R''@/0/g' \
+      -e 's/@''GNULIB_REALLOC_POSIX''@/1/g' \
+      -e 's/@''GNULIB_REALLOCARRAY''@/1/g' \
+      -e 's/@''GNULIB_REALPATH''@/0/g' \
+      -e 's/@''GNULIB_RPMATCH''@/0/g' \
+      -e 's/@''GNULIB_SECURE_GETENV''@/0/g' \
+      -e 's/@''GNULIB_SETENV''@/0/g' \
+      -e 's/@''GNULIB_STACK_TRACE''@/0/g' \
+      -e 's/@''GNULIB_STRTOD''@/0/g' \
+      -e 's/@''GNULIB_STRTOF''@/0/g' \
+      -e 's/@''GNULIB_STRTOL''@/0/g' \
+      -e 's/@''GNULIB_STRTOLD''@/0/g' \
+      -e 's/@''GNULIB_STRTOLL''@/0/g' \
+      -e 's/@''GNULIB_STRTOUL''@/0/g' \
+      -e 's/@''GNULIB_STRTOULL''@/0/g' \
+      -e 's/@''GNULIB_SYSTEM_POSIX''@/0/g' \
+      -e 's/@''GNULIB_UNLOCKPT''@/0/g' \
+      -e 's/@''GNULIB_UNSETENV''@/0/g' \
+      -e 's/@''GNULIB_WCTOMB''@/0/g' \
+      -e 's/@''GNULIB_MDA_ECVT''@/1/g' \
+      -e 's/@''GNULIB_MDA_FCVT''@/1/g' \
+      -e 's/@''GNULIB_MDA_GCVT''@/1/g' \
+      -e 's/@''GNULIB_MDA_MKTEMP''@/1/g' \
+      -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
+      < ./stdlib.in.h > stdlib.h-t1
 sed \
       -e 's/@''GNULIB_ILOGB''@/0/g' \
       -e 's/@''GNULIB_ILOGBF''@/0/g' \
@@ -1704,98 +1892,6 @@
       -e 's/@''GNULIB_MDA_Y1''@/1/g' \
       -e 's/@''GNULIB_MDA_YN''@/1/g' \
       < math.h-t1 > math.h-t2
-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' \
-      -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' \
-      ./stddef.in.h > stddef.h-t
-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_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''@/1/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''@/0/g' \
-      -e 's/@''GNULIB_GETLINE''@/0/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''@/0/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''@/1/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''@/0/g' \
-      -e 's/@''GNULIB_VSNZPRINTF''@/0/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' \
-      < ./stdio.in.h > stdio.h-t1
 sed \
       -e 's|@''REPLACE_PTHREAD_CREATE''@|0|g' \
       -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|0|g' \
@@ -1833,6 +1929,75 @@
       -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|0|g' \
       < pthread.h-t2 > pthread.h-t3
 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
+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' \
@@ -1856,6 +2021,45 @@
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       < pthread.h-t3 > pthread.h-t4
 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 ./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' \
+      < stdio.h-t2 > stdio.h-t3
+sed \
       -e 's|@''HAVE_ACOSF''@|1|g' \
       -e 's|@''HAVE_ACOSL''@|1|g' \
       -e 's|@''HAVE_ASINF''@|1|g' \
@@ -1936,215 +2140,56 @@
       -e 's|@''HAVE_TOTALORDERMAGL''@|1|g' \
       < math.h-t2 > math.h-t3
 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
-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_STDLIB_H''@|<stdlib.h>|g' \
-      -e 's/@''GNULIB__EXIT''@/0/g' \
-      -e 's/@''GNULIB_ABORT_DEBUG''@/0/g' \
-      -e 's/@''GNULIB_ALIGNED_ALLOC''@/0/g' \
-      -e 's/@''GNULIB_ATOLL''@/0/g' \
-      -e 's/@''GNULIB_CALLOC_GNU''@/1/g' \
-      -e 's/@''GNULIB_CALLOC_POSIX''@/1/g' \
-      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/0/g' \
-      -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
-      -e 's/@''GNULIB_GETLOADAVG''@/0/g' \
-      -e 's/@''GNULIB_GETPROGNAME''@/0/g' \
-      -e 's/@''GNULIB_GETSUBOPT''@/0/g' \
-      -e 's/@''GNULIB_GRANTPT''@/0/g' \
-      -e 's/@''GNULIB_MALLOC_GNU''@/1/g' \
-      -e 's/@''GNULIB_MALLOC_POSIX''@/1/g' \
-      -e 's/@''GNULIB_MBSTOWCS''@/0/g' \
-      -e 's/@''GNULIB_MBTOWC''@/0/g' \
-      -e 's/@''GNULIB_MKDTEMP''@/0/g' \
-      -e 's/@''GNULIB_MKOSTEMP''@/0/g' \
-      -e 's/@''GNULIB_MKOSTEMPS''@/0/g' \
-      -e 's/@''GNULIB_MKSTEMP''@/0/g' \
-      -e 's/@''GNULIB_MKSTEMPS''@/0/g' \
-      -e 's/@''GNULIB_POSIX_MEMALIGN''@/0/g' \
-      -e 's/@''GNULIB_POSIX_OPENPT''@/0/g' \
-      -e 's/@''GNULIB_PTSNAME''@/0/g' \
-      -e 's/@''GNULIB_PTSNAME_R''@/0/g' \
-      -e 's/@''GNULIB_PUTENV''@/0/g' \
-      -e 's/@''GNULIB_QSORT_R''@/0/g' \
-      -e 's/@''GNULIB_RAND''@/0/g' \
-      -e 's/@''GNULIB_RANDOM''@/0/g' \
-      -e 's/@''GNULIB_RANDOM_R''@/0/g' \
-      -e 's/@''GNULIB_REALLOC_POSIX''@/1/g' \
-      -e 's/@''GNULIB_REALLOCARRAY''@/1/g' \
-      -e 's/@''GNULIB_REALPATH''@/0/g' \
-      -e 's/@''GNULIB_RPMATCH''@/0/g' \
-      -e 's/@''GNULIB_SECURE_GETENV''@/0/g' \
-      -e 's/@''GNULIB_SETENV''@/0/g' \
-      -e 's/@''GNULIB_STACK_TRACE''@/0/g' \
-      -e 's/@''GNULIB_STRTOD''@/0/g' \
-      -e 's/@''GNULIB_STRTOF''@/0/g' \
-      -e 's/@''GNULIB_STRTOL''@/0/g' \
-      -e 's/@''GNULIB_STRTOLD''@/0/g' \
-      -e 's/@''GNULIB_STRTOLL''@/0/g' \
-      -e 's/@''GNULIB_STRTOUL''@/0/g' \
-      -e 's/@''GNULIB_STRTOULL''@/0/g' \
-      -e 's/@''GNULIB_SYSTEM_POSIX''@/0/g' \
-      -e 's/@''GNULIB_UNLOCKPT''@/0/g' \
-      -e 's/@''GNULIB_UNSETENV''@/0/g' \
-      -e 's/@''GNULIB_WCTOMB''@/0/g' \
-      -e 's/@''GNULIB_MDA_ECVT''@/1/g' \
-      -e 's/@''GNULIB_MDA_FCVT''@/1/g' \
-      -e 's/@''GNULIB_MDA_GCVT''@/1/g' \
-      -e 's/@''GNULIB_MDA_MKTEMP''@/1/g' \
-      -e 's/@''GNULIB_MDA_PUTENV''@/1/g' \
-      < ./stdlib.in.h > stdlib.h-t1
-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 's|@''REPLACE__EXIT''@|0|g' \
+      -e 's|@''REPLACE_ABORT''@|0|g' \
+      -e 's|@''REPLACE_ALIGNED_ALLOC''@|0|g' \
+      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|0|g' \
+      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|0|g' \
+      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|0|g' \
+      -e 's|@''REPLACE_FREE''@|0|g' \
+      -e 's|@''REPLACE_GETLOADAVG''@|0|g' \
+      -e 's|@''REPLACE_GETPROGNAME''@|0|g' \
+      -e 's|@''REPLACE_GETSUBOPT''@|0|g' \
+      -e 's|@''REPLACE_INITSTATE''@|0|g' \
+      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|0|g' \
+      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|0|g' \
+      -e 's|@''REPLACE_MB_CUR_MAX''@|0|g' \
+      -e 's|@''REPLACE_MBSTOWCS''@|0|g' \
+      -e 's|@''REPLACE_MBTOWC''@|0|g' \
+      -e 's|@''REPLACE_MKOSTEMP''@|0|g' \
+      -e 's|@''REPLACE_MKOSTEMPS''@|0|g' \
+      -e 's|@''REPLACE_MKSTEMP''@|0|g' \
+      -e 's|@''REPLACE_POSIX_MEMALIGN''@|0|g' \
+      -e 's|@''REPLACE_POSIX_OPENPT''@|0|g' \
+      -e 's|@''REPLACE_PTSNAME''@|0|g' \
+      -e 's|@''REPLACE_PTSNAME_R''@|0|g' \
+      -e 's|@''REPLACE_PUTENV''@|0|g' \
+      -e 's|@''REPLACE_QSORT_R''@|0|g' \
+      -e 's|@''REPLACE_RAND''@|0|g' \
+      -e 's|@''REPLACE_RANDOM''@|0|g' \
+      -e 's|@''REPLACE_RANDOM_R''@|0|g' \
+      -e 's|@''REPLACE_REALLOC_FOR_REALLOC_POSIX''@|2|g' \
+      -e 's|@''REPLACE_REALLOCARRAY''@|1|g' \
+      -e 's|@''REPLACE_REALPATH''@|0|g' \
+      -e 's|@''REPLACE_SETENV''@|0|g' \
+      -e 's|@''REPLACE_SETSTATE''@|0|g' \
+      -e 's|@''REPLACE_STRTOD''@|0|g' \
+      -e 's|@''REPLACE_STRTOF''@|0|g' \
+      -e 's|@''REPLACE_STRTOL''@|0|g' \
+      -e 's|@''REPLACE_STRTOLD''@|0|g' \
+      -e 's|@''REPLACE_STRTOLL''@|0|g' \
+      -e 's|@''REPLACE_STRTOUL''@|0|g' \
+      -e 's|@''REPLACE_STRTOULL''@|0|g' \
+      -e 's|@''REPLACE_UNSETENV''@|0|g' \
+      -e 's|@''REPLACE_WCTOMB''@|0|g' \
+      -e 's|@''CAN_PRINT_STACK_TRACE''@|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' \
-      < stdio.h-t2 > stdio.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 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
-mv stdio.h-t3 stdio.h
+      < stdlib.h-t2 > stdlib.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' \
@@ -2197,102 +2242,62 @@
       -e 's/@''GNULIB_MDA_STRDUP''@/1/g' \
       -e 's/@''GNULIB_FREE_POSIX''@/1/g' \
       < ./string.in.h > string.h-t1
-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
-sed \
-      -e 's|@''REPLACE__EXIT''@|0|g' \
-      -e 's|@''REPLACE_ABORT''@|0|g' \
-      -e 's|@''REPLACE_ALIGNED_ALLOC''@|0|g' \
-      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|0|g' \
-      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|0|g' \
-      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|0|g' \
-      -e 's|@''REPLACE_FREE''@|0|g' \
-      -e 's|@''REPLACE_GETLOADAVG''@|0|g' \
-      -e 's|@''REPLACE_GETPROGNAME''@|0|g' \
-      -e 's|@''REPLACE_GETSUBOPT''@|0|g' \
-      -e 's|@''REPLACE_INITSTATE''@|0|g' \
-      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|0|g' \
-      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|0|g' \
-      -e 's|@''REPLACE_MB_CUR_MAX''@|0|g' \
-      -e 's|@''REPLACE_MBSTOWCS''@|0|g' \
-      -e 's|@''REPLACE_MBTOWC''@|0|g' \
-      -e 's|@''REPLACE_MKOSTEMP''@|0|g' \
-      -e 's|@''REPLACE_MKOSTEMPS''@|0|g' \
-      -e 's|@''REPLACE_MKSTEMP''@|0|g' \
-      -e 's|@''REPLACE_POSIX_MEMALIGN''@|0|g' \
-      -e 's|@''REPLACE_POSIX_OPENPT''@|0|g' \
-      -e 's|@''REPLACE_PTSNAME''@|0|g' \
-      -e 's|@''REPLACE_PTSNAME_R''@|0|g' \
-      -e 's|@''REPLACE_PUTENV''@|0|g' \
-      -e 's|@''REPLACE_QSORT_R''@|0|g' \
-      -e 's|@''REPLACE_RAND''@|0|g' \
-      -e 's|@''REPLACE_RANDOM''@|0|g' \
-      -e 's|@''REPLACE_RANDOM_R''@|0|g' \
-      -e 's|@''REPLACE_REALLOC_FOR_REALLOC_POSIX''@|2|g' \
-      -e 's|@''REPLACE_REALLOCARRAY''@|1|g' \
-      -e 's|@''REPLACE_REALPATH''@|0|g' \
-      -e 's|@''REPLACE_SETENV''@|0|g' \
-      -e 's|@''REPLACE_SETSTATE''@|0|g' \
-      -e 's|@''REPLACE_STRTOD''@|0|g' \
-      -e 's|@''REPLACE_STRTOF''@|0|g' \
-      -e 's|@''REPLACE_STRTOL''@|0|g' \
-      -e 's|@''REPLACE_STRTOLD''@|0|g' \
-      -e 's|@''REPLACE_STRTOLL''@|0|g' \
-      -e 's|@''REPLACE_STRTOUL''@|0|g' \
-      -e 's|@''REPLACE_STRTOULL''@|0|g' \
-      -e 's|@''REPLACE_UNSETENV''@|0|g' \
-      -e 's|@''REPLACE_WCTOMB''@|0|g' \
-      -e 's|@''CAN_PRINT_STACK_TRACE''@|0|g' \
+rm -f stdio.h-t1 stdio.h-t2
+mv stdio.h-t3 stdio.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
+rm -f stdlib.h-t1 stdlib.h-t2
+mv stdlib.h-t3 stdlib.h
+/usr/bin/mkdir -p 'sys'
+mv sys/select.h-t sys/select.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_SOCKET_H''@|<sys/socket.h>|g' \
+      -e 's|@''HAVE_SYS_SOCKET_H''@|1|g' \
+      -e 's/@''GNULIB_CLOSE''@/0/g' \
+      -e 's/@''GNULIB_SOCKET''@/0/g' \
+      -e 's/@''GNULIB_CONNECT''@/0/g' \
+      -e 's/@''GNULIB_ACCEPT''@/0/g' \
+      -e 's/@''GNULIB_BIND''@/0/g' \
+      -e 's/@''GNULIB_GETPEERNAME''@/0/g' \
+      -e 's/@''GNULIB_GETSOCKNAME''@/0/g' \
+      -e 's/@''GNULIB_GETSOCKOPT''@/0/g' \
+      -e 's/@''GNULIB_LISTEN''@/0/g' \
+      -e 's/@''GNULIB_RECV''@/0/g' \
+      -e 's/@''GNULIB_SEND''@/0/g' \
+      -e 's/@''GNULIB_RECVFROM''@/0/g' \
+      -e 's/@''GNULIB_SENDTO''@/0/g' \
+      -e 's/@''GNULIB_SETSOCKOPT''@/0/g' \
+      -e 's/@''GNULIB_SHUTDOWN''@/0/g' \
+      -e 's/@''GNULIB_ACCEPT4''@/0/g' \
+      -e 's|@''HAVE_WINSOCK2_H''@|0|g' \
+      -e 's|@''HAVE_WS2TCPIP_H''@|0|g' \
+      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|1|g' \
+      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY''@|1|g' \
+      -e 's|@''HAVE_SA_FAMILY_T''@|1|g' \
+      -e 's|@''HAVE_ACCEPT4''@|1|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' \
-      < stdlib.h-t2 > stdlib.h-t3
+      ./sys_socket.in.h > sys/socket.h-t
 sed \
       -e 's|@''HAVE_EXPLICIT_BZERO''@|1|g' \
       -e 's|@''HAVE_FFSL''@|1|g' \
@@ -2345,114 +2350,7 @@
       -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
-rm -f stdlib.h-t1 stdlib.h-t2
-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
-rm -f string.h-t1
-mv stdlib.h-t3 stdlib.h
-mv string.h-t2 string.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' \
-      -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
-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_SOCKET_H''@|<sys/socket.h>|g' \
-      -e 's|@''HAVE_SYS_SOCKET_H''@|1|g' \
-      -e 's/@''GNULIB_CLOSE''@/0/g' \
-      -e 's/@''GNULIB_SOCKET''@/0/g' \
-      -e 's/@''GNULIB_CONNECT''@/0/g' \
-      -e 's/@''GNULIB_ACCEPT''@/0/g' \
-      -e 's/@''GNULIB_BIND''@/0/g' \
-      -e 's/@''GNULIB_GETPEERNAME''@/0/g' \
-      -e 's/@''GNULIB_GETSOCKNAME''@/0/g' \
-      -e 's/@''GNULIB_GETSOCKOPT''@/0/g' \
-      -e 's/@''GNULIB_LISTEN''@/0/g' \
-      -e 's/@''GNULIB_RECV''@/0/g' \
-      -e 's/@''GNULIB_SEND''@/0/g' \
-      -e 's/@''GNULIB_RECVFROM''@/0/g' \
-      -e 's/@''GNULIB_SENDTO''@/0/g' \
-      -e 's/@''GNULIB_SETSOCKOPT''@/0/g' \
-      -e 's/@''GNULIB_SHUTDOWN''@/0/g' \
-      -e 's/@''GNULIB_ACCEPT4''@/0/g' \
-      -e 's|@''HAVE_WINSOCK2_H''@|0|g' \
-      -e 's|@''HAVE_WS2TCPIP_H''@|0|g' \
-      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|1|g' \
-      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY''@|1|g' \
-      -e 's|@''HAVE_SA_FAMILY_T''@|1|g' \
-      -e 's|@''HAVE_ACCEPT4''@|1|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' \
-      ./sys_socket.in.h > sys/socket.h-t
-mv sys/select.h-t sys/select.h
 /usr/bin/mkdir -p 'sys'
-mv sys/socket.h-t sys/socket.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' \
@@ -2510,6 +2408,45 @@
       -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|@''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 sys/socket.h-t sys/socket.h
 /usr/bin/mkdir -p 'sys'
 sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e 1G \
       -e 's|@''GUARD_PREFIX''@|GL|g' \
@@ -2528,8 +2465,8 @@
       -e '/definition of _GL_ARG_NONNULL/r ./arg-nonnull.h' \
       -e '/definition of _GL_WARN_ON_USE/r ./warn-on-use.h' \
       ./sys_time.in.h > sys/time.h-t
-rm -f math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
-mv math.h-t6 math.h
+rm -f string.h-t1
+mv string.h-t2 string.h
 mv sys/time.h-t sys/time.h
 /usr/bin/mkdir -p 'sys'
 /usr/bin/mkdir -p 'sys'
@@ -2543,6 +2480,7 @@
       -e 's|@''HAVE_OFF64_T''@|1|g' \
       -e 's|@''WINDOWS_STAT_INODES''@|0|g' \
       ./sys_types.in.h > sys/types.h-t
+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|@''INCLUDE_NEXT''@|include_next|g' \
@@ -2551,8 +2489,6 @@
       -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 sys/stat.h-t sys/stat.h
-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' \
@@ -2605,6 +2541,7 @@
       -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/types.h-t sys/types.h
 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' \
@@ -2638,6 +2575,53 @@
       -e 's/@''GNULIB_FSYNC''@/0/g' \
       -e 's/@''GNULIB_FTRUNCATE''@/0/g' \
       < ./unistd.in.h > unistd.h-t1
+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
 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' \
@@ -2775,6 +2759,56 @@
       -e 's/@''GNULIB_MDA_WRITE''@/1/g' \
       < unistd.h-t1 > unistd.h-t2
 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
+sed \
       -e 's|@''HAVE_WINT_T''@|1|g' \
       -e 's|@''HAVE_BTOWC''@|1|g' \
       -e 's|@''HAVE_MBSINIT''@|1|g' \
@@ -2895,6 +2929,8 @@
       -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 math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5
+mv math.h-t6 math.h
 rm -f wchar.h-t1 wchar.h-t2
 mv wchar.h-t3 wchar.h
 sed \
@@ -3026,7 +3062,7 @@
 make[2]: Leaving directory '/build/reproducible-path/lbzip2-2.5'
 make[1]: Leaving directory '/build/reproducible-path/lbzip2-2.5'
    dh_auto_test
-	make -j3 check "TESTSUITEFLAGS=-j3 --verbose" VERBOSE=1
+	make -j4 check "TESTSUITEFLAGS=-j4 --verbose" VERBOSE=1
 make[1]: Entering directory '/build/reproducible-path/lbzip2-2.5'
 Making check in lib
 make[2]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -3056,11 +3092,11 @@
 make  check-TESTS
 make[3]: Entering directory '/build/reproducible-path/lbzip2-2.5/tests'
 make[4]: Entering directory '/build/reproducible-path/lbzip2-2.5/tests'
+PASS: concat.bz2
 PASS: 32767.bz2
 PASS: codelen20.bz2
-PASS: crc1.bz2
-PASS: concat.bz2
 PASS: crc2.bz2
+PASS: crc1.bz2
 PASS: cve.bz2
 PASS: cve2.bz2
 PASS: empty.bz2
@@ -3068,13 +3104,13 @@
 PASS: incomp-1.bz2
 PASS: incomp-2.bz2
 PASS: load0.bz2
-PASS: fib.bz2
 PASS: overrun.bz2
 PASS: overrun2.bz2
+PASS: fib.bz2
 PASS: rand.bz2
 PASS: trash.bz2
-PASS: repet.bz2
 PASS: void.bz2
+PASS: repet.bz2
 PASS: ch255.bz2
 ============================================================================
 Testsuite summary for lbzip2 2.5
@@ -3097,7 +3133,7 @@
    create-stamp debian/debhelper-build-stamp
    dh_prep
    dh_auto_install --destdir=debian/lbzip2/
-	make -j3 install DESTDIR=/build/reproducible-path/lbzip2-2.5/debian/lbzip2 AM_UPDATE_INFO_DIR=no
+	make -j4 install DESTDIR=/build/reproducible-path/lbzip2-2.5/debian/lbzip2 AM_UPDATE_INFO_DIR=no
 make[1]: Entering directory '/build/reproducible-path/lbzip2-2.5'
 Making install in lib
 make[2]: Entering directory '/build/reproducible-path/lbzip2-2.5/lib'
@@ -3173,12 +3209,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/7492/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/7492/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/21532 and its subdirectories
-I: Current time: Mon Jan 20 07:35:05 -12 2025
-I: pbuilder-time-stamp: 1737401705
+I: removing directory /srv/workspace/pbuilder/7492 and its subdirectories
+I: Current time: Tue Jan 21 09:38:48 +14 2025
+I: pbuilder-time-stamp: 1737401928