Sync with the latest Gnulib code (d4ec02b3cc)refs/pull/2037/head

1 files changed, 255 insertions, 66 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index dcebd4a..df988b3 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2023 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@ SUBDIRS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_LTLIBRARIES =
+pkgdata_DATA =
 EXTRA_DIST =
 BUILT_SOURCES =
 SUFFIXES =
@@ -350,10 +351,32 @@ if GL_COND_OBJ_ERROR
 libgnu_a_SOURCES += error.c
 endif
 
-EXTRA_DIST += error.h
-
 ## end   gnulib module error
 
+## begin gnulib module error-h
+
+BUILT_SOURCES += error.h
+
+# We need the following in order to override <error.h>.
+error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H)
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \
+              -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \
+              -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \
+              -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \
+              -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              $(srcdir)/error.in.h > $@-t
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += error.h error.h-t
+
+EXTRA_DIST += error.in.h
+
+## end   gnulib module error-h
+
 ## begin gnulib module exitfail
 
 libgnu_a_SOURCES += exitfail.c
@@ -595,6 +618,7 @@ SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G
 SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t'
 
 # Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that
+# is its recipe's first line if and only if @NMD@ lines are absent.
 gl_V_at = $(AM_V_GEN)
 
 ## end   gnulib module gen-header
@@ -698,7 +722,11 @@ EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h get
 
 ## begin gnulib module getprogname
 
-libgnu_a_SOURCES += getprogname.h getprogname.c
+if GL_COND_OBJ_GETPROGNAME
+libgnu_a_SOURCES += getprogname.c
+endif
+
+EXTRA_DIST += getprogname.h
 
 ## end   gnulib module getprogname
 
@@ -810,6 +838,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
               -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
               -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
               -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
+              -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \
+              -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \
               -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
               -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
               -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@@ -827,6 +857,48 @@ EXTRA_DIST += inttypes.in.h
 
 ## end   gnulib module inttypes-incomplete
 
+## begin gnulib module iswblank
+
+if GL_COND_OBJ_ISWBLANK
+libgnu_a_SOURCES += iswblank.c
+endif
+
+## end   gnulib module iswblank
+
+## begin gnulib module iswctype
+
+if GL_COND_OBJ_ISWCTYPE
+libgnu_a_SOURCES += iswctype.c
+endif
+
+EXTRA_DIST += iswctype-impl.h
+
+## end   gnulib module iswctype
+
+## begin gnulib module iswdigit
+
+if GL_COND_OBJ_ISWDIGIT
+libgnu_a_SOURCES += iswdigit.c
+endif
+
+## end   gnulib module iswdigit
+
+## begin gnulib module iswpunct
+
+if GL_COND_OBJ_ISWPUNCT
+libgnu_a_SOURCES += iswpunct.c
+endif
+
+## end   gnulib module iswpunct
+
+## begin gnulib module iswxdigit
+
+if GL_COND_OBJ_ISWXDIGIT
+libgnu_a_SOURCES += iswxdigit.c
+endif
+
+## end   gnulib module iswxdigit
+
 ## begin gnulib module langinfo
 
 BUILT_SOURCES += langinfo.h
@@ -917,7 +989,7 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \
               -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \
               -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \
-              -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \
+              -e 's/@''GNULIB_LOCALENAME_UNSAFE''@/$(GL_GNULIB_LOCALENAME_UNSAFE)/g' \
               -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
               -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
               -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
@@ -1043,11 +1115,15 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \
               -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \
               -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \
+              -e 's/@''GNULIB_GETPAYLOAD''@/$(GL_GNULIB_GETPAYLOAD)/g' \
+              -e 's/@''GNULIB_GETPAYLOADF''@/$(GL_GNULIB_GETPAYLOADF)/g' \
+              -e 's/@''GNULIB_GETPAYLOADL''@/$(GL_GNULIB_GETPAYLOADL)/g' \
               -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \
               -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \
               -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \
-              < $(srcdir)/math.in.h | \
-          sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \
+              < $(srcdir)/math.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \
               -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \
               -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \
               -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \
@@ -1056,6 +1132,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \
               -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \
               -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \
+              -e 's/@''GNULIB_LDEXP''@/$(GL_GNULIB_LDEXP)/g' \
               -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \
               -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \
               -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \
@@ -1086,6 +1163,12 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \
               -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \
               -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \
+              -e 's/@''GNULIB_SETPAYLOAD''@/$(GL_GNULIB_SETPAYLOAD)/g' \
+              -e 's/@''GNULIB_SETPAYLOADF''@/$(GL_GNULIB_SETPAYLOADF)/g' \
+              -e 's/@''GNULIB_SETPAYLOADL''@/$(GL_GNULIB_SETPAYLOADL)/g' \
+              -e 's/@''GNULIB_SETPAYLOADSIG''@/$(GL_GNULIB_SETPAYLOADSIG)/g' \
+              -e 's/@''GNULIB_SETPAYLOADSIGF''@/$(GL_GNULIB_SETPAYLOADSIGF)/g' \
+              -e 's/@''GNULIB_SETPAYLOADSIGL''@/$(GL_GNULIB_SETPAYLOADSIGL)/g' \
               -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \
               -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \
               -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \
@@ -1098,14 +1181,21 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \
               -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \
               -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \
+              -e 's/@''GNULIB_TOTALORDER''@/$(GL_GNULIB_TOTALORDER)/g' \
+              -e 's/@''GNULIB_TOTALORDERF''@/$(GL_GNULIB_TOTALORDERF)/g' \
+              -e 's/@''GNULIB_TOTALORDERL''@/$(GL_GNULIB_TOTALORDERL)/g' \
+              -e 's/@''GNULIB_TOTALORDERMAG''@/$(GL_GNULIB_TOTALORDERMAG)/g' \
+              -e 's/@''GNULIB_TOTALORDERMAGF''@/$(GL_GNULIB_TOTALORDERMAGF)/g' \
+              -e 's/@''GNULIB_TOTALORDERMAGL''@/$(GL_GNULIB_TOTALORDERMAGL)/g' \
               -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \
               -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \
               -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \
               -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \
               -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \
               -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \
-          | \
-          sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \
               -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \
               -e 's|@''HAVE_ASINF''@|$(HAVE_ASINF)|g' \
               -e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \
@@ -1132,6 +1222,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \
               -e 's|@''HAVE_FMODL''@|$(HAVE_FMODL)|g' \
               -e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \
+              -e 's|@''HAVE_GETPAYLOAD''@|$(HAVE_GETPAYLOAD)|g' \
+              -e 's|@''HAVE_GETPAYLOADF''@|$(HAVE_GETPAYLOADF)|g' \
+              -e 's|@''HAVE_GETPAYLOADL''@|$(HAVE_GETPAYLOADL)|g' \
               -e 's|@''HAVE_HYPOTF''@|$(HAVE_HYPOTF)|g' \
               -e 's|@''HAVE_HYPOTL''@|$(HAVE_HYPOTL)|g' \
               -e 's|@''HAVE_ILOGB''@|$(HAVE_ILOGB)|g' \
@@ -1157,6 +1250,12 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_REMAINDERF''@|$(HAVE_REMAINDERF)|g' \
               -e 's|@''HAVE_RINT''@|$(HAVE_RINT)|g' \
               -e 's|@''HAVE_RINTL''@|$(HAVE_RINTL)|g' \
+              -e 's|@''HAVE_SETPAYLOAD''@|$(HAVE_SETPAYLOAD)|g' \
+              -e 's|@''HAVE_SETPAYLOADF''@|$(HAVE_SETPAYLOADF)|g' \
+              -e 's|@''HAVE_SETPAYLOADL''@|$(HAVE_SETPAYLOADL)|g' \
+              -e 's|@''HAVE_SETPAYLOADSIG''@|$(HAVE_SETPAYLOADSIG)|g' \
+              -e 's|@''HAVE_SETPAYLOADSIGF''@|$(HAVE_SETPAYLOADSIGF)|g' \
+              -e 's|@''HAVE_SETPAYLOADSIGL''@|$(HAVE_SETPAYLOADSIGL)|g' \
               -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \
               -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \
               -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \
@@ -1165,6 +1264,14 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_TANF''@|$(HAVE_TANF)|g' \
               -e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \
               -e 's|@''HAVE_TANHF''@|$(HAVE_TANHF)|g' \
+              -e 's|@''HAVE_TOTALORDER''@|$(HAVE_TOTALORDER)|g' \
+              -e 's|@''HAVE_TOTALORDERF''@|$(HAVE_TOTALORDERF)|g' \
+              -e 's|@''HAVE_TOTALORDERL''@|$(HAVE_TOTALORDERL)|g' \
+              -e 's|@''HAVE_TOTALORDERMAG''@|$(HAVE_TOTALORDERMAG)|g' \
+              -e 's|@''HAVE_TOTALORDERMAGF''@|$(HAVE_TOTALORDERMAGF)|g' \
+              -e 's|@''HAVE_TOTALORDERMAGL''@|$(HAVE_TOTALORDERMAGL)|g' \
+              < $@-t2 > $@-t3
+        $(AM_V_at)sed \
               -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
               -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
               -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
@@ -1201,8 +1308,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
               -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
               -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
-          | \
-          sed -e 's|@''REPLACE_ACOSF''@|$(REPLACE_ACOSF)|g' \
+              < $@-t3 > $@-t4
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_ACOSF''@|$(REPLACE_ACOSF)|g' \
               -e 's|@''REPLACE_ASINF''@|$(REPLACE_ASINF)|g' \
               -e 's|@''REPLACE_ATANF''@|$(REPLACE_ATANF)|g' \
               -e 's|@''REPLACE_ATAN2F''@|$(REPLACE_ATAN2F)|g' \
@@ -1233,6 +1341,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \
               -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
               -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
+              -e 's|@''REPLACE_GETPAYLOAD''@|$(REPLACE_GETPAYLOAD)|g' \
+              -e 's|@''REPLACE_GETPAYLOADF''@|$(REPLACE_GETPAYLOADF)|g' \
+              -e 's|@''REPLACE_GETPAYLOADL''@|$(REPLACE_GETPAYLOADL)|g' \
               -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
               -e 's|@''REPLACE_HYPOT''@|$(REPLACE_HYPOT)|g' \
               -e 's|@''REPLACE_HYPOTF''@|$(REPLACE_HYPOTF)|g' \
@@ -1244,6 +1355,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \
               -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \
               -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
+              < $@-t4 > $@-t5
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_LDEXP''@|$(REPLACE_LDEXP)|g' \
               -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
               -e 's|@''REPLACE_LOG''@|$(REPLACE_LOG)|g' \
               -e 's|@''REPLACE_LOGF''@|$(REPLACE_LOGF)|g' \
@@ -1279,15 +1393,22 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \
               -e 's|@''REPLACE_TANF''@|$(REPLACE_TANF)|g' \
               -e 's|@''REPLACE_TANHF''@|$(REPLACE_TANHF)|g' \
+              -e 's|@''REPLACE_TOTALORDER''@|$(REPLACE_TOTALORDER)|g' \
+              -e 's|@''REPLACE_TOTALORDERF''@|$(REPLACE_TOTALORDERF)|g' \
+              -e 's|@''REPLACE_TOTALORDERL''@|$(REPLACE_TOTALORDERL)|g' \
+              -e 's|@''REPLACE_TOTALORDERMAG''@|$(REPLACE_TOTALORDERMAG)|g' \
+              -e 's|@''REPLACE_TOTALORDERMAGF''@|$(REPLACE_TOTALORDERMAGF)|g' \
+              -e 's|@''REPLACE_TOTALORDERMAGL''@|$(REPLACE_TOTALORDERMAGL)|g' \
               -e 's|@''REPLACE_TRUNC''@|$(REPLACE_TRUNC)|g' \
               -e 's|@''REPLACE_TRUNCF''@|$(REPLACE_TRUNCF)|g' \
               -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += math.h math.h-t
+              < $@-t5 > $@-t6
+        $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 $@-t4 $@-t5
+        $(AM_V_at)mv $@-t6 $@
+MOSTLYCLEANFILES += math.h math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5 math.h-t6
 
 EXTRA_DIST += math.in.h
 
@@ -1313,6 +1434,12 @@ endif
 
 ## end   gnulib module mbsinit
 
+## begin gnulib module mbszero
+
+libgnu_a_SOURCES += mbszero.c
+
+## end   gnulib module mbszero
+
 ## begin gnulib module mbtowc
 
 if GL_COND_OBJ_MBTOWC
@@ -1534,6 +1661,14 @@ EXTRA_DIST += setlocale_null.h windows-initguard.h
 
 ## end   gnulib module setlocale-null
 
+## begin gnulib module setlocale-null-unlocked
+
+libgnu_a_SOURCES += setlocale_null-unlocked.c
+
+EXTRA_DIST += setlocale_null.h
+
+## end   gnulib module setlocale-null-unlocked
+
 ## begin gnulib module size_max
 
 libgnu_a_SOURCES += size_max.h
@@ -1625,26 +1760,6 @@ EXTRA_DIST += stat-time.h
 
 ## end   gnulib module stat-time
 
-## begin gnulib module stdalign
-
-BUILT_SOURCES += $(STDALIGN_H)
-
-# We need the following in order to create <stdalign.h> when the system
-# doesn't have one that works.
-if GL_GENERATE_STDALIGN_H
-stdalign.h: stdalign.in.h $(top_builddir)/config.status
-        $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h
-        $(AM_V_at)mv $@-t $@
-else
-stdalign.h: $(top_builddir)/config.status
-        rm -f $@
-endif
-MOSTLYCLEANFILES += stdalign.h stdalign.h-t
-
-EXTRA_DIST += stdalign.in.h
-
-## end   gnulib module stdalign
-
 ## begin gnulib module stdckdint
 
 BUILT_SOURCES += $(STDCKDINT_H)
@@ -1816,14 +1931,17 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \
               -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \
               -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \
-              < $(srcdir)/stdio.in.h | \
-          sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \
+              < $(srcdir)/stdio.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \
               -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
               -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
               -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
               -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
               -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \
               -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+              -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \
               -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
               -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
               -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
@@ -1834,6 +1952,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
               -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
               -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
               -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
               -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
               -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
@@ -1871,9 +1991,10 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += stdio.h stdio.h-t
+              < $@-t2 > $@-t3
+        $(AM_V_at)rm -f $@-t1 $@-t2
+        $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += stdio.h stdio.h-t1 stdio.h-t2 stdio.h-t3
 
 if GL_COND_OBJ_STDIO_READ
 libgnu_a_SOURCES += stdio-read.c
@@ -1908,10 +2029,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \
               -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
               -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \
+              -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \
               -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \
               -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \
               -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \
               -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \
+              -e 's/@''GNULIB_MBSTOWCS''@/$(GL_GNULIB_MBSTOWCS)/g' \
               -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \
               -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \
               -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \
@@ -1924,6 +2047,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \
               -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \
               -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \
+              -e 's/@''GNULIB_RAND''@/$(GL_GNULIB_RAND)/g' \
               -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \
               -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \
               -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \
@@ -1934,6 +2058,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \
               -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \
               -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \
+              -e 's/@''GNULIB_STRTOF''@/$(GL_GNULIB_STRTOF)/g' \
               -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \
               -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \
               -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \
@@ -1948,8 +2073,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \
               -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \
               -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \
-              < $(srcdir)/stdlib.in.h | \
-          sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+              < $(srcdir)/stdlib.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
@@ -1957,6 +2083,8 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \
               -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+              -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \
+              -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \
               -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
               -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
               -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
@@ -1983,6 +2111,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \
               -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
               -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+              -e 's|@''HAVE_STRTOF''@|$(HAVE_STRTOF)|g' \
               -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \
               -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \
               -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
@@ -1992,21 +2121,33 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
               -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
               -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \
               -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \
               -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \
               -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \
               -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+              -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \
+              -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \
+              -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \
               -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
               -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \
               -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \
+              -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \
+              -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \
               -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+              -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \
+              -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \
               -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
               -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \
+              -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \
               -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
               -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
               -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
               -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+              -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \
               -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
               -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
               -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \
@@ -2016,6 +2157,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
               -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \
               -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+              -e 's|@''REPLACE_STRTOF''@|$(REPLACE_STRTOF)|g' \
               -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \
               -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \
               -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \
@@ -2027,9 +2169,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+              < $@-t2 > $@-t3
+        $(AM_V_at)rm -f $@-t1 $@-t2
+        $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t1 stdlib.h-t2 stdlib.h-t3
 
 EXTRA_DIST += stdlib.in.h
 
@@ -2147,8 +2290,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \
               -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \
               -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
-              < $(srcdir)/string.in.h | \
-          sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
+              < $(srcdir)/string.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
               -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
               -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
               -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
@@ -2176,7 +2320,10 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
               -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
               -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+              -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
+              -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
               -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+              -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
               -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
               -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
               -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
@@ -2190,13 +2337,15 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
               -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
               -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+              -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
               -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += string.h string.h-t
+              < $@-t1 > $@-t2
+        $(AM_V_at)rm -f $@-t1
+        $(AM_V_at)mv $@-t2 $@
+MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
 
 EXTRA_DIST += string.in.h
 
@@ -2425,7 +2574,7 @@ libgnu_a_SOURCES += glthread/threadlib.c
 
 ## end   gnulib module threadlib
 
-## begin gnulib module time
+## begin gnulib module time-h
 
 BUILT_SOURCES += time.h
 
@@ -2444,6 +2593,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \
               -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \
               -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \
+              -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \
               -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \
               -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \
               -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \
@@ -2465,7 +2615,10 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
               -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
               -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
+              -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \
               -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+              -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \
+              -e 's|@''REPLACE_TIMESPEC_GETRES''@|$(REPLACE_TIMESPEC_GETRES)|g' \
               -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
               -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
               -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
@@ -2481,7 +2634,7 @@ MOSTLYCLEANFILES += time.h time.h-t
 
 EXTRA_DIST += time.in.h
 
-## end   gnulib module time
+## end   gnulib module time-h
 
 ## begin gnulib module time_r
 
@@ -2540,6 +2693,8 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \
               -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \
               -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \
+              < $(srcdir)/unistd.in.h > $@-t1
+        $(AM_V_at)sed \
               -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \
               -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \
               -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \
@@ -2601,8 +2756,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \
               -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \
               -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \
-              < $(srcdir)/unistd.in.h | \
-          sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
               -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
               -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
               -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -2649,13 +2805,15 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-          | \
-          sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
+              < $@-t2 > $@-t3
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
               -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
               -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \
               -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
               -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+              -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \
               -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \
               -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \
               -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \
@@ -2664,11 +2822,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \
               -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \
               -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \
+              -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
               -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+              -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \
               -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
               -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
               -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
               -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
+              -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \
               -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
               -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
               -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -2679,12 +2840,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
               -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
               -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+              -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \
               -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
               -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
               -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
               -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
               -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
               -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+              -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \
               -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
               -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
               -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
@@ -2700,9 +2863,10 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += unistd.h unistd.h-t
+              < $@-t3 > $@-t4
+        $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+        $(AM_V_at)mv $@-t4 $@
+MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4
 
 EXTRA_DIST += unistd.in.h
 
@@ -2777,6 +2941,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \
               -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \
               -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \
+              -e 's/@''GNULIB_MBSZERO''@/$(GL_GNULIB_MBSZERO)/g' \
               -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \
               -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \
               -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \
@@ -2815,10 +2980,12 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \
               -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \
               -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \
+              -e 's/@''GNULIB_WGETCWD''@/$(GL_GNULIB_WGETCWD)/g' \
               -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \
               -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
-              < $(srcdir)/wchar.in.h | \
-          sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+              < $(srcdir)/wchar.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
               -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
               -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
               -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -2861,8 +3028,9 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
               -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \
               -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-          | \
-          sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
               -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
               -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
               -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
@@ -2877,13 +3045,19 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
               -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
               -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+              -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
+              -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
+              -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
               -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
+              -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \
+              -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += wchar.h wchar.h-t
+              < $@-t2 > $@-t3
+        $(AM_V_at)rm -f $@-t1 $@-t2
+        $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3
 
 EXTRA_DIST += wchar.in.h
 
@@ -2897,6 +3071,16 @@ endif
 
 ## end   gnulib module wcrtomb
 
+## begin gnulib module wctype
+
+if GL_COND_OBJ_WCTYPE
+libgnu_a_SOURCES += wctype.c
+endif
+
+EXTRA_DIST += wctype-impl.h
+
+## end   gnulib module wctype
+
 ## begin gnulib module wctype-h
 
 BUILT_SOURCES += wctype.h
@@ -2904,7 +3088,7 @@ libgnu_a_SOURCES += wctype-h.c
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(gl_V_at)$(SED_HEADER_STDOUT) \
               -e 's|@''GUARD_PREFIX''@|GL|g' \
               -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
@@ -2916,6 +3100,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
               -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \
               -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \
               -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \
+              -e 's/@''GNULIB_ISWPUNCT''@/$(GL_GNULIB_ISWPUNCT)/g' \
               -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \
               -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \
               -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \
@@ -2928,10 +3113,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
               -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
               -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
               -e 's/@''REPLACE_ISWDIGIT''@/$(REPLACE_ISWDIGIT)/g' \
+              -e 's/@''REPLACE_ISWPUNCT''@/$(REPLACE_ISWPUNCT)/g' \
               -e 's/@''REPLACE_ISWXDIGIT''@/$(REPLACE_ISWXDIGIT)/g' \
               -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
               -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
+              -e 's/@''REPLACE_WCTRANS''@/$(REPLACE_WCTRANS)/g' \
+              -e 's/@''REPLACE_WCTYPE''@/$(REPLACE_WCTYPE)/g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               $(srcdir)/wctype.in.h > $@-t
         $(AM_V_at)mv $@-t $@