Merge commit 'upstream/0.9.3'

1 files changed, 2345 insertions, 557 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b1d9e4a..0983281 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@@ -49,43 +49,44 @@ host_triplet = @host@
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in
 TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
-	test-c-ctype$(EXEEXT) test-c-strcase.sh test-dup2$(EXEEXT) \
-	test-environ$(EXEEXT) test-errno$(EXEEXT) test-fcntl$(EXEEXT) \
-	test-frexpl-nolibm$(EXEEXT) test-fseterr$(EXEEXT) \
+	test-c-ctype$(EXEEXT) test-c-strcase.sh test-environ$(EXEEXT) \
+	test-errno$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
+	test-fseterr$(EXEEXT) test-iconv-h$(EXEEXT) \
 	test-iconv$(EXEEXT) test-isnand-nolibm$(EXEEXT) \
 	test-isnanf-nolibm$(EXEEXT) test-isnanl-nolibm$(EXEEXT) \
 	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
-	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
-	test-mbsinit.sh test-memchr$(EXEEXT) test-open$(EXEEXT) \
+	test-lock$(EXEEXT) test-malloca$(EXEEXT) test-math$(EXEEXT) \
+	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+	test-mbrtowc4.sh test-mbsinit.sh test-memchr$(EXEEXT) \
 	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
-	test-signbit$(EXEEXT) test-stdbool$(EXEEXT) \
-	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-setenv$(EXEEXT) test-signbit$(EXEEXT) \
+	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
+	test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
 	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
 	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
-	unicase/test-locale-language.sh test-uc_tolower$(EXEEXT) \
-	test-uc_totitle$(EXEEXT) test-uc_toupper$(EXEEXT) \
-	test-u16-casecmp$(EXEEXT) test-u16-casecoll$(EXEEXT) \
-	test-u16-casefold$(EXEEXT) test-u16-is-cased$(EXEEXT) \
-	test-u16-is-casefolded$(EXEEXT) test-u16-is-lowercase$(EXEEXT) \
-	test-u16-is-titlecase$(EXEEXT) test-u16-is-uppercase$(EXEEXT) \
-	test-u16-tolower$(EXEEXT) test-u16-totitle$(EXEEXT) \
-	test-u16-toupper$(EXEEXT) test-u32-casecmp$(EXEEXT) \
-	test-u32-casecoll$(EXEEXT) test-u32-casefold$(EXEEXT) \
-	test-u32-is-cased$(EXEEXT) test-u32-is-casefolded$(EXEEXT) \
-	test-u32-is-lowercase$(EXEEXT) test-u32-is-titlecase$(EXEEXT) \
-	test-u32-is-uppercase$(EXEEXT) test-u32-tolower$(EXEEXT) \
-	test-u32-totitle$(EXEEXT) test-u32-toupper$(EXEEXT) \
-	test-u8-casecmp$(EXEEXT) test-u8-casecoll$(EXEEXT) \
-	test-u8-casefold$(EXEEXT) test-u8-is-cased$(EXEEXT) \
-	test-u8-is-casefolded$(EXEEXT) test-u8-is-lowercase$(EXEEXT) \
-	test-u8-is-titlecase$(EXEEXT) test-u8-is-uppercase$(EXEEXT) \
-	test-u8-tolower$(EXEEXT) test-u8-totitle$(EXEEXT) \
-	test-u8-toupper$(EXEEXT) unicase/test-ulc-casecmp1.sh \
-	unicase/test-ulc-casecmp2.sh unicase/test-ulc-casecoll1.sh \
-	unicase/test-ulc-casecoll2.sh test-u16-conv-from-enc$(EXEEXT) \
-	test-u16-conv-to-enc$(EXEEXT) \
+	test-strncat$(EXEEXT) test-cased$(EXEEXT) \
+	test-ignorable$(EXEEXT) unicase/test-locale-language.sh \
+	test-uc_tolower$(EXEEXT) test-uc_totitle$(EXEEXT) \
+	test-uc_toupper$(EXEEXT) test-u16-casecmp$(EXEEXT) \
+	test-u16-casecoll$(EXEEXT) test-u16-casefold$(EXEEXT) \
+	test-u16-is-cased$(EXEEXT) test-u16-is-casefolded$(EXEEXT) \
+	test-u16-is-lowercase$(EXEEXT) test-u16-is-titlecase$(EXEEXT) \
+	test-u16-is-uppercase$(EXEEXT) test-u16-tolower$(EXEEXT) \
+	test-u16-totitle$(EXEEXT) test-u16-toupper$(EXEEXT) \
+	test-u32-casecmp$(EXEEXT) test-u32-casecoll$(EXEEXT) \
+	test-u32-casefold$(EXEEXT) test-u32-is-cased$(EXEEXT) \
+	test-u32-is-casefolded$(EXEEXT) test-u32-is-lowercase$(EXEEXT) \
+	test-u32-is-titlecase$(EXEEXT) test-u32-is-uppercase$(EXEEXT) \
+	test-u32-tolower$(EXEEXT) test-u32-totitle$(EXEEXT) \
+	test-u32-toupper$(EXEEXT) test-u8-casecmp$(EXEEXT) \
+	test-u8-casecoll$(EXEEXT) test-u8-casefold$(EXEEXT) \
+	test-u8-is-cased$(EXEEXT) test-u8-is-casefolded$(EXEEXT) \
+	test-u8-is-lowercase$(EXEEXT) test-u8-is-titlecase$(EXEEXT) \
+	test-u8-is-uppercase$(EXEEXT) test-u8-tolower$(EXEEXT) \
+	test-u8-totitle$(EXEEXT) test-u8-toupper$(EXEEXT) \
+	unicase/test-ulc-casecmp1.sh unicase/test-ulc-casecmp2.sh \
+	unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh \
+	test-u16-conv-from-enc$(EXEEXT) test-u16-conv-to-enc$(EXEEXT) \
 	test-u16-strconv-from-enc$(EXEEXT) \
 	test-u16-strconv-to-enc$(EXEEXT) \
 	test-u32-conv-from-enc$(EXEEXT) test-u32-conv-to-enc$(EXEEXT) \
@@ -224,52 +225,103 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	unistdio/test-ulc-vasnprintf2.sh \
 	unistdio/test-ulc-vasnprintf3.sh test-ulc-vasprintf1$(EXEEXT) \
 	test-ulc-vsnprintf1$(EXEEXT) test-ulc-vsprintf1$(EXEEXT) \
+	test-u16-check$(EXEEXT) test-u16-chr$(EXEEXT) \
+	test-u16-cmp$(EXEEXT) test-u16-cmp2$(EXEEXT) \
+	test-u16-cpy-alloc$(EXEEXT) test-u16-cpy$(EXEEXT) \
+	test-u16-mblen$(EXEEXT) test-u16-mbsnlen$(EXEEXT) \
+	test-u16-mbtouc$(EXEEXT) test-u16-mbtouc-unsafe$(EXEEXT) \
+	test-u16-mbtoucr$(EXEEXT) test-u16-move$(EXEEXT) \
+	test-u16-next$(EXEEXT) test-u16-prev$(EXEEXT) \
+	test-u16-set$(EXEEXT) test-u16-stpcpy$(EXEEXT) \
+	test-u16-stpncpy$(EXEEXT) test-u16-strcat$(EXEEXT) \
+	test-u16-strcmp$(EXEEXT) test-u16-strcoll$(EXEEXT) \
+	test-u16-strcpy$(EXEEXT) test-u16-strdup$(EXEEXT) \
+	test-u16-strlen$(EXEEXT) test-u16-strmblen$(EXEEXT) \
+	test-u16-strmbtouc$(EXEEXT) test-u16-strncat$(EXEEXT) \
+	test-u16-strncmp$(EXEEXT) test-u16-strncpy$(EXEEXT) \
+	test-u16-strnlen$(EXEEXT) test-u16-to-u32$(EXEEXT) \
+	test-u16-to-u8$(EXEEXT) test-u16-uctomb$(EXEEXT) \
+	test-u32-check$(EXEEXT) test-u32-chr$(EXEEXT) \
+	test-u32-cmp$(EXEEXT) test-u32-cmp2$(EXEEXT) \
+	test-u32-cpy-alloc$(EXEEXT) test-u32-cpy$(EXEEXT) \
+	test-u32-mblen$(EXEEXT) test-u32-mbsnlen$(EXEEXT) \
+	test-u32-mbtouc$(EXEEXT) test-u32-mbtouc-unsafe$(EXEEXT) \
+	test-u32-mbtoucr$(EXEEXT) test-u32-move$(EXEEXT) \
+	test-u32-next$(EXEEXT) test-u32-prev$(EXEEXT) \
+	test-u32-set$(EXEEXT) test-u32-stpcpy$(EXEEXT) \
+	test-u32-stpncpy$(EXEEXT) test-u32-strcat$(EXEEXT) \
+	test-u32-strcmp$(EXEEXT) test-u32-strcoll$(EXEEXT) \
+	test-u32-strcpy$(EXEEXT) test-u32-strdup$(EXEEXT) \
+	test-u32-strlen$(EXEEXT) test-u32-strmblen$(EXEEXT) \
+	test-u32-strmbtouc$(EXEEXT) test-u32-strncat$(EXEEXT) \
+	test-u32-strncmp$(EXEEXT) test-u32-strncpy$(EXEEXT) \
+	test-u32-strnlen$(EXEEXT) test-u32-to-u16$(EXEEXT) \
+	test-u32-to-u8$(EXEEXT) test-u32-uctomb$(EXEEXT) \
+	test-u8-check$(EXEEXT) test-u8-chr$(EXEEXT) \
+	test-u8-cmp$(EXEEXT) test-u8-cmp2$(EXEEXT) \
+	test-u8-cpy-alloc$(EXEEXT) test-u8-cpy$(EXEEXT) \
+	test-u8-mblen$(EXEEXT) test-u8-mbsnlen$(EXEEXT) \
+	test-u8-mbtouc$(EXEEXT) test-u8-mbtouc-unsafe$(EXEEXT) \
+	test-u8-mbtoucr$(EXEEXT) test-u8-move$(EXEEXT) \
+	test-u8-next$(EXEEXT) test-u8-prev$(EXEEXT) \
+	test-u8-set$(EXEEXT) test-u8-stpcpy$(EXEEXT) \
+	test-u8-stpncpy$(EXEEXT) test-u8-strcat$(EXEEXT) \
+	test-u8-strcmp$(EXEEXT) test-u8-strcoll$(EXEEXT) \
+	test-u8-strcpy$(EXEEXT) test-u8-strdup$(EXEEXT) \
+	test-u8-strlen$(EXEEXT) test-u8-strmblen$(EXEEXT) \
+	test-u8-strmbtouc$(EXEEXT) test-u8-strncat$(EXEEXT) \
+	test-u8-strncmp$(EXEEXT) test-u8-strncpy$(EXEEXT) \
+	test-u8-strnlen$(EXEEXT) test-u8-to-u16$(EXEEXT) \
+	test-u8-to-u32$(EXEEXT) test-u8-uctomb$(EXEEXT) \
 	test-u16-wordbreaks$(EXEEXT) test-u32-wordbreaks$(EXEEXT) \
 	test-u8-wordbreaks$(EXEEXT) uniwbrk/test-ulc-wordbreaks.sh \
 	test-u16-strwidth$(EXEEXT) test-u16-width$(EXEEXT) \
 	test-u32-strwidth$(EXEEXT) test-u32-width$(EXEEXT) \
 	test-u8-strwidth$(EXEEXT) test-u8-width$(EXEEXT) \
 	test-uc_width$(EXEEXT) uniwidth/test-uc_width2.sh \
-	test-wchar$(EXEEXT) test-wctype$(EXEEXT) test-wcwidth$(EXEEXT)
+	test-unsetenv$(EXEEXT) test-wchar$(EXEEXT) \
+	test-wctype$(EXEEXT) test-wcwidth$(EXEEXT) test-xalloc-die.sh
+XFAIL_TESTS =
 noinst_PROGRAMS =
 check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-array-mergesort$(EXEEXT) test-c-ctype$(EXEEXT) \
 	test-c-strcasecmp$(EXEEXT) test-c-strncasecmp$(EXEEXT) \
-	test-dup2$(EXEEXT) test-environ$(EXEEXT) test-errno$(EXEEXT) \
-	test-fcntl$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
-	test-fseterr$(EXEEXT) test-iconv$(EXEEXT) \
+	test-environ$(EXEEXT) test-errno$(EXEEXT) \
+	test-frexpl-nolibm$(EXEEXT) test-fseterr$(EXEEXT) \
+	test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \
 	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
 	test-isnanl-nolibm$(EXEEXT) test-locale$(EXEEXT) \
-	test-localename$(EXEEXT) test-malloca$(EXEEXT) \
-	test-math$(EXEEXT) test-mbrtowc$(EXEEXT) test-mbsinit$(EXEEXT) \
-	test-memchr$(EXEEXT) test-open$(EXEEXT) \
+	test-localename$(EXEEXT) test-lock$(EXEEXT) \
+	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc$(EXEEXT) \
+	test-mbsinit$(EXEEXT) test-memchr$(EXEEXT) \
 	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
-	test-signbit$(EXEEXT) test-stdbool$(EXEEXT) \
-	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-setenv$(EXEEXT) test-signbit$(EXEEXT) \
+	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
+	test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
 	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
 	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
-	test-locale-language$(EXEEXT) test-uc_tolower$(EXEEXT) \
-	test-uc_totitle$(EXEEXT) test-uc_toupper$(EXEEXT) \
-	test-u16-casecmp$(EXEEXT) test-u16-casecoll$(EXEEXT) \
-	test-u16-casefold$(EXEEXT) test-u16-is-cased$(EXEEXT) \
-	test-u16-is-casefolded$(EXEEXT) test-u16-is-lowercase$(EXEEXT) \
-	test-u16-is-titlecase$(EXEEXT) test-u16-is-uppercase$(EXEEXT) \
-	test-u16-tolower$(EXEEXT) test-u16-totitle$(EXEEXT) \
-	test-u16-toupper$(EXEEXT) test-u32-casecmp$(EXEEXT) \
-	test-u32-casecoll$(EXEEXT) test-u32-casefold$(EXEEXT) \
-	test-u32-is-cased$(EXEEXT) test-u32-is-casefolded$(EXEEXT) \
-	test-u32-is-lowercase$(EXEEXT) test-u32-is-titlecase$(EXEEXT) \
-	test-u32-is-uppercase$(EXEEXT) test-u32-tolower$(EXEEXT) \
-	test-u32-totitle$(EXEEXT) test-u32-toupper$(EXEEXT) \
-	test-u8-casecmp$(EXEEXT) test-u8-casecoll$(EXEEXT) \
-	test-u8-casefold$(EXEEXT) test-u8-is-cased$(EXEEXT) \
-	test-u8-is-casefolded$(EXEEXT) test-u8-is-lowercase$(EXEEXT) \
-	test-u8-is-titlecase$(EXEEXT) test-u8-is-uppercase$(EXEEXT) \
-	test-u8-tolower$(EXEEXT) test-u8-totitle$(EXEEXT) \
-	test-u8-toupper$(EXEEXT) test-ulc-casecmp$(EXEEXT) \
-	test-ulc-casecoll$(EXEEXT) test-u16-conv-from-enc$(EXEEXT) \
-	test-u16-conv-to-enc$(EXEEXT) \
+	test-strncat$(EXEEXT) test-cased$(EXEEXT) \
+	test-ignorable$(EXEEXT) test-locale-language$(EXEEXT) \
+	test-uc_tolower$(EXEEXT) test-uc_totitle$(EXEEXT) \
+	test-uc_toupper$(EXEEXT) test-u16-casecmp$(EXEEXT) \
+	test-u16-casecoll$(EXEEXT) test-u16-casefold$(EXEEXT) \
+	test-u16-is-cased$(EXEEXT) test-u16-is-casefolded$(EXEEXT) \
+	test-u16-is-lowercase$(EXEEXT) test-u16-is-titlecase$(EXEEXT) \
+	test-u16-is-uppercase$(EXEEXT) test-u16-tolower$(EXEEXT) \
+	test-u16-totitle$(EXEEXT) test-u16-toupper$(EXEEXT) \
+	test-u32-casecmp$(EXEEXT) test-u32-casecoll$(EXEEXT) \
+	test-u32-casefold$(EXEEXT) test-u32-is-cased$(EXEEXT) \
+	test-u32-is-casefolded$(EXEEXT) test-u32-is-lowercase$(EXEEXT) \
+	test-u32-is-titlecase$(EXEEXT) test-u32-is-uppercase$(EXEEXT) \
+	test-u32-tolower$(EXEEXT) test-u32-totitle$(EXEEXT) \
+	test-u32-toupper$(EXEEXT) test-u8-casecmp$(EXEEXT) \
+	test-u8-casecoll$(EXEEXT) test-u8-casefold$(EXEEXT) \
+	test-u8-is-cased$(EXEEXT) test-u8-is-casefolded$(EXEEXT) \
+	test-u8-is-lowercase$(EXEEXT) test-u8-is-titlecase$(EXEEXT) \
+	test-u8-is-uppercase$(EXEEXT) test-u8-tolower$(EXEEXT) \
+	test-u8-totitle$(EXEEXT) test-u8-toupper$(EXEEXT) \
+	test-ulc-casecmp$(EXEEXT) test-ulc-casecoll$(EXEEXT) \
+	test-u16-conv-from-enc$(EXEEXT) test-u16-conv-to-enc$(EXEEXT) \
 	test-u16-strconv-from-enc$(EXEEXT) \
 	test-u16-strconv-to-enc$(EXEEXT) \
 	test-u32-conv-from-enc$(EXEEXT) test-u32-conv-to-enc$(EXEEXT) \
@@ -406,13 +458,63 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-ulc-vasnprintf1$(EXEEXT) test-ulc-vasnprintf2$(EXEEXT) \
 	test-ulc-vasnprintf3$(EXEEXT) test-ulc-vasprintf1$(EXEEXT) \
 	test-ulc-vsnprintf1$(EXEEXT) test-ulc-vsprintf1$(EXEEXT) \
+	test-u16-check$(EXEEXT) test-u16-chr$(EXEEXT) \
+	test-u16-cmp$(EXEEXT) test-u16-cmp2$(EXEEXT) \
+	test-u16-cpy-alloc$(EXEEXT) test-u16-cpy$(EXEEXT) \
+	test-u16-mblen$(EXEEXT) test-u16-mbsnlen$(EXEEXT) \
+	test-u16-mbtouc$(EXEEXT) test-u16-mbtouc-unsafe$(EXEEXT) \
+	test-u16-mbtoucr$(EXEEXT) test-u16-move$(EXEEXT) \
+	test-u16-next$(EXEEXT) test-u16-prev$(EXEEXT) \
+	test-u16-set$(EXEEXT) test-u16-stpcpy$(EXEEXT) \
+	test-u16-stpncpy$(EXEEXT) test-u16-strcat$(EXEEXT) \
+	test-u16-strcmp$(EXEEXT) test-u16-strcoll$(EXEEXT) \
+	test-u16-strcpy$(EXEEXT) test-u16-strdup$(EXEEXT) \
+	test-u16-strlen$(EXEEXT) test-u16-strmblen$(EXEEXT) \
+	test-u16-strmbtouc$(EXEEXT) test-u16-strncat$(EXEEXT) \
+	test-u16-strncmp$(EXEEXT) test-u16-strncpy$(EXEEXT) \
+	test-u16-strnlen$(EXEEXT) test-u16-to-u32$(EXEEXT) \
+	test-u16-to-u8$(EXEEXT) test-u16-uctomb$(EXEEXT) \
+	test-u32-check$(EXEEXT) test-u32-chr$(EXEEXT) \
+	test-u32-cmp$(EXEEXT) test-u32-cmp2$(EXEEXT) \
+	test-u32-cpy-alloc$(EXEEXT) test-u32-cpy$(EXEEXT) \
+	test-u32-mblen$(EXEEXT) test-u32-mbsnlen$(EXEEXT) \
+	test-u32-mbtouc$(EXEEXT) test-u32-mbtouc-unsafe$(EXEEXT) \
+	test-u32-mbtoucr$(EXEEXT) test-u32-move$(EXEEXT) \
+	test-u32-next$(EXEEXT) test-u32-prev$(EXEEXT) \
+	test-u32-set$(EXEEXT) test-u32-stpcpy$(EXEEXT) \
+	test-u32-stpncpy$(EXEEXT) test-u32-strcat$(EXEEXT) \
+	test-u32-strcmp$(EXEEXT) test-u32-strcoll$(EXEEXT) \
+	test-u32-strcpy$(EXEEXT) test-u32-strdup$(EXEEXT) \
+	test-u32-strlen$(EXEEXT) test-u32-strmblen$(EXEEXT) \
+	test-u32-strmbtouc$(EXEEXT) test-u32-strncat$(EXEEXT) \
+	test-u32-strncmp$(EXEEXT) test-u32-strncpy$(EXEEXT) \
+	test-u32-strnlen$(EXEEXT) test-u32-to-u16$(EXEEXT) \
+	test-u32-to-u8$(EXEEXT) test-u32-uctomb$(EXEEXT) \
+	test-u8-check$(EXEEXT) test-u8-chr$(EXEEXT) \
+	test-u8-cmp$(EXEEXT) test-u8-cmp2$(EXEEXT) \
+	test-u8-cpy-alloc$(EXEEXT) test-u8-cpy$(EXEEXT) \
+	test-u8-mblen$(EXEEXT) test-u8-mbsnlen$(EXEEXT) \
+	test-u8-mbtouc$(EXEEXT) test-u8-mbtouc-unsafe$(EXEEXT) \
+	test-u8-mbtoucr$(EXEEXT) test-u8-move$(EXEEXT) \
+	test-u8-next$(EXEEXT) test-u8-prev$(EXEEXT) \
+	test-u8-set$(EXEEXT) test-u8-stpcpy$(EXEEXT) \
+	test-u8-stpncpy$(EXEEXT) test-u8-strcat$(EXEEXT) \
+	test-u8-strcmp$(EXEEXT) test-u8-strcoll$(EXEEXT) \
+	test-u8-strcpy$(EXEEXT) test-u8-strdup$(EXEEXT) \
+	test-u8-strlen$(EXEEXT) test-u8-strmblen$(EXEEXT) \
+	test-u8-strmbtouc$(EXEEXT) test-u8-strncat$(EXEEXT) \
+	test-u8-strncmp$(EXEEXT) test-u8-strncpy$(EXEEXT) \
+	test-u8-strnlen$(EXEEXT) test-u8-to-u16$(EXEEXT) \
+	test-u8-to-u32$(EXEEXT) test-u8-uctomb$(EXEEXT) \
 	test-u16-wordbreaks$(EXEEXT) test-u32-wordbreaks$(EXEEXT) \
 	test-u8-wordbreaks$(EXEEXT) test-ulc-wordbreaks$(EXEEXT) \
 	test-u16-strwidth$(EXEEXT) test-u16-width$(EXEEXT) \
 	test-u32-strwidth$(EXEEXT) test-u32-width$(EXEEXT) \
 	test-u8-strwidth$(EXEEXT) test-u8-width$(EXEEXT) \
 	test-uc_width$(EXEEXT) test-uc_width2$(EXEEXT) \
-	test-wchar$(EXEEXT) test-wctype$(EXEEXT) test-wcwidth$(EXEEXT)
+	test-unsetenv$(EXEEXT) test-wchar$(EXEEXT) \
+	test-wctype$(EXEEXT) test-wcwidth$(EXEEXT) \
+	test-xalloc-die$(EXEEXT)
 @WOE32DLL_FALSE@am__append_1 = test-categ_none
 @WOE32DLL_FALSE@am__append_2 = test-categ_none
 subdir = tests
@@ -420,17 +522,15 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
 	$(top_srcdir)/gnulib-m4/codeset.m4 \
-	$(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
 	$(top_srcdir)/gnulib-m4/error.m4 \
-	$(top_srcdir)/gnulib-m4/exitfail.m4 \
 	$(top_srcdir)/gnulib-m4/exponentd.m4 \
 	$(top_srcdir)/gnulib-m4/exponentf.m4 \
 	$(top_srcdir)/gnulib-m4/exponentl.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
-	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
+	$(top_srcdir)/gnulib-m4/fcntl-o.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fpieee.m4 \
 	$(top_srcdir)/gnulib-m4/frexp.m4 \
@@ -462,6 +562,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
+	$(top_srcdir)/gnulib-m4/lock.m4 \
 	$(top_srcdir)/gnulib-m4/longlong.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
@@ -474,13 +575,12 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/minmax.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/nocrash.m4 \
-	$(top_srcdir)/gnulib-m4/open.m4 \
 	$(top_srcdir)/gnulib-m4/printf-frexp.m4 \
 	$(top_srcdir)/gnulib-m4/printf-frexpl.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
+	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/relocatable-lib.m4 \
 	$(top_srcdir)/gnulib-m4/setenv.m4 \
 	$(top_srcdir)/gnulib-m4/signbit.m4 \
@@ -492,16 +592,21 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/stdlib_h.m4 \
 	$(top_srcdir)/gnulib-m4/strerror.m4 \
 	$(top_srcdir)/gnulib-m4/string_h.m4 \
+	$(top_srcdir)/gnulib-m4/strncat.m4 \
+	$(top_srcdir)/gnulib-m4/thread.m4 \
+	$(top_srcdir)/gnulib-m4/threadlib.m4 \
 	$(top_srcdir)/gnulib-m4/unistd_h.m4 \
 	$(top_srcdir)/gnulib-m4/vasnprintf.m4 \
-	$(top_srcdir)/gnulib-m4/wchar.m4 \
+	$(top_srcdir)/gnulib-m4/warn-on-use.m4 \
+	$(top_srcdir)/gnulib-m4/wchar_h.m4 \
 	$(top_srcdir)/gnulib-m4/wchar_t.m4 \
 	$(top_srcdir)/gnulib-m4/wctob.m4 \
-	$(top_srcdir)/gnulib-m4/wctype.m4 \
+	$(top_srcdir)/gnulib-m4/wctype_h.m4 \
 	$(top_srcdir)/gnulib-m4/wcwidth.m4 \
 	$(top_srcdir)/gnulib-m4/wint_t.m4 \
 	$(top_srcdir)/gnulib-m4/xalloc.m4 \
-	$(top_srcdir)/gnulib-m4/xsize.m4 $(top_srcdir)/m4/exported.m4 \
+	$(top_srcdir)/gnulib-m4/xsize.m4 \
+	$(top_srcdir)/gnulib-m4/yield.m4 $(top_srcdir)/m4/exported.m4 \
 	$(top_srcdir)/m4/init-package-version.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -523,7 +628,9 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 libtests_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
-am_libtests_a_OBJECTS = progname.$(OBJEXT) xalloc-die.$(OBJEXT)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libtests_a_OBJECTS = exitfail.$(OBJEXT) progname.$(OBJEXT) \
+	glthread/thread.$(OBJEXT) xalloc-die.$(OBJEXT)
 libtests_a_OBJECTS = $(am_libtests_a_OBJECTS)
 @WOE32DLL_FALSE@am__EXEEXT_1 = test-categ_none$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
@@ -540,7 +647,6 @@ test_array_mergesort_OBJECTS = test-array-mergesort.$(OBJEXT)
 test_array_mergesort_LDADD = $(LDADD)
 test_array_mergesort_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
-am__dirstamp = $(am__leading_dot)dirstamp
 am_test_bidi_byname_OBJECTS = unictype/test-bidi_byname.$(OBJEXT)
 test_bidi_byname_OBJECTS = $(am_test_bidi_byname_OBJECTS)
 test_bidi_byname_LDADD = $(LDADD)
@@ -930,11 +1036,6 @@ test_digit_OBJECTS = $(am_test_digit_OBJECTS)
 test_digit_LDADD = $(LDADD)
 test_digit_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_dup2_SOURCES = test-dup2.c
-test_dup2_OBJECTS = test-dup2.$(OBJEXT)
-test_dup2_LDADD = $(LDADD)
-test_dup2_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
 test_environ_SOURCES = test-environ.c
 test_environ_OBJECTS = test-environ.$(OBJEXT)
 test_environ_LDADD = $(LDADD)
@@ -945,11 +1046,6 @@ test_errno_OBJECTS = test-errno.$(OBJEXT)
 test_errno_LDADD = $(LDADD)
 test_errno_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
-test_fcntl_SOURCES = test-fcntl.c
-test_fcntl_OBJECTS = test-fcntl.$(OBJEXT)
-test_fcntl_LDADD = $(LDADD)
-test_fcntl_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
 am_test_frexpl_nolibm_OBJECTS = test-frexpl.$(OBJEXT)
 test_frexpl_nolibm_OBJECTS = $(am_test_frexpl_nolibm_OBJECTS)
 test_frexpl_nolibm_LDADD = $(LDADD)
@@ -965,6 +1061,11 @@ test_iconv_OBJECTS = test-iconv.$(OBJEXT)
 am__DEPENDENCIES_2 = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
 test_iconv_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_iconv_h_SOURCES = test-iconv-h.c
+test_iconv_h_OBJECTS = test-iconv-h.$(OBJEXT)
+test_iconv_h_LDADD = $(LDADD)
+test_iconv_h_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_ignorable_OBJECTS = unicase/test-ignorable.$(OBJEXT)
 test_ignorable_OBJECTS = $(am_test_ignorable_OBJECTS)
 test_ignorable_LDADD = $(LDADD)
@@ -997,6 +1098,9 @@ test_locale_language_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_localename_SOURCES = test-localename.c
 test_localename_OBJECTS = test-localename.$(OBJEXT)
 test_localename_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_lock_SOURCES = test-lock.c
+test_lock_OBJECTS = test-lock.$(OBJEXT)
+test_lock_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_malloca_SOURCES = test-malloca.c
 test_malloca_OBJECTS = test-malloca.$(OBJEXT)
 test_malloca_LDADD = $(LDADD)
@@ -1060,11 +1164,6 @@ test_numeric_OBJECTS = $(am_test_numeric_OBJECTS)
 test_numeric_LDADD = $(LDADD)
 test_numeric_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
-test_open_SOURCES = test-open.c
-test_open_OBJECTS = test-open.$(OBJEXT)
-test_open_LDADD = $(LDADD)
-test_open_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
-	$(am__DEPENDENCIES_1)
 am_test_pr_alphabetic_OBJECTS = unictype/test-pr_alphabetic.$(OBJEXT)
 test_pr_alphabetic_OBJECTS = $(am_test_pr_alphabetic_OBJECTS)
 test_pr_alphabetic_LDADD = $(LDADD)
@@ -1580,6 +1679,11 @@ test_scripts_OBJECTS = $(am_test_scripts_OBJECTS)
 test_scripts_LDADD = $(LDADD)
 test_scripts_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_setenv_SOURCES = test-setenv.c
+test_setenv_OBJECTS = test-setenv.$(OBJEXT)
+test_setenv_LDADD = $(LDADD)
+test_setenv_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_signbit_SOURCES = test-signbit.c
 test_signbit_OBJECTS = test-signbit.$(OBJEXT)
 test_signbit_LDADD = $(LDADD)
@@ -1621,6 +1725,11 @@ test_string_OBJECTS = test-string.$(OBJEXT)
 test_string_LDADD = $(LDADD)
 test_string_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_strncat_SOURCES = test-strncat.c
+test_strncat_OBJECTS = test-strncat.$(OBJEXT)
+test_strncat_LDADD = $(LDADD)
+test_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_sy_c_ident_OBJECTS = unictype/test-sy_c_ident.$(OBJEXT)
 test_sy_c_ident_OBJECTS = $(am_test_sy_c_ident_OBJECTS)
 test_sy_c_ident_LDADD = $(LDADD)
@@ -1661,6 +1770,26 @@ test_u16_casefold_OBJECTS = $(am_test_u16_casefold_OBJECTS)
 test_u16_casefold_LDADD = $(LDADD)
 test_u16_casefold_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_check_OBJECTS = unistr/test-u16-check.$(OBJEXT)
+test_u16_check_OBJECTS = $(am_test_u16_check_OBJECTS)
+test_u16_check_LDADD = $(LDADD)
+test_u16_check_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_chr_OBJECTS = unistr/test-u16-chr.$(OBJEXT)
+test_u16_chr_OBJECTS = $(am_test_u16_chr_OBJECTS)
+test_u16_chr_LDADD = $(LDADD)
+test_u16_chr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_cmp_OBJECTS = unistr/test-u16-cmp.$(OBJEXT)
+test_u16_cmp_OBJECTS = $(am_test_u16_cmp_OBJECTS)
+test_u16_cmp_LDADD = $(LDADD)
+test_u16_cmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_cmp2_OBJECTS = unistr/test-u16-cmp2.$(OBJEXT)
+test_u16_cmp2_OBJECTS = $(am_test_u16_cmp2_OBJECTS)
+test_u16_cmp2_LDADD = $(LDADD)
+test_u16_cmp2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u16_conv_from_enc_OBJECTS =  \
 	uniconv/test-u16-conv-from-enc.$(OBJEXT)
 test_u16_conv_from_enc_OBJECTS = $(am_test_u16_conv_from_enc_OBJECTS)
@@ -1669,6 +1798,16 @@ am_test_u16_conv_to_enc_OBJECTS =  \
 	uniconv/test-u16-conv-to-enc.$(OBJEXT)
 test_u16_conv_to_enc_OBJECTS = $(am_test_u16_conv_to_enc_OBJECTS)
 test_u16_conv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_cpy_OBJECTS = unistr/test-u16-cpy.$(OBJEXT)
+test_u16_cpy_OBJECTS = $(am_test_u16_cpy_OBJECTS)
+test_u16_cpy_LDADD = $(LDADD)
+test_u16_cpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_cpy_alloc_OBJECTS = unistr/test-u16-cpy-alloc.$(OBJEXT)
+test_u16_cpy_alloc_OBJECTS = $(am_test_u16_cpy_alloc_OBJECTS)
+test_u16_cpy_alloc_LDADD = $(LDADD)
+test_u16_cpy_alloc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u16_is_cased_OBJECTS = unicase/test-u16-is-cased.$(OBJEXT)
 test_u16_is_cased_OBJECTS = $(am_test_u16_is_cased_OBJECTS)
 test_u16_is_cased_LDADD = $(LDADD)
@@ -1698,6 +1837,42 @@ test_u16_is_uppercase_OBJECTS = $(am_test_u16_is_uppercase_OBJECTS)
 test_u16_is_uppercase_LDADD = $(LDADD)
 test_u16_is_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_mblen_OBJECTS = unistr/test-u16-mblen.$(OBJEXT)
+test_u16_mblen_OBJECTS = $(am_test_u16_mblen_OBJECTS)
+test_u16_mblen_LDADD = $(LDADD)
+test_u16_mblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_mbsnlen_OBJECTS = unistr/test-u16-mbsnlen.$(OBJEXT)
+test_u16_mbsnlen_OBJECTS = $(am_test_u16_mbsnlen_OBJECTS)
+test_u16_mbsnlen_LDADD = $(LDADD)
+test_u16_mbsnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_mbtouc_OBJECTS = unistr/test-u16-mbtouc.$(OBJEXT)
+test_u16_mbtouc_OBJECTS = $(am_test_u16_mbtouc_OBJECTS)
+test_u16_mbtouc_LDADD = $(LDADD)
+test_u16_mbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_mbtouc_unsafe_OBJECTS =  \
+	unistr/test-u16-mbtouc-unsafe.$(OBJEXT)
+test_u16_mbtouc_unsafe_OBJECTS = $(am_test_u16_mbtouc_unsafe_OBJECTS)
+test_u16_mbtouc_unsafe_LDADD = $(LDADD)
+test_u16_mbtouc_unsafe_DEPENDENCIES = libtests.a \
+	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_mbtoucr_OBJECTS = unistr/test-u16-mbtoucr.$(OBJEXT)
+test_u16_mbtoucr_OBJECTS = $(am_test_u16_mbtoucr_OBJECTS)
+test_u16_mbtoucr_LDADD = $(LDADD)
+test_u16_mbtoucr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_move_OBJECTS = unistr/test-u16-move.$(OBJEXT)
+test_u16_move_OBJECTS = $(am_test_u16_move_OBJECTS)
+test_u16_move_LDADD = $(LDADD)
+test_u16_move_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_next_OBJECTS = unistr/test-u16-next.$(OBJEXT)
+test_u16_next_OBJECTS = $(am_test_u16_next_OBJECTS)
+test_u16_next_LDADD = $(LDADD)
+test_u16_next_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u16_normcmp_OBJECTS = uninorm/test-u16-normcmp.$(OBJEXT)
 test_u16_normcmp_OBJECTS = $(am_test_u16_normcmp_OBJECTS)
 test_u16_normcmp_LDADD = $(LDADD)
@@ -1713,6 +1888,39 @@ test_u16_possible_linebreaks_OBJECTS =  \
 test_u16_possible_linebreaks_LDADD = $(LDADD)
 test_u16_possible_linebreaks_DEPENDENCIES = libtests.a \
 	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_prev_OBJECTS = unistr/test-u16-prev.$(OBJEXT)
+test_u16_prev_OBJECTS = $(am_test_u16_prev_OBJECTS)
+test_u16_prev_LDADD = $(LDADD)
+test_u16_prev_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_set_OBJECTS = unistr/test-u16-set.$(OBJEXT)
+test_u16_set_OBJECTS = $(am_test_u16_set_OBJECTS)
+test_u16_set_LDADD = $(LDADD)
+test_u16_set_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_stpcpy_OBJECTS = unistr/test-u16-stpcpy.$(OBJEXT)
+test_u16_stpcpy_OBJECTS = $(am_test_u16_stpcpy_OBJECTS)
+test_u16_stpcpy_LDADD = $(LDADD)
+test_u16_stpcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_stpncpy_OBJECTS = unistr/test-u16-stpncpy.$(OBJEXT)
+test_u16_stpncpy_OBJECTS = $(am_test_u16_stpncpy_OBJECTS)
+test_u16_stpncpy_LDADD = $(LDADD)
+test_u16_stpncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strcat_OBJECTS = unistr/test-u16-strcat.$(OBJEXT)
+test_u16_strcat_OBJECTS = $(am_test_u16_strcat_OBJECTS)
+test_u16_strcat_LDADD = $(LDADD)
+test_u16_strcat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strcmp_OBJECTS = unistr/test-u16-strcmp.$(OBJEXT)
+test_u16_strcmp_OBJECTS = $(am_test_u16_strcmp_OBJECTS)
+test_u16_strcmp_LDADD = $(LDADD)
+test_u16_strcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strcoll_OBJECTS = unistr/test-u16-strcoll.$(OBJEXT)
+test_u16_strcoll_OBJECTS = $(am_test_u16_strcoll_OBJECTS)
+test_u16_strcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_strconv_from_enc_OBJECTS =  \
 	uniconv/test-u16-strconv-from-enc.$(OBJEXT)
 test_u16_strconv_from_enc_OBJECTS =  \
@@ -1723,11 +1931,66 @@ am_test_u16_strconv_to_enc_OBJECTS =  \
 test_u16_strconv_to_enc_OBJECTS =  \
 	$(am_test_u16_strconv_to_enc_OBJECTS)
 test_u16_strconv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u16_strcpy_OBJECTS = unistr/test-u16-strcpy.$(OBJEXT)
+test_u16_strcpy_OBJECTS = $(am_test_u16_strcpy_OBJECTS)
+test_u16_strcpy_LDADD = $(LDADD)
+test_u16_strcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strdup_OBJECTS = unistr/test-u16-strdup.$(OBJEXT)
+test_u16_strdup_OBJECTS = $(am_test_u16_strdup_OBJECTS)
+test_u16_strdup_LDADD = $(LDADD)
+test_u16_strdup_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strlen_OBJECTS = unistr/test-u16-strlen.$(OBJEXT)
+test_u16_strlen_OBJECTS = $(am_test_u16_strlen_OBJECTS)
+test_u16_strlen_LDADD = $(LDADD)
+test_u16_strlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strmblen_OBJECTS = unistr/test-u16-strmblen.$(OBJEXT)
+test_u16_strmblen_OBJECTS = $(am_test_u16_strmblen_OBJECTS)
+test_u16_strmblen_LDADD = $(LDADD)
+test_u16_strmblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strmbtouc_OBJECTS = unistr/test-u16-strmbtouc.$(OBJEXT)
+test_u16_strmbtouc_OBJECTS = $(am_test_u16_strmbtouc_OBJECTS)
+test_u16_strmbtouc_LDADD = $(LDADD)
+test_u16_strmbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strncat_OBJECTS = unistr/test-u16-strncat.$(OBJEXT)
+test_u16_strncat_OBJECTS = $(am_test_u16_strncat_OBJECTS)
+test_u16_strncat_LDADD = $(LDADD)
+test_u16_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strncmp_OBJECTS = unistr/test-u16-strncmp.$(OBJEXT)
+test_u16_strncmp_OBJECTS = $(am_test_u16_strncmp_OBJECTS)
+test_u16_strncmp_LDADD = $(LDADD)
+test_u16_strncmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strncpy_OBJECTS = unistr/test-u16-strncpy.$(OBJEXT)
+test_u16_strncpy_OBJECTS = $(am_test_u16_strncpy_OBJECTS)
+test_u16_strncpy_LDADD = $(LDADD)
+test_u16_strncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_strnlen_OBJECTS = unistr/test-u16-strnlen.$(OBJEXT)
+test_u16_strnlen_OBJECTS = $(am_test_u16_strnlen_OBJECTS)
+test_u16_strnlen_LDADD = $(LDADD)
+test_u16_strnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u16_strwidth_OBJECTS = uniwidth/test-u16-strwidth.$(OBJEXT)
 test_u16_strwidth_OBJECTS = $(am_test_u16_strwidth_OBJECTS)
 test_u16_strwidth_LDADD = $(LDADD)
 test_u16_strwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_to_u32_OBJECTS = unistr/test-u16-to-u32.$(OBJEXT)
+test_u16_to_u32_OBJECTS = $(am_test_u16_to_u32_OBJECTS)
+test_u16_to_u32_LDADD = $(LDADD)
+test_u16_to_u32_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_to_u8_OBJECTS = unistr/test-u16-to-u8.$(OBJEXT)
+test_u16_to_u8_OBJECTS = $(am_test_u16_to_u8_OBJECTS)
+test_u16_to_u8_LDADD = $(LDADD)
+test_u16_to_u8_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u16_tolower_OBJECTS = unicase/test-u16-tolower.$(OBJEXT)
 test_u16_tolower_OBJECTS = $(am_test_u16_tolower_OBJECTS)
 test_u16_tolower_LDADD = $(LDADD)
@@ -1743,6 +2006,11 @@ test_u16_toupper_OBJECTS = $(am_test_u16_toupper_OBJECTS)
 test_u16_toupper_LDADD = $(LDADD)
 test_u16_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u16_uctomb_OBJECTS = unistr/test-u16-uctomb.$(OBJEXT)
+test_u16_uctomb_OBJECTS = $(am_test_u16_uctomb_OBJECTS)
+test_u16_uctomb_LDADD = $(LDADD)
+test_u16_uctomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u16_vasnprintf1_OBJECTS =  \
 	unistdio/test-u16-vasnprintf1.$(OBJEXT)
 test_u16_vasnprintf1_OBJECTS = $(am_test_u16_vasnprintf1_OBJECTS)
@@ -1801,6 +2069,26 @@ test_u32_casefold_OBJECTS = $(am_test_u32_casefold_OBJECTS)
 test_u32_casefold_LDADD = $(LDADD)
 test_u32_casefold_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_check_OBJECTS = unistr/test-u32-check.$(OBJEXT)
+test_u32_check_OBJECTS = $(am_test_u32_check_OBJECTS)
+test_u32_check_LDADD = $(LDADD)
+test_u32_check_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_chr_OBJECTS = unistr/test-u32-chr.$(OBJEXT)
+test_u32_chr_OBJECTS = $(am_test_u32_chr_OBJECTS)
+test_u32_chr_LDADD = $(LDADD)
+test_u32_chr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_cmp_OBJECTS = unistr/test-u32-cmp.$(OBJEXT)
+test_u32_cmp_OBJECTS = $(am_test_u32_cmp_OBJECTS)
+test_u32_cmp_LDADD = $(LDADD)
+test_u32_cmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_cmp2_OBJECTS = unistr/test-u32-cmp2.$(OBJEXT)
+test_u32_cmp2_OBJECTS = $(am_test_u32_cmp2_OBJECTS)
+test_u32_cmp2_LDADD = $(LDADD)
+test_u32_cmp2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u32_conv_from_enc_OBJECTS =  \
 	uniconv/test-u32-conv-from-enc.$(OBJEXT)
 test_u32_conv_from_enc_OBJECTS = $(am_test_u32_conv_from_enc_OBJECTS)
@@ -1809,6 +2097,16 @@ am_test_u32_conv_to_enc_OBJECTS =  \
 	uniconv/test-u32-conv-to-enc.$(OBJEXT)
 test_u32_conv_to_enc_OBJECTS = $(am_test_u32_conv_to_enc_OBJECTS)
 test_u32_conv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_cpy_OBJECTS = unistr/test-u32-cpy.$(OBJEXT)
+test_u32_cpy_OBJECTS = $(am_test_u32_cpy_OBJECTS)
+test_u32_cpy_LDADD = $(LDADD)
+test_u32_cpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_cpy_alloc_OBJECTS = unistr/test-u32-cpy-alloc.$(OBJEXT)
+test_u32_cpy_alloc_OBJECTS = $(am_test_u32_cpy_alloc_OBJECTS)
+test_u32_cpy_alloc_LDADD = $(LDADD)
+test_u32_cpy_alloc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u32_is_cased_OBJECTS = unicase/test-u32-is-cased.$(OBJEXT)
 test_u32_is_cased_OBJECTS = $(am_test_u32_is_cased_OBJECTS)
 test_u32_is_cased_LDADD = $(LDADD)
@@ -1838,6 +2136,42 @@ test_u32_is_uppercase_OBJECTS = $(am_test_u32_is_uppercase_OBJECTS)
 test_u32_is_uppercase_LDADD = $(LDADD)
 test_u32_is_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_mblen_OBJECTS = unistr/test-u32-mblen.$(OBJEXT)
+test_u32_mblen_OBJECTS = $(am_test_u32_mblen_OBJECTS)
+test_u32_mblen_LDADD = $(LDADD)
+test_u32_mblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_mbsnlen_OBJECTS = unistr/test-u32-mbsnlen.$(OBJEXT)
+test_u32_mbsnlen_OBJECTS = $(am_test_u32_mbsnlen_OBJECTS)
+test_u32_mbsnlen_LDADD = $(LDADD)
+test_u32_mbsnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_mbtouc_OBJECTS = unistr/test-u32-mbtouc.$(OBJEXT)
+test_u32_mbtouc_OBJECTS = $(am_test_u32_mbtouc_OBJECTS)
+test_u32_mbtouc_LDADD = $(LDADD)
+test_u32_mbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_mbtouc_unsafe_OBJECTS =  \
+	unistr/test-u32-mbtouc-unsafe.$(OBJEXT)
+test_u32_mbtouc_unsafe_OBJECTS = $(am_test_u32_mbtouc_unsafe_OBJECTS)
+test_u32_mbtouc_unsafe_LDADD = $(LDADD)
+test_u32_mbtouc_unsafe_DEPENDENCIES = libtests.a \
+	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_mbtoucr_OBJECTS = unistr/test-u32-mbtoucr.$(OBJEXT)
+test_u32_mbtoucr_OBJECTS = $(am_test_u32_mbtoucr_OBJECTS)
+test_u32_mbtoucr_LDADD = $(LDADD)
+test_u32_mbtoucr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_move_OBJECTS = unistr/test-u32-move.$(OBJEXT)
+test_u32_move_OBJECTS = $(am_test_u32_move_OBJECTS)
+test_u32_move_LDADD = $(LDADD)
+test_u32_move_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_next_OBJECTS = unistr/test-u32-next.$(OBJEXT)
+test_u32_next_OBJECTS = $(am_test_u32_next_OBJECTS)
+test_u32_next_LDADD = $(LDADD)
+test_u32_next_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u32_nfc_big_OBJECTS = uninorm/test-u32-nfc-big.$(OBJEXT) \
 	uninorm/test-u32-normalize-big.$(OBJEXT)
 test_u32_nfc_big_OBJECTS = $(am_test_u32_nfc_big_OBJECTS)
@@ -1869,6 +2203,39 @@ test_u32_possible_linebreaks_OBJECTS =  \
 test_u32_possible_linebreaks_LDADD = $(LDADD)
 test_u32_possible_linebreaks_DEPENDENCIES = libtests.a \
 	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_prev_OBJECTS = unistr/test-u32-prev.$(OBJEXT)
+test_u32_prev_OBJECTS = $(am_test_u32_prev_OBJECTS)
+test_u32_prev_LDADD = $(LDADD)
+test_u32_prev_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_set_OBJECTS = unistr/test-u32-set.$(OBJEXT)
+test_u32_set_OBJECTS = $(am_test_u32_set_OBJECTS)
+test_u32_set_LDADD = $(LDADD)
+test_u32_set_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_stpcpy_OBJECTS = unistr/test-u32-stpcpy.$(OBJEXT)
+test_u32_stpcpy_OBJECTS = $(am_test_u32_stpcpy_OBJECTS)
+test_u32_stpcpy_LDADD = $(LDADD)
+test_u32_stpcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_stpncpy_OBJECTS = unistr/test-u32-stpncpy.$(OBJEXT)
+test_u32_stpncpy_OBJECTS = $(am_test_u32_stpncpy_OBJECTS)
+test_u32_stpncpy_LDADD = $(LDADD)
+test_u32_stpncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strcat_OBJECTS = unistr/test-u32-strcat.$(OBJEXT)
+test_u32_strcat_OBJECTS = $(am_test_u32_strcat_OBJECTS)
+test_u32_strcat_LDADD = $(LDADD)
+test_u32_strcat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strcmp_OBJECTS = unistr/test-u32-strcmp.$(OBJEXT)
+test_u32_strcmp_OBJECTS = $(am_test_u32_strcmp_OBJECTS)
+test_u32_strcmp_LDADD = $(LDADD)
+test_u32_strcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strcoll_OBJECTS = unistr/test-u32-strcoll.$(OBJEXT)
+test_u32_strcoll_OBJECTS = $(am_test_u32_strcoll_OBJECTS)
+test_u32_strcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_strconv_from_enc_OBJECTS =  \
 	uniconv/test-u32-strconv-from-enc.$(OBJEXT)
 test_u32_strconv_from_enc_OBJECTS =  \
@@ -1879,11 +2246,66 @@ am_test_u32_strconv_to_enc_OBJECTS =  \
 test_u32_strconv_to_enc_OBJECTS =  \
 	$(am_test_u32_strconv_to_enc_OBJECTS)
 test_u32_strconv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u32_strcpy_OBJECTS = unistr/test-u32-strcpy.$(OBJEXT)
+test_u32_strcpy_OBJECTS = $(am_test_u32_strcpy_OBJECTS)
+test_u32_strcpy_LDADD = $(LDADD)
+test_u32_strcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strdup_OBJECTS = unistr/test-u32-strdup.$(OBJEXT)
+test_u32_strdup_OBJECTS = $(am_test_u32_strdup_OBJECTS)
+test_u32_strdup_LDADD = $(LDADD)
+test_u32_strdup_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strlen_OBJECTS = unistr/test-u32-strlen.$(OBJEXT)
+test_u32_strlen_OBJECTS = $(am_test_u32_strlen_OBJECTS)
+test_u32_strlen_LDADD = $(LDADD)
+test_u32_strlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strmblen_OBJECTS = unistr/test-u32-strmblen.$(OBJEXT)
+test_u32_strmblen_OBJECTS = $(am_test_u32_strmblen_OBJECTS)
+test_u32_strmblen_LDADD = $(LDADD)
+test_u32_strmblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strmbtouc_OBJECTS = unistr/test-u32-strmbtouc.$(OBJEXT)
+test_u32_strmbtouc_OBJECTS = $(am_test_u32_strmbtouc_OBJECTS)
+test_u32_strmbtouc_LDADD = $(LDADD)
+test_u32_strmbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strncat_OBJECTS = unistr/test-u32-strncat.$(OBJEXT)
+test_u32_strncat_OBJECTS = $(am_test_u32_strncat_OBJECTS)
+test_u32_strncat_LDADD = $(LDADD)
+test_u32_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strncmp_OBJECTS = unistr/test-u32-strncmp.$(OBJEXT)
+test_u32_strncmp_OBJECTS = $(am_test_u32_strncmp_OBJECTS)
+test_u32_strncmp_LDADD = $(LDADD)
+test_u32_strncmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strncpy_OBJECTS = unistr/test-u32-strncpy.$(OBJEXT)
+test_u32_strncpy_OBJECTS = $(am_test_u32_strncpy_OBJECTS)
+test_u32_strncpy_LDADD = $(LDADD)
+test_u32_strncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_strnlen_OBJECTS = unistr/test-u32-strnlen.$(OBJEXT)
+test_u32_strnlen_OBJECTS = $(am_test_u32_strnlen_OBJECTS)
+test_u32_strnlen_LDADD = $(LDADD)
+test_u32_strnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u32_strwidth_OBJECTS = uniwidth/test-u32-strwidth.$(OBJEXT)
 test_u32_strwidth_OBJECTS = $(am_test_u32_strwidth_OBJECTS)
 test_u32_strwidth_LDADD = $(LDADD)
 test_u32_strwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_to_u16_OBJECTS = unistr/test-u32-to-u16.$(OBJEXT)
+test_u32_to_u16_OBJECTS = $(am_test_u32_to_u16_OBJECTS)
+test_u32_to_u16_LDADD = $(LDADD)
+test_u32_to_u16_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_to_u8_OBJECTS = unistr/test-u32-to-u8.$(OBJEXT)
+test_u32_to_u8_OBJECTS = $(am_test_u32_to_u8_OBJECTS)
+test_u32_to_u8_LDADD = $(LDADD)
+test_u32_to_u8_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u32_tolower_OBJECTS = unicase/test-u32-tolower.$(OBJEXT)
 test_u32_tolower_OBJECTS = $(am_test_u32_tolower_OBJECTS)
 test_u32_tolower_LDADD = $(LDADD)
@@ -1899,6 +2321,11 @@ test_u32_toupper_OBJECTS = $(am_test_u32_toupper_OBJECTS)
 test_u32_toupper_LDADD = $(LDADD)
 test_u32_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u32_uctomb_OBJECTS = unistr/test-u32-uctomb.$(OBJEXT)
+test_u32_uctomb_OBJECTS = $(am_test_u32_uctomb_OBJECTS)
+test_u32_uctomb_LDADD = $(LDADD)
+test_u32_uctomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u32_vasnprintf1_OBJECTS =  \
 	unistdio/test-u32-vasnprintf1.$(OBJEXT)
 test_u32_vasnprintf1_OBJECTS = $(am_test_u32_vasnprintf1_OBJECTS)
@@ -1956,6 +2383,26 @@ test_u8_casefold_OBJECTS = $(am_test_u8_casefold_OBJECTS)
 test_u8_casefold_LDADD = $(LDADD)
 test_u8_casefold_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_check_OBJECTS = unistr/test-u8-check.$(OBJEXT)
+test_u8_check_OBJECTS = $(am_test_u8_check_OBJECTS)
+test_u8_check_LDADD = $(LDADD)
+test_u8_check_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_chr_OBJECTS = unistr/test-u8-chr.$(OBJEXT)
+test_u8_chr_OBJECTS = $(am_test_u8_chr_OBJECTS)
+test_u8_chr_LDADD = $(LDADD)
+test_u8_chr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_cmp_OBJECTS = unistr/test-u8-cmp.$(OBJEXT)
+test_u8_cmp_OBJECTS = $(am_test_u8_cmp_OBJECTS)
+test_u8_cmp_LDADD = $(LDADD)
+test_u8_cmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_cmp2_OBJECTS = unistr/test-u8-cmp2.$(OBJEXT)
+test_u8_cmp2_OBJECTS = $(am_test_u8_cmp2_OBJECTS)
+test_u8_cmp2_LDADD = $(LDADD)
+test_u8_cmp2_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u8_conv_from_enc_OBJECTS =  \
 	uniconv/test-u8-conv-from-enc.$(OBJEXT)
 test_u8_conv_from_enc_OBJECTS = $(am_test_u8_conv_from_enc_OBJECTS)
@@ -1964,6 +2411,16 @@ am_test_u8_conv_to_enc_OBJECTS =  \
 	uniconv/test-u8-conv-to-enc.$(OBJEXT)
 test_u8_conv_to_enc_OBJECTS = $(am_test_u8_conv_to_enc_OBJECTS)
 test_u8_conv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_cpy_OBJECTS = unistr/test-u8-cpy.$(OBJEXT)
+test_u8_cpy_OBJECTS = $(am_test_u8_cpy_OBJECTS)
+test_u8_cpy_LDADD = $(LDADD)
+test_u8_cpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_cpy_alloc_OBJECTS = unistr/test-u8-cpy-alloc.$(OBJEXT)
+test_u8_cpy_alloc_OBJECTS = $(am_test_u8_cpy_alloc_OBJECTS)
+test_u8_cpy_alloc_LDADD = $(LDADD)
+test_u8_cpy_alloc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u8_is_cased_OBJECTS = unicase/test-u8-is-cased.$(OBJEXT)
 test_u8_is_cased_OBJECTS = $(am_test_u8_is_cased_OBJECTS)
 test_u8_is_cased_LDADD = $(LDADD)
@@ -1993,6 +2450,42 @@ test_u8_is_uppercase_OBJECTS = $(am_test_u8_is_uppercase_OBJECTS)
 test_u8_is_uppercase_LDADD = $(LDADD)
 test_u8_is_uppercase_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_mblen_OBJECTS = unistr/test-u8-mblen.$(OBJEXT)
+test_u8_mblen_OBJECTS = $(am_test_u8_mblen_OBJECTS)
+test_u8_mblen_LDADD = $(LDADD)
+test_u8_mblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_mbsnlen_OBJECTS = unistr/test-u8-mbsnlen.$(OBJEXT)
+test_u8_mbsnlen_OBJECTS = $(am_test_u8_mbsnlen_OBJECTS)
+test_u8_mbsnlen_LDADD = $(LDADD)
+test_u8_mbsnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_mbtouc_OBJECTS = unistr/test-u8-mbtouc.$(OBJEXT)
+test_u8_mbtouc_OBJECTS = $(am_test_u8_mbtouc_OBJECTS)
+test_u8_mbtouc_LDADD = $(LDADD)
+test_u8_mbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_mbtouc_unsafe_OBJECTS =  \
+	unistr/test-u8-mbtouc-unsafe.$(OBJEXT)
+test_u8_mbtouc_unsafe_OBJECTS = $(am_test_u8_mbtouc_unsafe_OBJECTS)
+test_u8_mbtouc_unsafe_LDADD = $(LDADD)
+test_u8_mbtouc_unsafe_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_mbtoucr_OBJECTS = unistr/test-u8-mbtoucr.$(OBJEXT)
+test_u8_mbtoucr_OBJECTS = $(am_test_u8_mbtoucr_OBJECTS)
+test_u8_mbtoucr_LDADD = $(LDADD)
+test_u8_mbtoucr_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_move_OBJECTS = unistr/test-u8-move.$(OBJEXT)
+test_u8_move_OBJECTS = $(am_test_u8_move_OBJECTS)
+test_u8_move_LDADD = $(LDADD)
+test_u8_move_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_next_OBJECTS = unistr/test-u8-next.$(OBJEXT)
+test_u8_next_OBJECTS = $(am_test_u8_next_OBJECTS)
+test_u8_next_LDADD = $(LDADD)
+test_u8_next_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u8_normcmp_OBJECTS = uninorm/test-u8-normcmp.$(OBJEXT)
 test_u8_normcmp_OBJECTS = $(am_test_u8_normcmp_OBJECTS)
 test_u8_normcmp_LDADD = $(LDADD)
@@ -2008,6 +2501,39 @@ test_u8_possible_linebreaks_OBJECTS =  \
 test_u8_possible_linebreaks_LDADD = $(LDADD)
 test_u8_possible_linebreaks_DEPENDENCIES = libtests.a \
 	../lib/libunistring.la libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_prev_OBJECTS = unistr/test-u8-prev.$(OBJEXT)
+test_u8_prev_OBJECTS = $(am_test_u8_prev_OBJECTS)
+test_u8_prev_LDADD = $(LDADD)
+test_u8_prev_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_set_OBJECTS = unistr/test-u8-set.$(OBJEXT)
+test_u8_set_OBJECTS = $(am_test_u8_set_OBJECTS)
+test_u8_set_LDADD = $(LDADD)
+test_u8_set_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_stpcpy_OBJECTS = unistr/test-u8-stpcpy.$(OBJEXT)
+test_u8_stpcpy_OBJECTS = $(am_test_u8_stpcpy_OBJECTS)
+test_u8_stpcpy_LDADD = $(LDADD)
+test_u8_stpcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_stpncpy_OBJECTS = unistr/test-u8-stpncpy.$(OBJEXT)
+test_u8_stpncpy_OBJECTS = $(am_test_u8_stpncpy_OBJECTS)
+test_u8_stpncpy_LDADD = $(LDADD)
+test_u8_stpncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strcat_OBJECTS = unistr/test-u8-strcat.$(OBJEXT)
+test_u8_strcat_OBJECTS = $(am_test_u8_strcat_OBJECTS)
+test_u8_strcat_LDADD = $(LDADD)
+test_u8_strcat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strcmp_OBJECTS = unistr/test-u8-strcmp.$(OBJEXT)
+test_u8_strcmp_OBJECTS = $(am_test_u8_strcmp_OBJECTS)
+test_u8_strcmp_LDADD = $(LDADD)
+test_u8_strcmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strcoll_OBJECTS = unistr/test-u8-strcoll.$(OBJEXT)
+test_u8_strcoll_OBJECTS = $(am_test_u8_strcoll_OBJECTS)
+test_u8_strcoll_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_strconv_from_enc_OBJECTS =  \
 	uniconv/test-u8-strconv-from-enc.$(OBJEXT)
 test_u8_strconv_from_enc_OBJECTS =  \
@@ -2017,11 +2543,66 @@ am_test_u8_strconv_to_enc_OBJECTS =  \
 	uniconv/test-u8-strconv-to-enc.$(OBJEXT)
 test_u8_strconv_to_enc_OBJECTS = $(am_test_u8_strconv_to_enc_OBJECTS)
 test_u8_strconv_to_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_u8_strcpy_OBJECTS = unistr/test-u8-strcpy.$(OBJEXT)
+test_u8_strcpy_OBJECTS = $(am_test_u8_strcpy_OBJECTS)
+test_u8_strcpy_LDADD = $(LDADD)
+test_u8_strcpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strdup_OBJECTS = unistr/test-u8-strdup.$(OBJEXT)
+test_u8_strdup_OBJECTS = $(am_test_u8_strdup_OBJECTS)
+test_u8_strdup_LDADD = $(LDADD)
+test_u8_strdup_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strlen_OBJECTS = unistr/test-u8-strlen.$(OBJEXT)
+test_u8_strlen_OBJECTS = $(am_test_u8_strlen_OBJECTS)
+test_u8_strlen_LDADD = $(LDADD)
+test_u8_strlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strmblen_OBJECTS = unistr/test-u8-strmblen.$(OBJEXT)
+test_u8_strmblen_OBJECTS = $(am_test_u8_strmblen_OBJECTS)
+test_u8_strmblen_LDADD = $(LDADD)
+test_u8_strmblen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strmbtouc_OBJECTS = unistr/test-u8-strmbtouc.$(OBJEXT)
+test_u8_strmbtouc_OBJECTS = $(am_test_u8_strmbtouc_OBJECTS)
+test_u8_strmbtouc_LDADD = $(LDADD)
+test_u8_strmbtouc_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strncat_OBJECTS = unistr/test-u8-strncat.$(OBJEXT)
+test_u8_strncat_OBJECTS = $(am_test_u8_strncat_OBJECTS)
+test_u8_strncat_LDADD = $(LDADD)
+test_u8_strncat_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strncmp_OBJECTS = unistr/test-u8-strncmp.$(OBJEXT)
+test_u8_strncmp_OBJECTS = $(am_test_u8_strncmp_OBJECTS)
+test_u8_strncmp_LDADD = $(LDADD)
+test_u8_strncmp_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strncpy_OBJECTS = unistr/test-u8-strncpy.$(OBJEXT)
+test_u8_strncpy_OBJECTS = $(am_test_u8_strncpy_OBJECTS)
+test_u8_strncpy_LDADD = $(LDADD)
+test_u8_strncpy_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_strnlen_OBJECTS = unistr/test-u8-strnlen.$(OBJEXT)
+test_u8_strnlen_OBJECTS = $(am_test_u8_strnlen_OBJECTS)
+test_u8_strnlen_LDADD = $(LDADD)
+test_u8_strnlen_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u8_strwidth_OBJECTS = uniwidth/test-u8-strwidth.$(OBJEXT)
 test_u8_strwidth_OBJECTS = $(am_test_u8_strwidth_OBJECTS)
 test_u8_strwidth_LDADD = $(LDADD)
 test_u8_strwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_to_u16_OBJECTS = unistr/test-u8-to-u16.$(OBJEXT)
+test_u8_to_u16_OBJECTS = $(am_test_u8_to_u16_OBJECTS)
+test_u8_to_u16_LDADD = $(LDADD)
+test_u8_to_u16_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_to_u32_OBJECTS = unistr/test-u8-to-u32.$(OBJEXT)
+test_u8_to_u32_OBJECTS = $(am_test_u8_to_u32_OBJECTS)
+test_u8_to_u32_LDADD = $(LDADD)
+test_u8_to_u32_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u8_tolower_OBJECTS = unicase/test-u8-tolower.$(OBJEXT)
 test_u8_tolower_OBJECTS = $(am_test_u8_tolower_OBJECTS)
 test_u8_tolower_LDADD = $(LDADD)
@@ -2037,6 +2618,11 @@ test_u8_toupper_OBJECTS = $(am_test_u8_toupper_OBJECTS)
 test_u8_toupper_LDADD = $(LDADD)
 test_u8_toupper_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+am_test_u8_uctomb_OBJECTS = unistr/test-u8-uctomb.$(OBJEXT)
+test_u8_uctomb_OBJECTS = $(am_test_u8_uctomb_OBJECTS)
+test_u8_uctomb_LDADD = $(LDADD)
+test_u8_uctomb_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 am_test_u8_vasnprintf1_OBJECTS =  \
 	unistdio/test-u8-vasnprintf1.$(OBJEXT)
 test_u8_vasnprintf1_OBJECTS = $(am_test_u8_vasnprintf1_OBJECTS)
@@ -2162,6 +2748,11 @@ test_unistd_OBJECTS = test-unistd.$(OBJEXT)
 test_unistd_LDADD = $(LDADD)
 test_unistd_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_unsetenv_SOURCES = test-unsetenv.c
+test_unsetenv_OBJECTS = test-unsetenv.$(OBJEXT)
+test_unsetenv_LDADD = $(LDADD)
+test_unsetenv_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_wchar_SOURCES = test-wchar.c
 test_wchar_OBJECTS = test-wchar.$(OBJEXT)
 test_wchar_LDADD = $(LDADD)
@@ -2177,6 +2768,9 @@ test_wcwidth_OBJECTS = test-wcwidth.$(OBJEXT)
 test_wcwidth_LDADD = $(LDADD)
 test_wcwidth_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_xalloc_die_SOURCES = test-xalloc-die.c
+test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT)
+test_xalloc_die_DEPENDENCIES = $(am__DEPENDENCIES_2)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -2238,16 +2832,15 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ctype_space_SOURCES) $(test_ctype_upper_SOURCES) \
 	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
 	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
-	$(test_digit_SOURCES) test-dup2.c test-environ.c test-errno.c \
-	test-fcntl.c $(test_frexpl_nolibm_SOURCES) test-fseterr.c \
-	test-iconv.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
+	$(test_digit_SOURCES) test-environ.c test-errno.c \
+	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-iconv.c \
+	test-iconv-h.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
 	test-isnanf-nolibm.c test-isnanl-nolibm.c test-locale.c \
-	$(test_locale_language_SOURCES) test-localename.c \
+	$(test_locale_language_SOURCES) test-localename.c test-lock.c \
 	test-malloca.c test-math.c test-mbrtowc.c test-mbsinit.c \
 	test-memchr.c $(test_mirror_SOURCES) $(test_nfc_SOURCES) \
 	$(test_nfd_SOURCES) $(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
-	$(test_numeric_SOURCES) test-open.c \
-	$(test_pr_alphabetic_SOURCES) \
+	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -2312,66 +2905,111 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_white_space_SOURCES) $(test_pr_xid_continue_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
-	$(test_scripts_SOURCES) test-signbit.c test-stdbool.c \
-	test-stddef.c test-stdint.c test-stdlib.c test-strerror.c \
-	test-striconveh.c test-striconveha.c test-string.c \
-	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
-	$(test_sy_java_ident_SOURCES) \
+	$(test_scripts_SOURCES) test-setenv.c test-signbit.c \
+	test-stdbool.c test-stddef.c test-stdint.c test-stdlib.c \
+	test-strerror.c test-striconveh.c test-striconveha.c \
+	test-string.c test-strncat.c $(test_sy_c_ident_SOURCES) \
+	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
+	$(test_u16_check_SOURCES) $(test_u16_chr_SOURCES) \
+	$(test_u16_cmp_SOURCES) $(test_u16_cmp2_SOURCES) \
 	$(test_u16_conv_from_enc_SOURCES) \
-	$(test_u16_conv_to_enc_SOURCES) $(test_u16_is_cased_SOURCES) \
+	$(test_u16_conv_to_enc_SOURCES) $(test_u16_cpy_SOURCES) \
+	$(test_u16_cpy_alloc_SOURCES) $(test_u16_is_cased_SOURCES) \
 	$(test_u16_is_casefolded_SOURCES) \
 	$(test_u16_is_lowercase_SOURCES) \
 	$(test_u16_is_titlecase_SOURCES) \
-	$(test_u16_is_uppercase_SOURCES) $(test_u16_normcmp_SOURCES) \
-	$(test_u16_normcoll_SOURCES) \
+	$(test_u16_is_uppercase_SOURCES) $(test_u16_mblen_SOURCES) \
+	$(test_u16_mbsnlen_SOURCES) $(test_u16_mbtouc_SOURCES) \
+	$(test_u16_mbtouc_unsafe_SOURCES) $(test_u16_mbtoucr_SOURCES) \
+	$(test_u16_move_SOURCES) $(test_u16_next_SOURCES) \
+	$(test_u16_normcmp_SOURCES) $(test_u16_normcoll_SOURCES) \
 	$(test_u16_possible_linebreaks_SOURCES) \
+	$(test_u16_prev_SOURCES) $(test_u16_set_SOURCES) \
+	$(test_u16_stpcpy_SOURCES) $(test_u16_stpncpy_SOURCES) \
+	$(test_u16_strcat_SOURCES) $(test_u16_strcmp_SOURCES) \
+	$(test_u16_strcoll_SOURCES) \
 	$(test_u16_strconv_from_enc_SOURCES) \
-	$(test_u16_strconv_to_enc_SOURCES) \
-	$(test_u16_strwidth_SOURCES) $(test_u16_tolower_SOURCES) \
+	$(test_u16_strconv_to_enc_SOURCES) $(test_u16_strcpy_SOURCES) \
+	$(test_u16_strdup_SOURCES) $(test_u16_strlen_SOURCES) \
+	$(test_u16_strmblen_SOURCES) $(test_u16_strmbtouc_SOURCES) \
+	$(test_u16_strncat_SOURCES) $(test_u16_strncmp_SOURCES) \
+	$(test_u16_strncpy_SOURCES) $(test_u16_strnlen_SOURCES) \
+	$(test_u16_strwidth_SOURCES) $(test_u16_to_u32_SOURCES) \
+	$(test_u16_to_u8_SOURCES) $(test_u16_tolower_SOURCES) \
 	$(test_u16_totitle_SOURCES) $(test_u16_toupper_SOURCES) \
-	$(test_u16_vasnprintf1_SOURCES) \
+	$(test_u16_uctomb_SOURCES) $(test_u16_vasnprintf1_SOURCES) \
 	$(test_u16_vasnprintf2_SOURCES) \
 	$(test_u16_vasnprintf3_SOURCES) $(test_u16_vasprintf1_SOURCES) \
 	$(test_u16_vsnprintf1_SOURCES) $(test_u16_vsprintf1_SOURCES) \
 	$(test_u16_width_SOURCES) $(test_u16_width_linebreaks_SOURCES) \
 	$(test_u16_wordbreaks_SOURCES) $(test_u32_asnprintf1_SOURCES) \
 	$(test_u32_casecmp_SOURCES) $(test_u32_casecoll_SOURCES) \
-	$(test_u32_casefold_SOURCES) $(test_u32_conv_from_enc_SOURCES) \
-	$(test_u32_conv_to_enc_SOURCES) $(test_u32_is_cased_SOURCES) \
+	$(test_u32_casefold_SOURCES) $(test_u32_check_SOURCES) \
+	$(test_u32_chr_SOURCES) $(test_u32_cmp_SOURCES) \
+	$(test_u32_cmp2_SOURCES) $(test_u32_conv_from_enc_SOURCES) \
+	$(test_u32_conv_to_enc_SOURCES) $(test_u32_cpy_SOURCES) \
+	$(test_u32_cpy_alloc_SOURCES) $(test_u32_is_cased_SOURCES) \
 	$(test_u32_is_casefolded_SOURCES) \
 	$(test_u32_is_lowercase_SOURCES) \
 	$(test_u32_is_titlecase_SOURCES) \
-	$(test_u32_is_uppercase_SOURCES) $(test_u32_nfc_big_SOURCES) \
-	$(test_u32_nfd_big_SOURCES) $(test_u32_nfkc_big_SOURCES) \
-	$(test_u32_nfkd_big_SOURCES) $(test_u32_normcmp_SOURCES) \
-	$(test_u32_normcoll_SOURCES) \
+	$(test_u32_is_uppercase_SOURCES) $(test_u32_mblen_SOURCES) \
+	$(test_u32_mbsnlen_SOURCES) $(test_u32_mbtouc_SOURCES) \
+	$(test_u32_mbtouc_unsafe_SOURCES) $(test_u32_mbtoucr_SOURCES) \
+	$(test_u32_move_SOURCES) $(test_u32_next_SOURCES) \
+	$(test_u32_nfc_big_SOURCES) $(test_u32_nfd_big_SOURCES) \
+	$(test_u32_nfkc_big_SOURCES) $(test_u32_nfkd_big_SOURCES) \
+	$(test_u32_normcmp_SOURCES) $(test_u32_normcoll_SOURCES) \
 	$(test_u32_possible_linebreaks_SOURCES) \
+	$(test_u32_prev_SOURCES) $(test_u32_set_SOURCES) \
+	$(test_u32_stpcpy_SOURCES) $(test_u32_stpncpy_SOURCES) \
+	$(test_u32_strcat_SOURCES) $(test_u32_strcmp_SOURCES) \
+	$(test_u32_strcoll_SOURCES) \
 	$(test_u32_strconv_from_enc_SOURCES) \
-	$(test_u32_strconv_to_enc_SOURCES) \
-	$(test_u32_strwidth_SOURCES) $(test_u32_tolower_SOURCES) \
+	$(test_u32_strconv_to_enc_SOURCES) $(test_u32_strcpy_SOURCES) \
+	$(test_u32_strdup_SOURCES) $(test_u32_strlen_SOURCES) \
+	$(test_u32_strmblen_SOURCES) $(test_u32_strmbtouc_SOURCES) \
+	$(test_u32_strncat_SOURCES) $(test_u32_strncmp_SOURCES) \
+	$(test_u32_strncpy_SOURCES) $(test_u32_strnlen_SOURCES) \
+	$(test_u32_strwidth_SOURCES) $(test_u32_to_u16_SOURCES) \
+	$(test_u32_to_u8_SOURCES) $(test_u32_tolower_SOURCES) \
 	$(test_u32_totitle_SOURCES) $(test_u32_toupper_SOURCES) \
-	$(test_u32_vasnprintf1_SOURCES) \
+	$(test_u32_uctomb_SOURCES) $(test_u32_vasnprintf1_SOURCES) \
 	$(test_u32_vasnprintf2_SOURCES) \
 	$(test_u32_vasnprintf3_SOURCES) $(test_u32_vasprintf1_SOURCES) \
 	$(test_u32_vsnprintf1_SOURCES) $(test_u32_vsprintf1_SOURCES) \
 	$(test_u32_width_SOURCES) $(test_u32_width_linebreaks_SOURCES) \
 	$(test_u32_wordbreaks_SOURCES) $(test_u8_asnprintf1_SOURCES) \
 	$(test_u8_casecmp_SOURCES) $(test_u8_casecoll_SOURCES) \
-	$(test_u8_casefold_SOURCES) $(test_u8_conv_from_enc_SOURCES) \
-	$(test_u8_conv_to_enc_SOURCES) $(test_u8_is_cased_SOURCES) \
+	$(test_u8_casefold_SOURCES) $(test_u8_check_SOURCES) \
+	$(test_u8_chr_SOURCES) $(test_u8_cmp_SOURCES) \
+	$(test_u8_cmp2_SOURCES) $(test_u8_conv_from_enc_SOURCES) \
+	$(test_u8_conv_to_enc_SOURCES) $(test_u8_cpy_SOURCES) \
+	$(test_u8_cpy_alloc_SOURCES) $(test_u8_is_cased_SOURCES) \
 	$(test_u8_is_casefolded_SOURCES) \
 	$(test_u8_is_lowercase_SOURCES) \
 	$(test_u8_is_titlecase_SOURCES) \
-	$(test_u8_is_uppercase_SOURCES) $(test_u8_normcmp_SOURCES) \
-	$(test_u8_normcoll_SOURCES) \
-	$(test_u8_possible_linebreaks_SOURCES) \
+	$(test_u8_is_uppercase_SOURCES) $(test_u8_mblen_SOURCES) \
+	$(test_u8_mbsnlen_SOURCES) $(test_u8_mbtouc_SOURCES) \
+	$(test_u8_mbtouc_unsafe_SOURCES) $(test_u8_mbtoucr_SOURCES) \
+	$(test_u8_move_SOURCES) $(test_u8_next_SOURCES) \
+	$(test_u8_normcmp_SOURCES) $(test_u8_normcoll_SOURCES) \
+	$(test_u8_possible_linebreaks_SOURCES) $(test_u8_prev_SOURCES) \
+	$(test_u8_set_SOURCES) $(test_u8_stpcpy_SOURCES) \
+	$(test_u8_stpncpy_SOURCES) $(test_u8_strcat_SOURCES) \
+	$(test_u8_strcmp_SOURCES) $(test_u8_strcoll_SOURCES) \
 	$(test_u8_strconv_from_enc_SOURCES) \
-	$(test_u8_strconv_to_enc_SOURCES) $(test_u8_strwidth_SOURCES) \
-	$(test_u8_tolower_SOURCES) $(test_u8_totitle_SOURCES) \
-	$(test_u8_toupper_SOURCES) $(test_u8_vasnprintf1_SOURCES) \
+	$(test_u8_strconv_to_enc_SOURCES) $(test_u8_strcpy_SOURCES) \
+	$(test_u8_strdup_SOURCES) $(test_u8_strlen_SOURCES) \
+	$(test_u8_strmblen_SOURCES) $(test_u8_strmbtouc_SOURCES) \
+	$(test_u8_strncat_SOURCES) $(test_u8_strncmp_SOURCES) \
+	$(test_u8_strncpy_SOURCES) $(test_u8_strnlen_SOURCES) \
+	$(test_u8_strwidth_SOURCES) $(test_u8_to_u16_SOURCES) \
+	$(test_u8_to_u32_SOURCES) $(test_u8_tolower_SOURCES) \
+	$(test_u8_totitle_SOURCES) $(test_u8_toupper_SOURCES) \
+	$(test_u8_uctomb_SOURCES) $(test_u8_vasnprintf1_SOURCES) \
 	$(test_u8_vasnprintf2_SOURCES) $(test_u8_vasnprintf3_SOURCES) \
 	$(test_u8_vasprintf1_SOURCES) $(test_u8_vsnprintf1_SOURCES) \
 	$(test_u8_vsprintf1_SOURCES) $(test_u8_width_SOURCES) \
@@ -2388,8 +3026,9 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ulc_vsnprintf1_SOURCES) $(test_ulc_vsprintf1_SOURCES) \
 	$(test_ulc_width_linebreaks_SOURCES) \
 	$(test_ulc_wordbreaks_SOURCES) $(test_uninames_SOURCES) \
-	$(test_uninorm_filter_nfc_SOURCES) test-unistd.c test-wchar.c \
-	test-wctype.c test-wcwidth.c
+	$(test_uninorm_filter_nfc_SOURCES) test-unistd.c \
+	test-unsetenv.c test-wchar.c test-wctype.c test-wcwidth.c \
+	test-xalloc-die.c
 DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-alloca-opt.c test-array-mergesort.c \
 	$(test_bidi_byname_SOURCES) $(test_bidi_name_SOURCES) \
@@ -2429,16 +3068,15 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ctype_space_SOURCES) $(test_ctype_upper_SOURCES) \
 	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
 	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
-	$(test_digit_SOURCES) test-dup2.c test-environ.c test-errno.c \
-	test-fcntl.c $(test_frexpl_nolibm_SOURCES) test-fseterr.c \
-	test-iconv.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
+	$(test_digit_SOURCES) test-environ.c test-errno.c \
+	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-iconv.c \
+	test-iconv-h.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
 	test-isnanf-nolibm.c test-isnanl-nolibm.c test-locale.c \
-	$(test_locale_language_SOURCES) test-localename.c \
+	$(test_locale_language_SOURCES) test-localename.c test-lock.c \
 	test-malloca.c test-math.c test-mbrtowc.c test-mbsinit.c \
 	test-memchr.c $(test_mirror_SOURCES) $(test_nfc_SOURCES) \
 	$(test_nfd_SOURCES) $(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
-	$(test_numeric_SOURCES) test-open.c \
-	$(test_pr_alphabetic_SOURCES) \
+	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -2503,66 +3141,111 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_white_space_SOURCES) $(test_pr_xid_continue_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
-	$(test_scripts_SOURCES) test-signbit.c test-stdbool.c \
-	test-stddef.c test-stdint.c test-stdlib.c test-strerror.c \
-	test-striconveh.c test-striconveha.c test-string.c \
-	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
-	$(test_sy_java_ident_SOURCES) \
+	$(test_scripts_SOURCES) test-setenv.c test-signbit.c \
+	test-stdbool.c test-stddef.c test-stdint.c test-stdlib.c \
+	test-strerror.c test-striconveh.c test-striconveha.c \
+	test-string.c test-strncat.c $(test_sy_c_ident_SOURCES) \
+	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
+	$(test_u16_check_SOURCES) $(test_u16_chr_SOURCES) \
+	$(test_u16_cmp_SOURCES) $(test_u16_cmp2_SOURCES) \
 	$(test_u16_conv_from_enc_SOURCES) \
-	$(test_u16_conv_to_enc_SOURCES) $(test_u16_is_cased_SOURCES) \
+	$(test_u16_conv_to_enc_SOURCES) $(test_u16_cpy_SOURCES) \
+	$(test_u16_cpy_alloc_SOURCES) $(test_u16_is_cased_SOURCES) \
 	$(test_u16_is_casefolded_SOURCES) \
 	$(test_u16_is_lowercase_SOURCES) \
 	$(test_u16_is_titlecase_SOURCES) \
-	$(test_u16_is_uppercase_SOURCES) $(test_u16_normcmp_SOURCES) \
-	$(test_u16_normcoll_SOURCES) \
+	$(test_u16_is_uppercase_SOURCES) $(test_u16_mblen_SOURCES) \
+	$(test_u16_mbsnlen_SOURCES) $(test_u16_mbtouc_SOURCES) \
+	$(test_u16_mbtouc_unsafe_SOURCES) $(test_u16_mbtoucr_SOURCES) \
+	$(test_u16_move_SOURCES) $(test_u16_next_SOURCES) \
+	$(test_u16_normcmp_SOURCES) $(test_u16_normcoll_SOURCES) \
 	$(test_u16_possible_linebreaks_SOURCES) \
+	$(test_u16_prev_SOURCES) $(test_u16_set_SOURCES) \
+	$(test_u16_stpcpy_SOURCES) $(test_u16_stpncpy_SOURCES) \
+	$(test_u16_strcat_SOURCES) $(test_u16_strcmp_SOURCES) \
+	$(test_u16_strcoll_SOURCES) \
 	$(test_u16_strconv_from_enc_SOURCES) \
-	$(test_u16_strconv_to_enc_SOURCES) \
-	$(test_u16_strwidth_SOURCES) $(test_u16_tolower_SOURCES) \
+	$(test_u16_strconv_to_enc_SOURCES) $(test_u16_strcpy_SOURCES) \
+	$(test_u16_strdup_SOURCES) $(test_u16_strlen_SOURCES) \
+	$(test_u16_strmblen_SOURCES) $(test_u16_strmbtouc_SOURCES) \
+	$(test_u16_strncat_SOURCES) $(test_u16_strncmp_SOURCES) \
+	$(test_u16_strncpy_SOURCES) $(test_u16_strnlen_SOURCES) \
+	$(test_u16_strwidth_SOURCES) $(test_u16_to_u32_SOURCES) \
+	$(test_u16_to_u8_SOURCES) $(test_u16_tolower_SOURCES) \
 	$(test_u16_totitle_SOURCES) $(test_u16_toupper_SOURCES) \
-	$(test_u16_vasnprintf1_SOURCES) \
+	$(test_u16_uctomb_SOURCES) $(test_u16_vasnprintf1_SOURCES) \
 	$(test_u16_vasnprintf2_SOURCES) \
 	$(test_u16_vasnprintf3_SOURCES) $(test_u16_vasprintf1_SOURCES) \
 	$(test_u16_vsnprintf1_SOURCES) $(test_u16_vsprintf1_SOURCES) \
 	$(test_u16_width_SOURCES) $(test_u16_width_linebreaks_SOURCES) \
 	$(test_u16_wordbreaks_SOURCES) $(test_u32_asnprintf1_SOURCES) \
 	$(test_u32_casecmp_SOURCES) $(test_u32_casecoll_SOURCES) \
-	$(test_u32_casefold_SOURCES) $(test_u32_conv_from_enc_SOURCES) \
-	$(test_u32_conv_to_enc_SOURCES) $(test_u32_is_cased_SOURCES) \
+	$(test_u32_casefold_SOURCES) $(test_u32_check_SOURCES) \
+	$(test_u32_chr_SOURCES) $(test_u32_cmp_SOURCES) \
+	$(test_u32_cmp2_SOURCES) $(test_u32_conv_from_enc_SOURCES) \
+	$(test_u32_conv_to_enc_SOURCES) $(test_u32_cpy_SOURCES) \
+	$(test_u32_cpy_alloc_SOURCES) $(test_u32_is_cased_SOURCES) \
 	$(test_u32_is_casefolded_SOURCES) \
 	$(test_u32_is_lowercase_SOURCES) \
 	$(test_u32_is_titlecase_SOURCES) \
-	$(test_u32_is_uppercase_SOURCES) $(test_u32_nfc_big_SOURCES) \
-	$(test_u32_nfd_big_SOURCES) $(test_u32_nfkc_big_SOURCES) \
-	$(test_u32_nfkd_big_SOURCES) $(test_u32_normcmp_SOURCES) \
-	$(test_u32_normcoll_SOURCES) \
+	$(test_u32_is_uppercase_SOURCES) $(test_u32_mblen_SOURCES) \
+	$(test_u32_mbsnlen_SOURCES) $(test_u32_mbtouc_SOURCES) \
+	$(test_u32_mbtouc_unsafe_SOURCES) $(test_u32_mbtoucr_SOURCES) \
+	$(test_u32_move_SOURCES) $(test_u32_next_SOURCES) \
+	$(test_u32_nfc_big_SOURCES) $(test_u32_nfd_big_SOURCES) \
+	$(test_u32_nfkc_big_SOURCES) $(test_u32_nfkd_big_SOURCES) \
+	$(test_u32_normcmp_SOURCES) $(test_u32_normcoll_SOURCES) \
 	$(test_u32_possible_linebreaks_SOURCES) \
+	$(test_u32_prev_SOURCES) $(test_u32_set_SOURCES) \
+	$(test_u32_stpcpy_SOURCES) $(test_u32_stpncpy_SOURCES) \
+	$(test_u32_strcat_SOURCES) $(test_u32_strcmp_SOURCES) \
+	$(test_u32_strcoll_SOURCES) \
 	$(test_u32_strconv_from_enc_SOURCES) \
-	$(test_u32_strconv_to_enc_SOURCES) \
-	$(test_u32_strwidth_SOURCES) $(test_u32_tolower_SOURCES) \
+	$(test_u32_strconv_to_enc_SOURCES) $(test_u32_strcpy_SOURCES) \
+	$(test_u32_strdup_SOURCES) $(test_u32_strlen_SOURCES) \
+	$(test_u32_strmblen_SOURCES) $(test_u32_strmbtouc_SOURCES) \
+	$(test_u32_strncat_SOURCES) $(test_u32_strncmp_SOURCES) \
+	$(test_u32_strncpy_SOURCES) $(test_u32_strnlen_SOURCES) \
+	$(test_u32_strwidth_SOURCES) $(test_u32_to_u16_SOURCES) \
+	$(test_u32_to_u8_SOURCES) $(test_u32_tolower_SOURCES) \
 	$(test_u32_totitle_SOURCES) $(test_u32_toupper_SOURCES) \
-	$(test_u32_vasnprintf1_SOURCES) \
+	$(test_u32_uctomb_SOURCES) $(test_u32_vasnprintf1_SOURCES) \
 	$(test_u32_vasnprintf2_SOURCES) \
 	$(test_u32_vasnprintf3_SOURCES) $(test_u32_vasprintf1_SOURCES) \
 	$(test_u32_vsnprintf1_SOURCES) $(test_u32_vsprintf1_SOURCES) \
 	$(test_u32_width_SOURCES) $(test_u32_width_linebreaks_SOURCES) \
 	$(test_u32_wordbreaks_SOURCES) $(test_u8_asnprintf1_SOURCES) \
 	$(test_u8_casecmp_SOURCES) $(test_u8_casecoll_SOURCES) \
-	$(test_u8_casefold_SOURCES) $(test_u8_conv_from_enc_SOURCES) \
-	$(test_u8_conv_to_enc_SOURCES) $(test_u8_is_cased_SOURCES) \
+	$(test_u8_casefold_SOURCES) $(test_u8_check_SOURCES) \
+	$(test_u8_chr_SOURCES) $(test_u8_cmp_SOURCES) \
+	$(test_u8_cmp2_SOURCES) $(test_u8_conv_from_enc_SOURCES) \
+	$(test_u8_conv_to_enc_SOURCES) $(test_u8_cpy_SOURCES) \
+	$(test_u8_cpy_alloc_SOURCES) $(test_u8_is_cased_SOURCES) \
 	$(test_u8_is_casefolded_SOURCES) \
 	$(test_u8_is_lowercase_SOURCES) \
 	$(test_u8_is_titlecase_SOURCES) \
-	$(test_u8_is_uppercase_SOURCES) $(test_u8_normcmp_SOURCES) \
-	$(test_u8_normcoll_SOURCES) \
-	$(test_u8_possible_linebreaks_SOURCES) \
+	$(test_u8_is_uppercase_SOURCES) $(test_u8_mblen_SOURCES) \
+	$(test_u8_mbsnlen_SOURCES) $(test_u8_mbtouc_SOURCES) \
+	$(test_u8_mbtouc_unsafe_SOURCES) $(test_u8_mbtoucr_SOURCES) \
+	$(test_u8_move_SOURCES) $(test_u8_next_SOURCES) \
+	$(test_u8_normcmp_SOURCES) $(test_u8_normcoll_SOURCES) \
+	$(test_u8_possible_linebreaks_SOURCES) $(test_u8_prev_SOURCES) \
+	$(test_u8_set_SOURCES) $(test_u8_stpcpy_SOURCES) \
+	$(test_u8_stpncpy_SOURCES) $(test_u8_strcat_SOURCES) \
+	$(test_u8_strcmp_SOURCES) $(test_u8_strcoll_SOURCES) \
 	$(test_u8_strconv_from_enc_SOURCES) \
-	$(test_u8_strconv_to_enc_SOURCES) $(test_u8_strwidth_SOURCES) \
-	$(test_u8_tolower_SOURCES) $(test_u8_totitle_SOURCES) \
-	$(test_u8_toupper_SOURCES) $(test_u8_vasnprintf1_SOURCES) \
+	$(test_u8_strconv_to_enc_SOURCES) $(test_u8_strcpy_SOURCES) \
+	$(test_u8_strdup_SOURCES) $(test_u8_strlen_SOURCES) \
+	$(test_u8_strmblen_SOURCES) $(test_u8_strmbtouc_SOURCES) \
+	$(test_u8_strncat_SOURCES) $(test_u8_strncmp_SOURCES) \
+	$(test_u8_strncpy_SOURCES) $(test_u8_strnlen_SOURCES) \
+	$(test_u8_strwidth_SOURCES) $(test_u8_to_u16_SOURCES) \
+	$(test_u8_to_u32_SOURCES) $(test_u8_tolower_SOURCES) \
+	$(test_u8_totitle_SOURCES) $(test_u8_toupper_SOURCES) \
+	$(test_u8_uctomb_SOURCES) $(test_u8_vasnprintf1_SOURCES) \
 	$(test_u8_vasnprintf2_SOURCES) $(test_u8_vasnprintf3_SOURCES) \
 	$(test_u8_vasprintf1_SOURCES) $(test_u8_vsnprintf1_SOURCES) \
 	$(test_u8_vsprintf1_SOURCES) $(test_u8_width_SOURCES) \
@@ -2579,8 +3262,9 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ulc_vsnprintf1_SOURCES) $(test_ulc_vsprintf1_SOURCES) \
 	$(test_ulc_width_linebreaks_SOURCES) \
 	$(test_ulc_wordbreaks_SOURCES) $(test_uninames_SOURCES) \
-	$(test_uninorm_filter_nfc_SOURCES) test-unistd.c test-wchar.c \
-	test-wctype.c test-wcwidth.c
+	$(test_uninorm_filter_nfc_SOURCES) test-unistd.c \
+	test-unsetenv.c test-wchar.c test-wctype.c test-wcwidth.c \
+	test-xalloc-die.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -2680,22 +3364,31 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
 EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 ERRNO_H = @ERRNO_H@
 EXEEXT = @EXEEXT@
-FCNTL_H = @FCNTL_H@
 FGREP = @FGREP@
 FLOAT_H = @FLOAT_H@
 GLIBC21 = @GLIBC21@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
+GNULIB_ACOSL = @GNULIB_ACOSL@
+GNULIB_ASINL = @GNULIB_ASINL@
+GNULIB_ATANL = @GNULIB_ATANL@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
+GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
 GNULIB_CEILF = @GNULIB_CEILF@
 GNULIB_CEILL = @GNULIB_CEILL@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
+GNULIB_COSL = @GNULIB_COSL@
 GNULIB_DUP2 = @GNULIB_DUP2@
+GNULIB_DUP3 = @GNULIB_DUP3@
+GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_EXPL = @GNULIB_EXPL@
+GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
+GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FLOORF = @GNULIB_FLOORF@
 GNULIB_FLOORL = @GNULIB_FLOORL@
 GNULIB_FREXP = @GNULIB_FREXP@
@@ -2705,12 +3398,15 @@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
 GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
+GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
 GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
 GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
+GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
+GNULIB_GRANTPT = @GNULIB_GRANTPT@
 GNULIB_ISFINITE = @GNULIB_ISFINITE@
 GNULIB_ISINF = @GNULIB_ISINF@
 GNULIB_ISNAN = @GNULIB_ISNAN@
@@ -2720,9 +3416,11 @@ GNULIB_ISNANL = @GNULIB_ISNANL@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LDEXPL = @GNULIB_LDEXPL@
 GNULIB_LINK = @GNULIB_LINK@
+GNULIB_LINKAT = @GNULIB_LINKAT@
+GNULIB_LOGB = @GNULIB_LOGB@
+GNULIB_LOGL = @GNULIB_LOGL@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
-GNULIB_MATHL = @GNULIB_MATHL@
 GNULIB_MBRLEN = @GNULIB_MBRLEN@
 GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
 GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
@@ -2747,26 +3445,37 @@ GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
 GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
 GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
+GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
+GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
-GNULIB_OPEN = @GNULIB_OPEN@
+GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
+GNULIB_PIPE2 = @GNULIB_PIPE2@
+GNULIB_PREAD = @GNULIB_PREAD@
+GNULIB_PTSNAME = @GNULIB_PTSNAME@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
 GNULIB_READLINK = @GNULIB_READLINK@
+GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
+GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_RMDIR = @GNULIB_RMDIR@
 GNULIB_ROUND = @GNULIB_ROUND@
 GNULIB_ROUNDF = @GNULIB_ROUNDF@
 GNULIB_ROUNDL = @GNULIB_ROUNDL@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SETENV = @GNULIB_SETENV@
 GNULIB_SIGNBIT = @GNULIB_SIGNBIT@
+GNULIB_SINL = @GNULIB_SINL@
 GNULIB_SLEEP = @GNULIB_SLEEP@
+GNULIB_SQRTL = @GNULIB_SQRTL@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
 GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
 GNULIB_STRDUP = @GNULIB_STRDUP@
 GNULIB_STRERROR = @GNULIB_STRERROR@
+GNULIB_STRNCAT = @GNULIB_STRNCAT@
 GNULIB_STRNDUP = @GNULIB_STRNDUP@
 GNULIB_STRNLEN = @GNULIB_STRNLEN@
 GNULIB_STRPBRK = @GNULIB_STRPBRK@
@@ -2778,12 +3487,20 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
+GNULIB_SYMLINK = @GNULIB_SYMLINK@
+GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
+GNULIB_TANL = @GNULIB_TANL@
 GNULIB_TRUNC = @GNULIB_TRUNC@
 GNULIB_TRUNCF = @GNULIB_TRUNCF@
 GNULIB_TRUNCL = @GNULIB_TRUNCL@
+GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
 GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
+GNULIB_UNLINK = @GNULIB_UNLINK@
+GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
+GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
 GNULIB_UNSETENV = @GNULIB_UNSETENV@
+GNULIB_USLEEP = @GNULIB_USLEEP@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
@@ -2791,26 +3508,41 @@ GNULIB_WCTOB = @GNULIB_WCTOB@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GNULIB_WRITE = @GNULIB_WRITE@
 GREP = @GREP@
+HAVE_ACOSL = @HAVE_ACOSL@
+HAVE_ASINL = @HAVE_ASINL@
+HAVE_ATANL = @HAVE_ATANL@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
 HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
+HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CHOWN = @HAVE_CHOWN@
+HAVE_COSL = @HAVE_COSL@
 HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@
 HAVE_DECL_ASINL = @HAVE_DECL_ASINL@
 HAVE_DECL_ATANL = @HAVE_DECL_ATANL@
+HAVE_DECL_CEILF = @HAVE_DECL_CEILF@
+HAVE_DECL_CEILL = @HAVE_DECL_CEILL@
 HAVE_DECL_COSL = @HAVE_DECL_COSL@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_EXPL = @HAVE_DECL_EXPL@
+HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@
+HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@
 HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
+HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
+HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
 HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@
+HAVE_DECL_LOGB = @HAVE_DECL_LOGB@
 HAVE_DECL_LOGL = @HAVE_DECL_LOGL@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
+HAVE_DECL_ROUND = @HAVE_DECL_ROUND@
+HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@
+HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@
 HAVE_DECL_SINL = @HAVE_DECL_SINL@
 HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
-HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
 HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
 HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
@@ -2818,52 +3550,77 @@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
 HAVE_DECL_TANL = @HAVE_DECL_TANL@
 HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@
 HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@
+HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DUP2 = @HAVE_DUP2@
+HAVE_DUP3 = @HAVE_DUP3@
+HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_EXPL = @HAVE_EXPL@
+HAVE_FACCESSAT = @HAVE_FACCESSAT@
+HAVE_FCHDIR = @HAVE_FCHDIR@
+HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
 HAVE_FSYNC = @HAVE_FSYNC@
 HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
 HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
+HAVE_GETGROUPS = @HAVE_GETGROUPS@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
+HAVE_GETLOGIN = @HAVE_GETLOGIN@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
-HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
+HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISNAND = @HAVE_ISNAND@
 HAVE_ISNANF = @HAVE_ISNANF@
 HAVE_ISNANL = @HAVE_ISNANL@
+HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LCHOWN = @HAVE_LCHOWN@
 HAVE_LINK = @HAVE_LINK@
+HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOGL = @HAVE_LOGL@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
+HAVE_MBSLEN = @HAVE_MBSLEN@
 HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
+HAVE_MEMCHR = @HAVE_MEMCHR@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
+HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
+HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
+HAVE_MKSTEMP = @HAVE_MKSTEMP@
+HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_OS_H = @HAVE_OS_H@
+HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_PREAD = @HAVE_PREAD@
+HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
+HAVE_READLINKAT = @HAVE_READLINKAT@
 HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
+HAVE_REALPATH = @HAVE_REALPATH@
 HAVE_RPMATCH = @HAVE_RPMATCH@
 HAVE_SETENV = @HAVE_SETENV@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
 HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
+HAVE_SINL = @HAVE_SINL@
 HAVE_SLEEP = @HAVE_SLEEP@
+HAVE_SQRTL = @HAVE_SQRTL@
 HAVE_STDINT_H = @HAVE_STDINT_H@
 HAVE_STPCPY = @HAVE_STPCPY@
 HAVE_STPNCPY = @HAVE_STPNCPY@
 HAVE_STRCASESTR = @HAVE_STRCASESTR@
 HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
-HAVE_STRNDUP = @HAVE_STRNDUP@
 HAVE_STRPBRK = @HAVE_STRPBRK@
 HAVE_STRSEP = @HAVE_STRSEP@
 HAVE_STRTOD = @HAVE_STRTOD@
@@ -2871,14 +3628,21 @@ HAVE_STRTOLL = @HAVE_STRTOLL@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
+HAVE_SYMLINK = @HAVE_SYMLINK@
+HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TANL = @HAVE_TANL@
+HAVE_TTYNAME_R = @HAVE_TTYNAME_R@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNLINKAT = @HAVE_UNLINKAT@
+HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
+HAVE_USLEEP = @HAVE_USLEEP@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
@@ -2886,6 +3650,7 @@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
 HAVE_WINT_T = @HAVE_WINT_T@
+HAVE_XLOCALE_H = @HAVE_XLOCALE_H@
 HAVE__BOOL = @HAVE__BOOL@
 HEXVERSION = @HEXVERSION@
 ICONV_H = @ICONV_H@
@@ -2901,27 +3666,32 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
 LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
 LIBS = @LIBS@
 LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@
+LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
-LOCALE_H = @LOCALE_H@
 LOCALE_JA = @LOCALE_JA@
 LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@
 LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
 LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NAMESPACING = @NAMESPACING@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
-NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
@@ -2934,7 +3704,6 @@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
-NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
@@ -2967,17 +3736,21 @@ RANLIB = @RANLIB@
 RC = @RC@
 RELOCATABLE = @RELOCATABLE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
+REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
-REPLACE_FCHDIR = @REPLACE_FCHDIR@
+REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FLOORF = @REPLACE_FLOORF@
 REPLACE_FLOORL = @REPLACE_FLOORL@
 REPLACE_FREXP = @REPLACE_FREXP@
 REPLACE_FREXPL = @REPLACE_FREXPL@
 REPLACE_GETCWD = @REPLACE_GETCWD@
+REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
 REPLACE_ICONV = @REPLACE_ICONV@
@@ -2989,6 +3762,8 @@ REPLACE_ISNAN = @REPLACE_ISNAN@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LDEXPL = @REPLACE_LDEXPL@
+REPLACE_LINK = @REPLACE_LINK@
+REPLACE_LINKAT = @REPLACE_LINKAT@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
@@ -3001,20 +3776,36 @@ REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_NAN = @REPLACE_NAN@
 REPLACE_NULL = @REPLACE_NULL@
-REPLACE_OPEN = @REPLACE_OPEN@
+REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PUTENV = @REPLACE_PUTENV@
+REPLACE_READLINK = @REPLACE_READLINK@
+REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_ROUND = @REPLACE_ROUND@
 REPLACE_ROUNDF = @REPLACE_ROUNDF@
 REPLACE_ROUNDL = @REPLACE_ROUNDL@
+REPLACE_SETENV = @REPLACE_SETENV@
 REPLACE_SIGNBIT = @REPLACE_SIGNBIT@
 REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@
+REPLACE_SLEEP = @REPLACE_SLEEP@
+REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
+REPLACE_STRNCAT = @REPLACE_STRNCAT@
+REPLACE_STRNDUP = @REPLACE_STRNDUP@
+REPLACE_STRNLEN = @REPLACE_STRNLEN@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
+REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
+REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_TRUNCL = @REPLACE_TRUNCL@
+REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
+REPLACE_UNLINK = @REPLACE_UNLINK@
+REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
+REPLACE_UNSETENV = @REPLACE_UNSETENV@
+REPLACE_USLEEP = @REPLACE_USLEEP@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
@@ -3031,14 +3822,13 @@ STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
 TEXI2DVI = @TEXI2DVI@
+UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
 VERSION = @VERSION@
-VOID_UNSETENV = @VOID_UNSETENV@
-WCHAR_H = @WCHAR_H@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WCTYPE_H = @WCTYPE_H@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
+YIELD_LIB = @YIELD_LIB@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -3066,6 +3856,7 @@ gl_LIBOBJS = @gl_LIBOBJS@
 gl_LTLIBOBJS = @gl_LTLIBOBJS@
 gltests_LIBOBJS = @gltests_LIBOBJS@
 gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
+gltests_WITNESS = @gltests_WITNESS@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -3097,528 +3888,692 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # Rules generated and collected by gnulib-tool.
-AUTOMAKE_OPTIONS = 1.5 foreign 1.11 subdir-objects color-tests
-SUBDIRS = 
+AUTOMAKE_OPTIONS = 1.5 foreign subdir-objects 1.11 subdir-objects \
+	color-tests
+SUBDIRS = .
 
 # The test suite uses the 'localcharset' module.
 
 # This must be the last thing that gets added to TESTS_ENVIRONMENT.
-TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' EXEEXT='@EXEEXT@' \
+TESTS_ENVIRONMENT = EXEEXT='@EXEEXT@' srcdir='$(srcdir)' \
+	LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' \
 	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
 	LOCALE_JA='@LOCALE_JA@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' \
-	EXEEXT='@EXEEXT@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-	EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
 	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' \
 	LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' \
-	LOCALE_ZH_CN='@LOCALE_ZH_CN@' EXEEXT='@EXEEXT@' \
-	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-	EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' EXEEXT='@EXEEXT@' \
-	srcdir='$(srcdir)' EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' EXEEXT='@EXEEXT@' \
-	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-	EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' \
-	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' EXEEXT='@EXEEXT@' \
-	LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
-	EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' EXEEXT='@EXEEXT@' \
+	LOCALE_ZH_CN='@LOCALE_ZH_CN@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
+	LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_FR='@LOCALE_FR@' \
 	@LOCALCHARSET_TESTS_ENVIRONMENT@ $(SHELL) \
 	$(top_srcdir)/build-aux/run-test '$(CHECKER)'
 noinst_HEADERS = 
 noinst_LIBRARIES = 
 check_LIBRARIES = libtests.a
-EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c test-c-ctype.c \
+EXTRA_DIST = test-alloca-opt.c $(top_srcdir)/build-aux/arg-nonnull.h \
+	test-array-mergesort.c macros.h \
+	$(top_srcdir)/build-aux/c++defs.h test-c-ctype.c macros.h \
 	test-c-strcase.sh test-c-strcasecmp.c test-c-strncasecmp.c \
-	test-dup2.c test-environ.c test-errno.c error.c error.h \
-	exitfail.c exitfail.h fcntl.in.h test-fcntl.c test-frexpl.c \
-	test-fseterr.c test-iconv.c intprops.h test-isnand-nolibm.c \
-	test-isnand.h nan.h test-isnanf-nolibm.c test-isnanf.h nan.h \
-	test-isnanl-nolibm.c test-isnanl.h nan.h locale.in.h \
-	test-locale.c test-localename.c test-malloca.c test-math.c \
-	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
-	test-mbrtowc4.sh test-mbrtowc.c test-mbsinit.sh test-mbsinit.c \
-	test-memchr.c zerosize-ptr.h open.c test-open.c \
-	test-printf-frexp.c test-printf-frexpl.c setenv.c \
-	test-signbit.c test-stdbool.c test-stddef.c test-stdint.c \
-	test-stdlib.c strerror.c test-strerror.c test-striconveh.c \
-	test-striconveha.c test-string.c unicase/test-cased.c \
-	unicase/test-predicate-part1.h unicase/test-predicate-part2.h \
+	macros.h test-environ.c test-errno.c error.c error.h \
+	exitfail.h test-frexpl.c signature.h macros.h test-fseterr.c \
+	getpagesize.c test-iconv-h.c test-iconv.c signature.h macros.h \
+	intprops.h test-isnand-nolibm.c test-isnand.h nan.h macros.h \
+	test-isnanf-nolibm.c test-isnanf.h nan.h macros.h \
+	test-isnanl-nolibm.c test-isnanl.h nan.h macros.h locale.in.h \
+	test-locale.c test-localename.c macros.h test-lock.c \
+	test-malloca.c test-math.c test-mbrtowc1.sh test-mbrtowc2.sh \
+	test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc.c signature.h \
+	macros.h test-mbsinit.sh test-mbsinit.c signature.h macros.h \
+	test-memchr.c zerosize-ptr.h signature.h macros.h \
+	test-printf-frexp.c macros.h test-printf-frexpl.c macros.h \
+	putenv.c setenv.c test-setenv.c signature.h macros.h \
+	test-signbit.c macros.h test-stdbool.c test-stddef.c \
+	test-stdint.c test-stdlib.c strerror.c test-strerror.c \
+	signature.h macros.h test-striconveh.c macros.h \
+	test-striconveha.c macros.h test-string.c test-strncat.c \
+	unistr/test-strncat.h zerosize-ptr.h signature.h macros.h \
+	unicase/test-cased.c unicase/test-predicate-part1.h \
+	unicase/test-predicate-part2.h macros.h \
 	unicase/test-ignorable.c unicase/test-predicate-part1.h \
-	unicase/test-predicate-part2.h unicase/test-locale-language.sh \
-	unicase/test-locale-language.c unicase/test-uc_tolower.c \
+	unicase/test-predicate-part2.h macros.h \
+	unicase/test-locale-language.sh unicase/test-locale-language.c \
+	macros.h unicase/test-uc_tolower.c \
 	unicase/test-mapping-part1.h unicase/test-mapping-part2.h \
-	unicase/test-uc_totitle.c unicase/test-mapping-part1.h \
-	unicase/test-mapping-part2.h unicase/test-uc_toupper.c \
+	macros.h unicase/test-uc_totitle.c \
 	unicase/test-mapping-part1.h unicase/test-mapping-part2.h \
-	unicase/test-u16-casecmp.c unicase/test-casecmp.h \
-	unicase/test-u16-casecoll.c unicase/test-casecmp.h \
-	unicase/test-u16-casefold.c unicase/test-u16-is-cased.c \
-	unicase/test-is-cased.h unicase/test-u16-is-casefolded.c \
-	unicase/test-is-casefolded.h unicase/test-u16-is-lowercase.c \
-	unicase/test-is-lowercase.h unicase/test-u16-is-titlecase.c \
-	unicase/test-is-titlecase.h unicase/test-u16-is-uppercase.c \
-	unicase/test-is-uppercase.h unicase/test-u16-tolower.c \
-	unicase/test-u16-totitle.c unicase/test-u16-toupper.c \
-	unicase/test-u32-casecmp.c unicase/test-casecmp.h \
-	unicase/test-u32-casecoll.c unicase/test-casecmp.h \
-	unicase/test-u32-casefold.c unicase/test-u32-is-cased.c \
-	unicase/test-is-cased.h unicase/test-u32-is-casefolded.c \
-	unicase/test-is-casefolded.h unicase/test-u32-is-lowercase.c \
-	unicase/test-is-lowercase.h unicase/test-u32-is-titlecase.c \
-	unicase/test-is-titlecase.h unicase/test-u32-is-uppercase.c \
-	unicase/test-is-uppercase.h unicase/test-u32-tolower.c \
-	unicase/test-u32-totitle.c unicase/test-u32-toupper.c \
-	unicase/test-u8-casecmp.c unicase/test-casecmp.h \
-	unicase/test-u8-casecoll.c unicase/test-casecmp.h \
-	unicase/test-u8-casefold.c unicase/test-u8-is-cased.c \
-	unicase/test-is-cased.h unicase/test-u8-is-casefolded.c \
-	unicase/test-is-casefolded.h unicase/test-u8-is-lowercase.c \
-	unicase/test-is-lowercase.h unicase/test-u8-is-titlecase.c \
-	unicase/test-is-titlecase.h unicase/test-u8-is-uppercase.c \
-	unicase/test-is-uppercase.h unicase/test-u8-tolower.c \
-	unicase/test-u8-totitle.c unicase/test-u8-toupper.c \
+	macros.h unicase/test-uc_toupper.c \
+	unicase/test-mapping-part1.h unicase/test-mapping-part2.h \
+	macros.h unicase/test-u16-casecmp.c unicase/test-casecmp.h \
+	macros.h unicase/test-u16-casecoll.c unicase/test-casecmp.h \
+	macros.h unicase/test-u16-casefold.c macros.h \
+	unicase/test-u16-is-cased.c unicase/test-is-cased.h macros.h \
+	unicase/test-u16-is-casefolded.c unicase/test-is-casefolded.h \
+	macros.h unicase/test-u16-is-lowercase.c \
+	unicase/test-is-lowercase.h macros.h \
+	unicase/test-u16-is-titlecase.c unicase/test-is-titlecase.h \
+	macros.h unicase/test-u16-is-uppercase.c \
+	unicase/test-is-uppercase.h macros.h \
+	unicase/test-u16-tolower.c macros.h unicase/test-u16-totitle.c \
+	macros.h unicase/test-u16-toupper.c macros.h \
+	unicase/test-u32-casecmp.c unicase/test-casecmp.h macros.h \
+	unicase/test-u32-casecoll.c unicase/test-casecmp.h macros.h \
+	unicase/test-u32-casefold.c macros.h \
+	unicase/test-u32-is-cased.c unicase/test-is-cased.h macros.h \
+	unicase/test-u32-is-casefolded.c unicase/test-is-casefolded.h \
+	macros.h unicase/test-u32-is-lowercase.c \
+	unicase/test-is-lowercase.h macros.h \
+	unicase/test-u32-is-titlecase.c unicase/test-is-titlecase.h \
+	macros.h unicase/test-u32-is-uppercase.c \
+	unicase/test-is-uppercase.h macros.h \
+	unicase/test-u32-tolower.c macros.h unicase/test-u32-totitle.c \
+	macros.h unicase/test-u32-toupper.c macros.h \
+	unicase/test-u8-casecmp.c unicase/test-casecmp.h macros.h \
+	unicase/test-u8-casecoll.c unicase/test-casecmp.h macros.h \
+	unicase/test-u8-casefold.c macros.h unicase/test-u8-is-cased.c \
+	unicase/test-is-cased.h macros.h \
+	unicase/test-u8-is-casefolded.c unicase/test-is-casefolded.h \
+	macros.h unicase/test-u8-is-lowercase.c \
+	unicase/test-is-lowercase.h macros.h \
+	unicase/test-u8-is-titlecase.c unicase/test-is-titlecase.h \
+	macros.h unicase/test-u8-is-uppercase.c \
+	unicase/test-is-uppercase.h macros.h unicase/test-u8-tolower.c \
+	macros.h unicase/test-u8-totitle.c macros.h \
+	unicase/test-u8-toupper.c macros.h \
 	unicase/test-ulc-casecmp1.sh unicase/test-ulc-casecmp2.sh \
-	unicase/test-ulc-casecmp.c unicase/test-casecmp.h \
+	unicase/test-ulc-casecmp.c unicase/test-casecmp.h macros.h \
 	unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh \
-	unicase/test-ulc-casecoll.c unicase/test-casecmp.h \
-	uniconv/test-u16-conv-from-enc.c \
-	uniconv/test-u16-conv-to-enc.c \
-	uniconv/test-u16-strconv-from-enc.c \
-	uniconv/test-u16-strconv-to-enc.c \
-	uniconv/test-u32-conv-from-enc.c \
-	uniconv/test-u32-conv-to-enc.c \
-	uniconv/test-u32-strconv-from-enc.c \
-	uniconv/test-u32-strconv-to-enc.c \
-	uniconv/test-u8-conv-from-enc.c uniconv/test-u8-conv-to-enc.c \
-	uniconv/test-u8-strconv-from-enc.c \
-	uniconv/test-u8-strconv-to-enc.c unictype/test-bidi_byname.c \
-	unictype/test-bidi_name.c unictype/test-bidi_of.c \
-	unictype/test-bidi_test.c unictype/test-block_list.c \
-	unictype/test-block_of.c unictype/test-block_test.c \
-	unictype/test-categ_C.c unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Cc.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Cf.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Cn.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Co.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Cs.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_L.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Ll.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Lm.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Lo.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Lt.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Lu.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_M.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Mc.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Me.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Mn.c \
+	unicase/test-ulc-casecoll.c unicase/test-casecmp.h macros.h \
+	uniconv/test-u16-conv-from-enc.c macros.h \
+	uniconv/test-u16-conv-to-enc.c macros.h \
+	uniconv/test-u16-strconv-from-enc.c macros.h \
+	uniconv/test-u16-strconv-to-enc.c macros.h \
+	uniconv/test-u32-conv-from-enc.c macros.h \
+	uniconv/test-u32-conv-to-enc.c macros.h \
+	uniconv/test-u32-strconv-from-enc.c macros.h \
+	uniconv/test-u32-strconv-to-enc.c macros.h \
+	uniconv/test-u8-conv-from-enc.c macros.h \
+	uniconv/test-u8-conv-to-enc.c macros.h \
+	uniconv/test-u8-strconv-from-enc.c macros.h \
+	uniconv/test-u8-strconv-to-enc.c macros.h \
+	unictype/test-bidi_byname.c macros.h unictype/test-bidi_name.c \
+	macros.h unictype/test-bidi_of.c macros.h \
+	unictype/test-bidi_test.c macros.h unictype/test-block_list.c \
+	macros.h unictype/test-block_of.c macros.h \
+	unictype/test-block_test.c macros.h unictype/test-categ_C.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_N.c \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Cc.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Cf.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Cn.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Co.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Cs.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_L.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Ll.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Lm.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Lo.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Lt.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Lu.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_M.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Mc.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Me.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Mn.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_N.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Nd.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Nl.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_No.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_P.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Pc.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Pd.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Pe.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Pf.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Pi.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Po.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Ps.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_S.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Sc.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Sk.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Sm.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_So.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Z.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Zl.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Zp.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_Zs.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-categ_and_not.c macros.h \
+	unictype/test-categ_and.c macros.h \
+	unictype/test-categ_byname.c macros.h \
+	unictype/test-categ_name.c macros.h unictype/test-categ_none.c \
+	macros.h unictype/test-categ_of.c macros.h \
+	unictype/test-categ_or.c macros.h \
+	unictype/test-categ_test_withtable.c macros.h \
+	unictype/test-combining.c macros.h unictype/test-ctype_alnum.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Nd.c \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_alpha.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_blank.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_cntrl.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_digit.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_graph.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_lower.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_print.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_punct.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_space.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_upper.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-ctype_xdigit.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-decdigit.c unictype/test-decdigit.h macros.h \
+	unictype/test-digit.c unictype/test-digit.h macros.h \
+	unictype/test-mirror.c macros.h unictype/test-numeric.c \
+	unictype/test-numeric.h macros.h unictype/test-pr_alphabetic.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Nl.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_No.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_P.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Pc.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Pd.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Pe.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Pf.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Pi.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Po.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Ps.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_S.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Sc.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Sk.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Sm.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_So.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Z.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Zl.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Zp.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_Zs.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-categ_and_not.c \
-	unictype/test-categ_and.c unictype/test-categ_byname.c \
-	unictype/test-categ_name.c unictype/test-categ_none.c \
-	unictype/test-categ_of.c unictype/test-categ_or.c \
-	unictype/test-categ_test_withtable.c unictype/test-combining.c \
-	unictype/test-ctype_alnum.c unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_alpha.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_blank.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_cntrl.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_digit.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_graph.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_lower.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_print.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_punct.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_space.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_upper.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-ctype_xdigit.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-decdigit.c \
-	unictype/test-decdigit.h unictype/test-digit.c \
-	unictype/test-digit.h unictype/test-mirror.c \
-	unictype/test-numeric.c unictype/test-numeric.h \
-	unictype/test-pr_alphabetic.c unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_ascii_hex_digit.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_arabic_digit.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_arabic_right_to_left.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_block_separator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_boundary_neutral.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_common_separator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_control.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_embedding_or_override.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_eur_num_separator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_eur_num_terminator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_european_digit.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_hebrew_right_to_left.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_left_to_right.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_non_spacing_mark.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_other_neutral.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_bidi_pdf.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_bidi_pdf.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_segment_separator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_bidi_whitespace.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_byname.c \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_byname.c macros.h \
 	unictype/test-pr_combining.c unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_composite.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_composite.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_currency_symbol.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_dash.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_dash.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_decimal_digit.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_default_ignorable_code_point.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_deprecated.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_diacritic.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_extender.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_deprecated.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_diacritic.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_extender.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_format_control.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_grapheme_base.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_grapheme_extend.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_grapheme_link.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_hex_digit.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_hyphen.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_id_continue.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_id_start.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_ideographic.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_hex_digit.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_hyphen.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_id_continue.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_id_start.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_ideographic.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_ids_binary_operator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_ids_trinary_operator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_ignorable_control.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_iso_control.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_iso_control.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_join_control.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_left_of_pair.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_line_separator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_logical_order_exception.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_lowercase.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_math.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_non_break.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_lowercase.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_math.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_non_break.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_not_a_character.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_numeric.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_numeric.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_alphabetic.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_default_ignorable_code_point.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_grapheme_extend.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_id_continue.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_id_start.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_lowercase.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_other_math.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_other_math.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_other_uppercase.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_paired_punctuation.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_paragraph_separator.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_pattern_syntax.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_pattern_white_space.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_private_use.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_punctuation.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_private_use.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_punctuation.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_quotation_mark.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_radical.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_radical.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_sentence_terminal.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_soft_dotted.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_space.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_soft_dotted.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_space.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_terminal_punctuation.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_test.c \
-	unictype/test-pr_titlecase.c unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_test.c macros.h unictype/test-pr_titlecase.c \
+	unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_unassigned_code_value.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_unified_ideograph.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_uppercase.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_uppercase.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_variation_selector.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_white_space.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_white_space.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
 	unictype/test-pr_xid_continue.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_xid_start.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-pr_zero_width.c \
-	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-scripts.c \
-	unictype/test-sy_c_ident.c unictype/test-sy_c_whitespace.c \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_xid_start.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-pr_zero_width.c unictype/test-predicate-part1.h \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-scripts.c macros.h unictype/test-sy_c_ident.c \
+	macros.h unictype/test-sy_c_whitespace.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h unictype/test-sy_java_ident.c \
+	unictype/test-predicate-part2.h macros.h \
+	unictype/test-sy_java_ident.c macros.h \
 	unictype/test-sy_java_whitespace.c \
 	unictype/test-predicate-part1.h \
-	unictype/test-predicate-part2.h \
-	unilbrk/test-u16-possible-linebreaks.c \
-	unilbrk/test-u16-width-linebreaks.c \
-	unilbrk/test-u32-possible-linebreaks.c \
-	unilbrk/test-u32-width-linebreaks.c \
-	unilbrk/test-u8-possible-linebreaks.c \
-	unilbrk/test-u8-width-linebreaks.c \
-	unilbrk/test-ulc-possible-linebreaks.c \
-	unilbrk/test-ulc-width-linebreaks.c uniname/test-uninames.sh \
-	uniname/test-uninames.c uniname/UnicodeDataNames.txt \
-	uninorm/test-canonical-decomposition.c \
-	uninorm/test-compat-decomposition.c uninorm/test-composition.c \
-	uninorm/test-decomposing-form.c uninorm/test-decomposition.c \
-	uninorm/test-uninorm-filter-nfc.c uninorm/test-nfc.c \
+	unictype/test-predicate-part2.h macros.h \
+	unilbrk/test-u16-possible-linebreaks.c macros.h \
+	unilbrk/test-u16-width-linebreaks.c macros.h \
+	unilbrk/test-u32-possible-linebreaks.c macros.h \
+	unilbrk/test-u32-width-linebreaks.c macros.h \
+	unilbrk/test-u8-possible-linebreaks.c macros.h \
+	unilbrk/test-u8-width-linebreaks.c macros.h \
+	unilbrk/test-ulc-possible-linebreaks.c macros.h \
+	unilbrk/test-ulc-width-linebreaks.c macros.h \
+	uniname/test-uninames.sh uniname/test-uninames.c \
+	uniname/UnicodeDataNames.txt \
+	uninorm/test-canonical-decomposition.c macros.h \
+	uninorm/test-compat-decomposition.c macros.h \
+	uninorm/test-composition.c macros.h \
+	uninorm/test-decomposing-form.c macros.h \
+	uninorm/test-decomposition.c macros.h \
+	uninorm/test-uninorm-filter-nfc.c macros.h uninorm/test-nfc.c \
 	uninorm/test-u8-nfc.c uninorm/test-u16-nfc.c \
 	uninorm/test-u32-nfc.c uninorm/test-u32-nfc-big.sh \
 	uninorm/test-u32-nfc-big.c uninorm/test-u32-normalize-big.h \
 	uninorm/test-u32-normalize-big.c uninorm/NormalizationTest.txt \
-	uninorm/test-nfd.c uninorm/test-u8-nfd.c \
+	macros.h uninorm/test-nfd.c uninorm/test-u8-nfd.c \
 	uninorm/test-u16-nfd.c uninorm/test-u32-nfd.c \
 	uninorm/test-u32-nfd-big.sh uninorm/test-u32-nfd-big.c \
 	uninorm/test-u32-normalize-big.h \
 	uninorm/test-u32-normalize-big.c uninorm/NormalizationTest.txt \
-	uninorm/test-nfkc.c uninorm/test-u8-nfkc.c \
+	macros.h uninorm/test-nfkc.c uninorm/test-u8-nfkc.c \
 	uninorm/test-u16-nfkc.c uninorm/test-u32-nfkc.c \
 	uninorm/test-u32-nfkc-big.sh uninorm/test-u32-nfkc-big.c \
 	uninorm/test-u32-normalize-big.h \
 	uninorm/test-u32-normalize-big.c uninorm/NormalizationTest.txt \
-	uninorm/test-nfkd.c uninorm/test-u8-nfkd.c \
+	macros.h uninorm/test-nfkd.c uninorm/test-u8-nfkd.c \
 	uninorm/test-u16-nfkd.c uninorm/test-u32-nfkd.c \
 	uninorm/test-u32-nfkd-big.sh uninorm/test-u32-nfkd-big.c \
 	uninorm/test-u32-normalize-big.h \
 	uninorm/test-u32-normalize-big.c uninorm/NormalizationTest.txt \
-	uninorm/test-u16-normcmp.c uninorm/test-u16-normcmp.h \
-	uninorm/test-u16-normcoll.c uninorm/test-u16-normcmp.h \
-	uninorm/test-u32-normcmp.c uninorm/test-u32-normcmp.h \
+	macros.h uninorm/test-u16-normcmp.c uninorm/test-u16-normcmp.h \
+	macros.h uninorm/test-u16-normcoll.c \
+	uninorm/test-u16-normcmp.h macros.h uninorm/test-u32-normcmp.c \
+	uninorm/test-u32-normcmp.h macros.h \
 	uninorm/test-u32-normcoll.c uninorm/test-u32-normcmp.h \
-	uninorm/test-u8-normcmp.c uninorm/test-u8-normcmp.h \
-	uninorm/test-u8-normcoll.c uninorm/test-u8-normcmp.h \
-	test-unistd.c unistdio/test-u16-asnprintf1.c \
+	macros.h uninorm/test-u8-normcmp.c uninorm/test-u8-normcmp.h \
+	macros.h uninorm/test-u8-normcoll.c uninorm/test-u8-normcmp.h \
+	macros.h test-unistd.c unistdio/test-u16-asnprintf1.c \
 	unistdio/test-u16-asnprintf1.h unistdio/test-u16-printf1.h \
-	unistdio/test-u16-vasnprintf1.c unistdio/test-u16-asnprintf1.h \
-	unistdio/test-u16-printf1.h unistdio/test-u16-vasnprintf2.sh \
+	macros.h unistdio/test-u16-vasnprintf1.c \
+	unistdio/test-u16-asnprintf1.h unistdio/test-u16-printf1.h \
+	unistdio/test-u16-vasnprintf2.sh \
 	unistdio/test-u16-vasnprintf2.c \
 	unistdio/test-u16-vasnprintf3.sh \
-	unistdio/test-u16-vasnprintf3.c unistdio/test-u16-vasprintf1.c \
-	unistdio/test-u16-printf1.h unistdio/test-u16-vsnprintf1.c \
-	unistdio/test-u16-printf1.h unistdio/test-u16-vsprintf1.c \
-	unistdio/test-u16-printf1.h unistdio/test-u32-asnprintf1.c \
+	unistdio/test-u16-vasnprintf3.c macros.h \
+	unistdio/test-u16-vasprintf1.c unistdio/test-u16-printf1.h \
+	macros.h unistdio/test-u16-vsnprintf1.c \
+	unistdio/test-u16-printf1.h macros.h \
+	unistdio/test-u16-vsprintf1.c unistdio/test-u16-printf1.h \
+	macros.h unistdio/test-u32-asnprintf1.c \
 	unistdio/test-u32-asnprintf1.h unistdio/test-u32-printf1.h \
-	unistdio/test-u32-vasnprintf1.c unistdio/test-u32-asnprintf1.h \
-	unistdio/test-u32-printf1.h unistdio/test-u32-vasnprintf2.sh \
+	macros.h unistdio/test-u32-vasnprintf1.c \
+	unistdio/test-u32-asnprintf1.h unistdio/test-u32-printf1.h \
+	unistdio/test-u32-vasnprintf2.sh \
 	unistdio/test-u32-vasnprintf2.c \
 	unistdio/test-u32-vasnprintf3.sh \
-	unistdio/test-u32-vasnprintf3.c unistdio/test-u32-vasprintf1.c \
-	unistdio/test-u32-printf1.h unistdio/test-u32-vsnprintf1.c \
-	unistdio/test-u32-printf1.h unistdio/test-u32-vsprintf1.c \
-	unistdio/test-u32-printf1.h unistdio/test-u8-asnprintf1.c \
+	unistdio/test-u32-vasnprintf3.c macros.h \
+	unistdio/test-u32-vasprintf1.c unistdio/test-u32-printf1.h \
+	macros.h unistdio/test-u32-vsnprintf1.c \
+	unistdio/test-u32-printf1.h macros.h \
+	unistdio/test-u32-vsprintf1.c unistdio/test-u32-printf1.h \
+	macros.h unistdio/test-u8-asnprintf1.c \
 	unistdio/test-u8-asnprintf1.h unistdio/test-u8-printf1.h \
-	unistdio/test-u8-vasnprintf1.c unistdio/test-u8-asnprintf1.h \
-	unistdio/test-u8-printf1.h unistdio/test-u8-vasnprintf2.sh \
-	unistdio/test-u8-vasnprintf2.c unistdio/test-u8-vasnprintf3.sh \
-	unistdio/test-u8-vasnprintf3.c unistdio/test-u8-vasprintf1.c \
-	unistdio/test-u8-printf1.h unistdio/test-u8-vsnprintf1.c \
-	unistdio/test-u8-printf1.h unistdio/test-u8-vsprintf1.c \
-	unistdio/test-u8-printf1.h unistdio/test-ulc-asnprintf1.c \
-	unistdio/test-ulc-asnprintf1.h unistdio/test-ulc-printf1.h \
+	macros.h unistdio/test-u8-vasnprintf1.c \
+	unistdio/test-u8-asnprintf1.h unistdio/test-u8-printf1.h \
+	unistdio/test-u8-vasnprintf2.sh unistdio/test-u8-vasnprintf2.c \
+	unistdio/test-u8-vasnprintf3.sh unistdio/test-u8-vasnprintf3.c \
+	macros.h unistdio/test-u8-vasprintf1.c \
+	unistdio/test-u8-printf1.h macros.h \
+	unistdio/test-u8-vsnprintf1.c unistdio/test-u8-printf1.h \
+	macros.h unistdio/test-u8-vsprintf1.c \
+	unistdio/test-u8-printf1.h macros.h \
+	unistdio/test-ulc-asnprintf1.c unistdio/test-ulc-asnprintf1.h \
+	unistdio/test-ulc-printf1.h macros.h \
 	unistdio/test-ulc-vasnprintf1.c unistdio/test-ulc-asnprintf1.h \
 	unistdio/test-ulc-printf1.h unistdio/test-ulc-vasnprintf2.sh \
 	unistdio/test-ulc-vasnprintf2.c \
 	unistdio/test-ulc-vasnprintf3.sh \
-	unistdio/test-ulc-vasnprintf3.c unistdio/test-ulc-vasprintf1.c \
-	unistdio/test-ulc-printf1.h unistdio/test-ulc-vsnprintf1.c \
-	unistdio/test-ulc-printf1.h unistdio/test-ulc-vsprintf1.c \
-	unistdio/test-ulc-printf1.h uniwbrk/test-u16-wordbreaks.c \
-	uniwbrk/test-u32-wordbreaks.c uniwbrk/test-u8-wordbreaks.c \
+	unistdio/test-ulc-vasnprintf3.c macros.h \
+	unistdio/test-ulc-vasprintf1.c unistdio/test-ulc-printf1.h \
+	macros.h unistdio/test-ulc-vsnprintf1.c \
+	unistdio/test-ulc-printf1.h macros.h \
+	unistdio/test-ulc-vsprintf1.c unistdio/test-ulc-printf1.h \
+	macros.h unistr/test-u16-check.c macros.h \
+	unistr/test-u16-chr.c unistr/test-chr.h zerosize-ptr.h \
+	macros.h unistr/test-u16-cmp.c unistr/test-cmp.h \
+	zerosize-ptr.h macros.h unistr/test-u16-cmp2.c \
+	unistr/test-cmp2.h macros.h unistr/test-u16-cpy-alloc.c \
+	unistr/test-cpy-alloc.h macros.h unistr/test-u16-cpy.c \
+	unistr/test-cpy.h macros.h unistr/test-u16-mblen.c macros.h \
+	unistr/test-u16-mbsnlen.c macros.h unistr/test-u16-mbtouc.c \
+	unistr/test-u16-mbtouc.h macros.h \
+	unistr/test-u16-mbtouc-unsafe.c unistr/test-u16-mbtouc.h \
+	macros.h unistr/test-u16-mbtoucr.c macros.h \
+	unistr/test-u16-move.c unistr/test-move.h macros.h \
+	unistr/test-u16-next.c macros.h unistr/test-u16-prev.c \
+	macros.h unistr/test-u16-set.c unistr/test-set.h macros.h \
+	unistr/test-u16-stpcpy.c unistr/test-stpcpy.h macros.h \
+	unistr/test-u16-stpncpy.c unistr/test-stpncpy.h zerosize-ptr.h \
+	macros.h unistr/test-u16-strcat.c unistr/test-strcat.h \
+	macros.h unistr/test-u16-strcmp.c unistr/test-u16-strcmp.h \
+	unistr/test-strcmp.h macros.h unistr/test-u16-strcoll.c \
+	unistr/test-u16-strcmp.h unistr/test-strcmp.h macros.h \
+	unistr/test-u16-strcpy.c unistr/test-strcpy.h macros.h \
+	unistr/test-u16-strdup.c unistr/test-strdup.h macros.h \
+	unistr/test-u16-strlen.c macros.h unistr/test-u16-strmblen.c \
+	macros.h unistr/test-u16-strmbtouc.c macros.h \
+	unistr/test-u16-strncat.c unistr/test-strncat.h zerosize-ptr.h \
+	macros.h unistr/test-u16-strncmp.c unistr/test-strncmp.h \
+	macros.h unistr/test-u16-strncpy.c unistr/test-strncpy.h \
+	zerosize-ptr.h macros.h unistr/test-u16-strnlen.c \
+	unistr/test-strnlen.h zerosize-ptr.h macros.h \
+	unistr/test-u16-to-u32.c macros.h unistr/test-u16-to-u8.c \
+	macros.h unistr/test-u16-uctomb.c macros.h \
+	unistr/test-u32-check.c macros.h unistr/test-u32-chr.c \
+	unistr/test-chr.h zerosize-ptr.h macros.h \
+	unistr/test-u32-cmp.c unistr/test-cmp.h zerosize-ptr.h \
+	macros.h unistr/test-u32-cmp2.c unistr/test-cmp2.h macros.h \
+	unistr/test-u32-cpy-alloc.c unistr/test-cpy-alloc.h macros.h \
+	unistr/test-u32-cpy.c unistr/test-cpy.h macros.h \
+	unistr/test-u32-mblen.c macros.h unistr/test-u32-mbsnlen.c \
+	macros.h unistr/test-u32-mbtouc.c unistr/test-u32-mbtouc.h \
+	macros.h unistr/test-u32-mbtouc-unsafe.c \
+	unistr/test-u32-mbtouc.h macros.h unistr/test-u32-mbtoucr.c \
+	macros.h unistr/test-u32-move.c unistr/test-move.h macros.h \
+	unistr/test-u32-next.c macros.h unistr/test-u32-prev.c \
+	macros.h unistr/test-u32-set.c unistr/test-set.h macros.h \
+	unistr/test-u32-stpcpy.c unistr/test-stpcpy.h macros.h \
+	unistr/test-u32-stpncpy.c unistr/test-stpncpy.h zerosize-ptr.h \
+	macros.h unistr/test-u32-strcat.c unistr/test-strcat.h \
+	macros.h unistr/test-u32-strcmp.c unistr/test-u32-strcmp.h \
+	unistr/test-strcmp.h macros.h unistr/test-u32-strcoll.c \
+	unistr/test-u32-strcmp.h unistr/test-strcmp.h macros.h \
+	unistr/test-u32-strcpy.c unistr/test-strcpy.h macros.h \
+	unistr/test-u32-strdup.c unistr/test-strdup.h macros.h \
+	unistr/test-u32-strlen.c macros.h unistr/test-u32-strmblen.c \
+	macros.h unistr/test-u32-strmbtouc.c macros.h \
+	unistr/test-u32-strncat.c unistr/test-strncat.h zerosize-ptr.h \
+	macros.h unistr/test-u32-strncmp.c unistr/test-strncmp.h \
+	macros.h unistr/test-u32-strncpy.c unistr/test-strncpy.h \
+	zerosize-ptr.h macros.h unistr/test-u32-strnlen.c \
+	unistr/test-strnlen.h zerosize-ptr.h macros.h \
+	unistr/test-u32-to-u16.c macros.h unistr/test-u32-to-u8.c \
+	macros.h unistr/test-u32-uctomb.c macros.h \
+	unistr/test-u8-check.c macros.h unistr/test-u8-chr.c \
+	unistr/test-chr.h zerosize-ptr.h macros.h unistr/test-u8-cmp.c \
+	unistr/test-cmp.h zerosize-ptr.h macros.h \
+	unistr/test-u8-cmp2.c unistr/test-cmp2.h macros.h \
+	unistr/test-u8-cpy-alloc.c unistr/test-cpy-alloc.h macros.h \
+	unistr/test-u8-cpy.c unistr/test-cpy.h macros.h \
+	unistr/test-u8-mblen.c macros.h unistr/test-u8-mbsnlen.c \
+	macros.h unistr/test-u8-mbtouc.c unistr/test-u8-mbtouc.h \
+	macros.h unistr/test-u8-mbtouc-unsafe.c \
+	unistr/test-u8-mbtouc.h macros.h unistr/test-u8-mbtoucr.c \
+	macros.h unistr/test-u8-move.c unistr/test-move.h macros.h \
+	unistr/test-u8-next.c macros.h unistr/test-u8-prev.c macros.h \
+	unistr/test-u8-set.c unistr/test-set.h macros.h \
+	unistr/test-u8-stpcpy.c unistr/test-stpcpy.h macros.h \
+	unistr/test-u8-stpncpy.c unistr/test-stpncpy.h zerosize-ptr.h \
+	macros.h unistr/test-u8-strcat.c unistr/test-strcat.h macros.h \
+	unistr/test-u8-strcmp.c unistr/test-u8-strcmp.h \
+	unistr/test-strcmp.h macros.h unistr/test-u8-strcoll.c \
+	unistr/test-u8-strcmp.h unistr/test-strcmp.h macros.h \
+	unistr/test-u8-strcpy.c unistr/test-strcpy.h macros.h \
+	unistr/test-u8-strdup.c unistr/test-strdup.h macros.h \
+	unistr/test-u8-strlen.c macros.h unistr/test-u8-strmblen.c \
+	macros.h unistr/test-u8-strmbtouc.c macros.h \
+	unistr/test-u8-strncat.c unistr/test-strncat.h zerosize-ptr.h \
+	macros.h unistr/test-u8-strncmp.c unistr/test-strncmp.h \
+	macros.h unistr/test-u8-strncpy.c unistr/test-strncpy.h \
+	zerosize-ptr.h macros.h unistr/test-u8-strnlen.c \
+	unistr/test-strnlen.h zerosize-ptr.h macros.h \
+	unistr/test-u8-to-u16.c macros.h unistr/test-u8-to-u32.c \
+	macros.h unistr/test-u8-uctomb.c macros.h \
+	uniwbrk/test-u16-wordbreaks.c macros.h \
+	uniwbrk/test-u32-wordbreaks.c macros.h \
+	uniwbrk/test-u8-wordbreaks.c macros.h \
 	uniwbrk/test-ulc-wordbreaks.sh uniwbrk/test-ulc-wordbreaks.c \
-	uniwidth/test-u16-strwidth.c uniwidth/test-u16-width.c \
-	uniwidth/test-u32-strwidth.c uniwidth/test-u32-width.c \
-	uniwidth/test-u8-strwidth.c uniwidth/test-u8-width.c \
+	macros.h uniwidth/test-u16-strwidth.c macros.h \
+	uniwidth/test-u16-width.c macros.h \
+	uniwidth/test-u32-strwidth.c macros.h \
+	uniwidth/test-u32-width.c macros.h uniwidth/test-u8-strwidth.c \
+	macros.h uniwidth/test-u8-width.c macros.h \
 	uniwidth/test-uc_width.c uniwidth/test-uc_width2.c \
-	uniwidth/test-uc_width2.sh unsetenv.c test-wchar.c wctob.c \
-	test-wctype.c test-wcwidth.c xalloc.h xmalloc.c
-BUILT_SOURCES = $(FCNTL_H) $(LOCALE_H)
+	uniwidth/test-uc_width2.sh macros.h unsetenv.c test-unsetenv.c \
+	signature.h macros.h \
+	$(top_srcdir)/build-aux/unused-parameter.h \
+	$(top_srcdir)/build-aux/warn-on-use.h test-wchar.c wctob.c \
+	test-wctype.c macros.h test-wcwidth.c signature.h macros.h \
+	xalloc.h xmalloc.c test-xalloc-die.c test-xalloc-die.sh \
+	init.sh
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+BUILT_SOURCES = arg-nonnull.h c++defs.h locale.h unused-parameter.h \
+	warn-on-use.h
 SUFFIXES = 
-MOSTLYCLEANFILES = core *.stackdump fcntl.h fcntl.h-t locale.h \
-	locale.h-t
+MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
+	c++defs.h c++defs.h-t locale.h locale.h-t unused-parameter.h \
+	unused-parameter.h-t warn-on-use.h warn-on-use.h-t
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
 AM_CPPFLAGS = \
+  -D@gltests_WITNESS@=1 \
   -I. -I$(srcdir) \
   -I.. -I$(srcdir)/.. \
   -I../lib -I$(srcdir)/../lib
 
 LDADD = libtests.a ../lib/libunistring.la libtests.a $(LIBTESTS_LIBDEPS)
-libtests_a_SOURCES = gettext.h progname.h progname.c xalloc-die.c
+libtests_a_SOURCES = exitfail.c gettext.h progname.h progname.c \
+	glthread/thread.h glthread/thread.c xalloc-die.c \
+	glthread/yield.h
 libtests_a_LIBADD = $(gltests_LIBOBJS)
 libtests_a_DEPENDENCIES = $(gltests_LIBOBJS)
-EXTRA_libtests_a_SOURCES = error.c exitfail.c open.c setenv.c \
+EXTRA_libtests_a_SOURCES = error.c getpagesize.c putenv.c setenv.c \
 	strerror.c unsetenv.c wctob.c xmalloc.c
 AM_LIBTOOLFLAGS = --preserve-dup-deps
+ARG_NONNULL_H = arg-nonnull.h
+CXXDEFS_H = c++defs.h
 test_frexpl_nolibm_SOURCES = test-frexpl.c
 test_iconv_LDADD = $(LDADD) @LIBICONV@
 test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@
+test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_striconveh_LDADD = $(LDADD) @LIBICONV@
 test_striconveha_LDADD = $(LDADD) @LIBICONV@
 test_cased_SOURCES = unicase/test-cased.c
@@ -3974,6 +4929,105 @@ test_ulc_vsnprintf1_SOURCES = unistdio/test-ulc-vsnprintf1.c
 test_ulc_vsnprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
 test_ulc_vsprintf1_SOURCES = unistdio/test-ulc-vsprintf1.c
 test_ulc_vsprintf1_LDADD = $(LDADD) @LIBINTL@ @LIBICONV@
+test_u16_check_SOURCES = unistr/test-u16-check.c
+test_u16_chr_SOURCES = unistr/test-u16-chr.c
+test_u16_cmp_SOURCES = unistr/test-u16-cmp.c
+test_u16_cmp2_SOURCES = unistr/test-u16-cmp2.c
+test_u16_cpy_alloc_SOURCES = unistr/test-u16-cpy-alloc.c
+test_u16_cpy_SOURCES = unistr/test-u16-cpy.c
+test_u16_mblen_SOURCES = unistr/test-u16-mblen.c
+test_u16_mbsnlen_SOURCES = unistr/test-u16-mbsnlen.c
+test_u16_mbtouc_SOURCES = unistr/test-u16-mbtouc.c
+test_u16_mbtouc_unsafe_SOURCES = unistr/test-u16-mbtouc-unsafe.c
+test_u16_mbtoucr_SOURCES = unistr/test-u16-mbtoucr.c
+test_u16_move_SOURCES = unistr/test-u16-move.c
+test_u16_next_SOURCES = unistr/test-u16-next.c
+test_u16_prev_SOURCES = unistr/test-u16-prev.c
+test_u16_set_SOURCES = unistr/test-u16-set.c
+test_u16_stpcpy_SOURCES = unistr/test-u16-stpcpy.c
+test_u16_stpncpy_SOURCES = unistr/test-u16-stpncpy.c
+test_u16_strcat_SOURCES = unistr/test-u16-strcat.c
+test_u16_strcmp_SOURCES = unistr/test-u16-strcmp.c
+test_u16_strcoll_SOURCES = unistr/test-u16-strcoll.c
+test_u16_strcoll_LDADD = $(LDADD) @LIBICONV@
+test_u16_strcpy_SOURCES = unistr/test-u16-strcpy.c
+test_u16_strdup_SOURCES = unistr/test-u16-strdup.c
+test_u16_strlen_SOURCES = unistr/test-u16-strlen.c
+test_u16_strmblen_SOURCES = unistr/test-u16-strmblen.c
+test_u16_strmbtouc_SOURCES = unistr/test-u16-strmbtouc.c
+test_u16_strncat_SOURCES = unistr/test-u16-strncat.c
+test_u16_strncmp_SOURCES = unistr/test-u16-strncmp.c
+test_u16_strncpy_SOURCES = unistr/test-u16-strncpy.c
+test_u16_strnlen_SOURCES = unistr/test-u16-strnlen.c
+test_u16_to_u32_SOURCES = unistr/test-u16-to-u32.c
+test_u16_to_u8_SOURCES = unistr/test-u16-to-u8.c
+test_u16_uctomb_SOURCES = unistr/test-u16-uctomb.c
+test_u32_check_SOURCES = unistr/test-u32-check.c
+test_u32_chr_SOURCES = unistr/test-u32-chr.c
+test_u32_cmp_SOURCES = unistr/test-u32-cmp.c
+test_u32_cmp2_SOURCES = unistr/test-u32-cmp2.c
+test_u32_cpy_alloc_SOURCES = unistr/test-u32-cpy-alloc.c
+test_u32_cpy_SOURCES = unistr/test-u32-cpy.c
+test_u32_mblen_SOURCES = unistr/test-u32-mblen.c
+test_u32_mbsnlen_SOURCES = unistr/test-u32-mbsnlen.c
+test_u32_mbtouc_SOURCES = unistr/test-u32-mbtouc.c
+test_u32_mbtouc_unsafe_SOURCES = unistr/test-u32-mbtouc-unsafe.c
+test_u32_mbtoucr_SOURCES = unistr/test-u32-mbtoucr.c
+test_u32_move_SOURCES = unistr/test-u32-move.c
+test_u32_next_SOURCES = unistr/test-u32-next.c
+test_u32_prev_SOURCES = unistr/test-u32-prev.c
+test_u32_set_SOURCES = unistr/test-u32-set.c
+test_u32_stpcpy_SOURCES = unistr/test-u32-stpcpy.c
+test_u32_stpncpy_SOURCES = unistr/test-u32-stpncpy.c
+test_u32_strcat_SOURCES = unistr/test-u32-strcat.c
+test_u32_strcmp_SOURCES = unistr/test-u32-strcmp.c
+test_u32_strcoll_SOURCES = unistr/test-u32-strcoll.c
+test_u32_strcoll_LDADD = $(LDADD) @LIBICONV@
+test_u32_strcpy_SOURCES = unistr/test-u32-strcpy.c
+test_u32_strdup_SOURCES = unistr/test-u32-strdup.c
+test_u32_strlen_SOURCES = unistr/test-u32-strlen.c
+test_u32_strmblen_SOURCES = unistr/test-u32-strmblen.c
+test_u32_strmbtouc_SOURCES = unistr/test-u32-strmbtouc.c
+test_u32_strncat_SOURCES = unistr/test-u32-strncat.c
+test_u32_strncmp_SOURCES = unistr/test-u32-strncmp.c
+test_u32_strncpy_SOURCES = unistr/test-u32-strncpy.c
+test_u32_strnlen_SOURCES = unistr/test-u32-strnlen.c
+test_u32_to_u16_SOURCES = unistr/test-u32-to-u16.c
+test_u32_to_u8_SOURCES = unistr/test-u32-to-u8.c
+test_u32_uctomb_SOURCES = unistr/test-u32-uctomb.c
+test_u8_check_SOURCES = unistr/test-u8-check.c
+test_u8_chr_SOURCES = unistr/test-u8-chr.c
+test_u8_cmp_SOURCES = unistr/test-u8-cmp.c
+test_u8_cmp2_SOURCES = unistr/test-u8-cmp2.c
+test_u8_cpy_alloc_SOURCES = unistr/test-u8-cpy-alloc.c
+test_u8_cpy_SOURCES = unistr/test-u8-cpy.c
+test_u8_mblen_SOURCES = unistr/test-u8-mblen.c
+test_u8_mbsnlen_SOURCES = unistr/test-u8-mbsnlen.c
+test_u8_mbtouc_SOURCES = unistr/test-u8-mbtouc.c
+test_u8_mbtouc_unsafe_SOURCES = unistr/test-u8-mbtouc-unsafe.c
+test_u8_mbtoucr_SOURCES = unistr/test-u8-mbtoucr.c
+test_u8_move_SOURCES = unistr/test-u8-move.c
+test_u8_next_SOURCES = unistr/test-u8-next.c
+test_u8_prev_SOURCES = unistr/test-u8-prev.c
+test_u8_set_SOURCES = unistr/test-u8-set.c
+test_u8_stpcpy_SOURCES = unistr/test-u8-stpcpy.c
+test_u8_stpncpy_SOURCES = unistr/test-u8-stpncpy.c
+test_u8_strcat_SOURCES = unistr/test-u8-strcat.c
+test_u8_strcmp_SOURCES = unistr/test-u8-strcmp.c
+test_u8_strcoll_SOURCES = unistr/test-u8-strcoll.c
+test_u8_strcoll_LDADD = $(LDADD) @LIBICONV@
+test_u8_strcpy_SOURCES = unistr/test-u8-strcpy.c
+test_u8_strdup_SOURCES = unistr/test-u8-strdup.c
+test_u8_strlen_SOURCES = unistr/test-u8-strlen.c
+test_u8_strmblen_SOURCES = unistr/test-u8-strmblen.c
+test_u8_strmbtouc_SOURCES = unistr/test-u8-strmbtouc.c
+test_u8_strncat_SOURCES = unistr/test-u8-strncat.c
+test_u8_strncmp_SOURCES = unistr/test-u8-strncmp.c
+test_u8_strncpy_SOURCES = unistr/test-u8-strncpy.c
+test_u8_strnlen_SOURCES = unistr/test-u8-strnlen.c
+test_u8_to_u16_SOURCES = unistr/test-u8-to-u16.c
+test_u8_to_u32_SOURCES = unistr/test-u8-to-u32.c
+test_u8_uctomb_SOURCES = unistr/test-u8-uctomb.c
 test_u16_wordbreaks_SOURCES = uniwbrk/test-u16-wordbreaks.c
 test_u32_wordbreaks_SOURCES = uniwbrk/test-u32-wordbreaks.c
 test_u8_wordbreaks_SOURCES = uniwbrk/test-u8-wordbreaks.c
@@ -3987,6 +5041,9 @@ test_u8_strwidth_SOURCES = uniwidth/test-u8-strwidth.c
 test_u8_width_SOURCES = uniwidth/test-u8-width.c
 test_uc_width_SOURCES = uniwidth/test-uc_width.c
 test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
+UNUSED_PARAMETER_H = unused-parameter.h
+WARN_ON_USE_H = warn-on-use.h
+test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
 
 # Ensure that ../lib/config.h is seen before ../config.h.
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/lib -I$(top_builddir)
@@ -4038,6 +5095,14 @@ clean-checkLIBRARIES:
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+glthread/$(am__dirstamp):
+	@$(MKDIR_P) glthread
+	@: > glthread/$(am__dirstamp)
+glthread/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) glthread/$(DEPDIR)
+	@: > glthread/$(DEPDIR)/$(am__dirstamp)
+glthread/thread.$(OBJEXT): glthread/$(am__dirstamp) \
+	glthread/$(DEPDIR)/$(am__dirstamp)
 libtests.a: $(libtests_a_OBJECTS) $(libtests_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libtests.a
 	$(AM_V_AR)$(libtests_a_AR) libtests.a $(libtests_a_OBJECTS) $(libtests_a_LIBADD)
@@ -4458,18 +5523,12 @@ unictype/test-digit.$(OBJEXT): unictype/$(am__dirstamp) \
 test-digit$(EXEEXT): $(test_digit_OBJECTS) $(test_digit_DEPENDENCIES) 
 	@rm -f test-digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_digit_OBJECTS) $(test_digit_LDADD) $(LIBS)
-test-dup2$(EXEEXT): $(test_dup2_OBJECTS) $(test_dup2_DEPENDENCIES) 
-	@rm -f test-dup2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_dup2_OBJECTS) $(test_dup2_LDADD) $(LIBS)
 test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) 
 	@rm -f test-environ$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
 test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) 
 	@rm -f test-errno$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_errno_OBJECTS) $(test_errno_LDADD) $(LIBS)
-test-fcntl$(EXEEXT): $(test_fcntl_OBJECTS) $(test_fcntl_DEPENDENCIES) 
-	@rm -f test-fcntl$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_fcntl_OBJECTS) $(test_fcntl_LDADD) $(LIBS)
 test-frexpl-nolibm$(EXEEXT): $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_DEPENDENCIES) 
 	@rm -f test-frexpl-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_LDADD) $(LIBS)
@@ -4479,6 +5538,9 @@ test-fseterr$(EXEEXT): $(test_fseterr_OBJECTS) $(test_fseterr_DEPENDENCIES)
 test-iconv$(EXEEXT): $(test_iconv_OBJECTS) $(test_iconv_DEPENDENCIES) 
 	@rm -f test-iconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_iconv_OBJECTS) $(test_iconv_LDADD) $(LIBS)
+test-iconv-h$(EXEEXT): $(test_iconv_h_OBJECTS) $(test_iconv_h_DEPENDENCIES) 
+	@rm -f test-iconv-h$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_iconv_h_OBJECTS) $(test_iconv_h_LDADD) $(LIBS)
 unicase/test-ignorable.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-ignorable$(EXEEXT): $(test_ignorable_OBJECTS) $(test_ignorable_DEPENDENCIES) 
@@ -4504,6 +5566,9 @@ test-locale-language$(EXEEXT): $(test_locale_language_OBJECTS) $(test_locale_lan
 test-localename$(EXEEXT): $(test_localename_OBJECTS) $(test_localename_DEPENDENCIES) 
 	@rm -f test-localename$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_localename_OBJECTS) $(test_localename_LDADD) $(LIBS)
+test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) 
+	@rm -f test-lock$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS)
 test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) 
 	@rm -f test-malloca$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_malloca_OBJECTS) $(test_malloca_LDADD) $(LIBS)
@@ -4573,9 +5638,6 @@ unictype/test-numeric.$(OBJEXT): unictype/$(am__dirstamp) \
 test-numeric$(EXEEXT): $(test_numeric_OBJECTS) $(test_numeric_DEPENDENCIES) 
 	@rm -f test-numeric$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_numeric_OBJECTS) $(test_numeric_LDADD) $(LIBS)
-test-open$(EXEEXT): $(test_open_OBJECTS) $(test_open_DEPENDENCIES) 
-	@rm -f test-open$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_open_OBJECTS) $(test_open_LDADD) $(LIBS)
 unictype/test-pr_alphabetic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
 test-pr_alphabetic$(EXEEXT): $(test_pr_alphabetic_OBJECTS) $(test_pr_alphabetic_DEPENDENCIES) 
@@ -4992,6 +6054,9 @@ unictype/test-scripts.$(OBJEXT): unictype/$(am__dirstamp) \
 test-scripts$(EXEEXT): $(test_scripts_OBJECTS) $(test_scripts_DEPENDENCIES) 
 	@rm -f test-scripts$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_scripts_OBJECTS) $(test_scripts_LDADD) $(LIBS)
+test-setenv$(EXEEXT): $(test_setenv_OBJECTS) $(test_setenv_DEPENDENCIES) 
+	@rm -f test-setenv$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_setenv_OBJECTS) $(test_setenv_LDADD) $(LIBS)
 test-signbit$(EXEEXT): $(test_signbit_OBJECTS) $(test_signbit_DEPENDENCIES) 
 	@rm -f test-signbit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_signbit_OBJECTS) $(test_signbit_LDADD) $(LIBS)
@@ -5019,6 +6084,9 @@ test-striconveha$(EXEEXT): $(test_striconveha_OBJECTS) $(test_striconveha_DEPEND
 test-string$(EXEEXT): $(test_string_OBJECTS) $(test_string_DEPENDENCIES) 
 	@rm -f test-string$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_string_OBJECTS) $(test_string_LDADD) $(LIBS)
+test-strncat$(EXEEXT): $(test_strncat_OBJECTS) $(test_strncat_DEPENDENCIES) 
+	@rm -f test-strncat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_strncat_OBJECTS) $(test_strncat_LDADD) $(LIBS)
 unictype/test-sy_c_ident.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
 test-sy_c_ident$(EXEEXT): $(test_sy_c_ident_OBJECTS) $(test_sy_c_ident_DEPENDENCIES) 
@@ -5065,6 +6133,32 @@ unicase/test-u16-casefold.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u16-casefold$(EXEEXT): $(test_u16_casefold_OBJECTS) $(test_u16_casefold_DEPENDENCIES) 
 	@rm -f test-u16-casefold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_casefold_OBJECTS) $(test_u16_casefold_LDADD) $(LIBS)
+unistr/$(am__dirstamp):
+	@$(MKDIR_P) unistr
+	@: > unistr/$(am__dirstamp)
+unistr/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) unistr/$(DEPDIR)
+	@: > unistr/$(DEPDIR)/$(am__dirstamp)
+unistr/test-u16-check.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-check$(EXEEXT): $(test_u16_check_OBJECTS) $(test_u16_check_DEPENDENCIES) 
+	@rm -f test-u16-check$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_check_OBJECTS) $(test_u16_check_LDADD) $(LIBS)
+unistr/test-u16-chr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-chr$(EXEEXT): $(test_u16_chr_OBJECTS) $(test_u16_chr_DEPENDENCIES) 
+	@rm -f test-u16-chr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_chr_OBJECTS) $(test_u16_chr_LDADD) $(LIBS)
+unistr/test-u16-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-cmp$(EXEEXT): $(test_u16_cmp_OBJECTS) $(test_u16_cmp_DEPENDENCIES) 
+	@rm -f test-u16-cmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_cmp_OBJECTS) $(test_u16_cmp_LDADD) $(LIBS)
+unistr/test-u16-cmp2.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-cmp2$(EXEEXT): $(test_u16_cmp2_OBJECTS) $(test_u16_cmp2_DEPENDENCIES) 
+	@rm -f test-u16-cmp2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_cmp2_OBJECTS) $(test_u16_cmp2_LDADD) $(LIBS)
 uniconv/$(am__dirstamp):
 	@$(MKDIR_P) uniconv
 	@: > uniconv/$(am__dirstamp)
@@ -5081,6 +6175,16 @@ uniconv/test-u16-conv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 test-u16-conv-to-enc$(EXEEXT): $(test_u16_conv_to_enc_OBJECTS) $(test_u16_conv_to_enc_DEPENDENCIES) 
 	@rm -f test-u16-conv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_conv_to_enc_OBJECTS) $(test_u16_conv_to_enc_LDADD) $(LIBS)
+unistr/test-u16-cpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-cpy$(EXEEXT): $(test_u16_cpy_OBJECTS) $(test_u16_cpy_DEPENDENCIES) 
+	@rm -f test-u16-cpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_cpy_OBJECTS) $(test_u16_cpy_LDADD) $(LIBS)
+unistr/test-u16-cpy-alloc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-cpy-alloc$(EXEEXT): $(test_u16_cpy_alloc_OBJECTS) $(test_u16_cpy_alloc_DEPENDENCIES) 
+	@rm -f test-u16-cpy-alloc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_cpy_alloc_OBJECTS) $(test_u16_cpy_alloc_LDADD) $(LIBS)
 unicase/test-u16-is-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-u16-is-cased$(EXEEXT): $(test_u16_is_cased_OBJECTS) $(test_u16_is_cased_DEPENDENCIES) 
@@ -5106,6 +6210,41 @@ unicase/test-u16-is-uppercase.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u16-is-uppercase$(EXEEXT): $(test_u16_is_uppercase_OBJECTS) $(test_u16_is_uppercase_DEPENDENCIES) 
 	@rm -f test-u16-is-uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_is_uppercase_OBJECTS) $(test_u16_is_uppercase_LDADD) $(LIBS)
+unistr/test-u16-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-mblen$(EXEEXT): $(test_u16_mblen_OBJECTS) $(test_u16_mblen_DEPENDENCIES) 
+	@rm -f test-u16-mblen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_mblen_OBJECTS) $(test_u16_mblen_LDADD) $(LIBS)
+unistr/test-u16-mbsnlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-mbsnlen$(EXEEXT): $(test_u16_mbsnlen_OBJECTS) $(test_u16_mbsnlen_DEPENDENCIES) 
+	@rm -f test-u16-mbsnlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_mbsnlen_OBJECTS) $(test_u16_mbsnlen_LDADD) $(LIBS)
+unistr/test-u16-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-mbtouc$(EXEEXT): $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_DEPENDENCIES) 
+	@rm -f test-u16-mbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_mbtouc_OBJECTS) $(test_u16_mbtouc_LDADD) $(LIBS)
+unistr/test-u16-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-mbtouc-unsafe$(EXEEXT): $(test_u16_mbtouc_unsafe_OBJECTS) $(test_u16_mbtouc_unsafe_DEPENDENCIES) 
+	@rm -f test-u16-mbtouc-unsafe$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_mbtouc_unsafe_OBJECTS) $(test_u16_mbtouc_unsafe_LDADD) $(LIBS)
+unistr/test-u16-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-mbtoucr$(EXEEXT): $(test_u16_mbtoucr_OBJECTS) $(test_u16_mbtoucr_DEPENDENCIES) 
+	@rm -f test-u16-mbtoucr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_mbtoucr_OBJECTS) $(test_u16_mbtoucr_LDADD) $(LIBS)
+unistr/test-u16-move.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-move$(EXEEXT): $(test_u16_move_OBJECTS) $(test_u16_move_DEPENDENCIES) 
+	@rm -f test-u16-move$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_move_OBJECTS) $(test_u16_move_LDADD) $(LIBS)
+unistr/test-u16-next.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-next$(EXEEXT): $(test_u16_next_OBJECTS) $(test_u16_next_DEPENDENCIES) 
+	@rm -f test-u16-next$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_next_OBJECTS) $(test_u16_next_LDADD) $(LIBS)
 uninorm/test-u16-normcmp.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 test-u16-normcmp$(EXEEXT): $(test_u16_normcmp_OBJECTS) $(test_u16_normcmp_DEPENDENCIES) 
@@ -5127,6 +6266,41 @@ unilbrk/test-u16-possible-linebreaks.$(OBJEXT):  \
 test-u16-possible-linebreaks$(EXEEXT): $(test_u16_possible_linebreaks_OBJECTS) $(test_u16_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-u16-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_possible_linebreaks_OBJECTS) $(test_u16_possible_linebreaks_LDADD) $(LIBS)
+unistr/test-u16-prev.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-prev$(EXEEXT): $(test_u16_prev_OBJECTS) $(test_u16_prev_DEPENDENCIES) 
+	@rm -f test-u16-prev$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_prev_OBJECTS) $(test_u16_prev_LDADD) $(LIBS)
+unistr/test-u16-set.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-set$(EXEEXT): $(test_u16_set_OBJECTS) $(test_u16_set_DEPENDENCIES) 
+	@rm -f test-u16-set$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_set_OBJECTS) $(test_u16_set_LDADD) $(LIBS)
+unistr/test-u16-stpcpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-stpcpy$(EXEEXT): $(test_u16_stpcpy_OBJECTS) $(test_u16_stpcpy_DEPENDENCIES) 
+	@rm -f test-u16-stpcpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_stpcpy_OBJECTS) $(test_u16_stpcpy_LDADD) $(LIBS)
+unistr/test-u16-stpncpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-stpncpy$(EXEEXT): $(test_u16_stpncpy_OBJECTS) $(test_u16_stpncpy_DEPENDENCIES) 
+	@rm -f test-u16-stpncpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_stpncpy_OBJECTS) $(test_u16_stpncpy_LDADD) $(LIBS)
+unistr/test-u16-strcat.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strcat$(EXEEXT): $(test_u16_strcat_OBJECTS) $(test_u16_strcat_DEPENDENCIES) 
+	@rm -f test-u16-strcat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strcat_OBJECTS) $(test_u16_strcat_LDADD) $(LIBS)
+unistr/test-u16-strcmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strcmp$(EXEEXT): $(test_u16_strcmp_OBJECTS) $(test_u16_strcmp_DEPENDENCIES) 
+	@rm -f test-u16-strcmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strcmp_OBJECTS) $(test_u16_strcmp_LDADD) $(LIBS)
+unistr/test-u16-strcoll.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strcoll$(EXEEXT): $(test_u16_strcoll_OBJECTS) $(test_u16_strcoll_DEPENDENCIES) 
+	@rm -f test-u16-strcoll$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strcoll_OBJECTS) $(test_u16_strcoll_LDADD) $(LIBS)
 uniconv/test-u16-strconv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
 test-u16-strconv-from-enc$(EXEEXT): $(test_u16_strconv_from_enc_OBJECTS) $(test_u16_strconv_from_enc_DEPENDENCIES) 
@@ -5137,6 +6311,51 @@ uniconv/test-u16-strconv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 test-u16-strconv-to-enc$(EXEEXT): $(test_u16_strconv_to_enc_OBJECTS) $(test_u16_strconv_to_enc_DEPENDENCIES) 
 	@rm -f test-u16-strconv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strconv_to_enc_OBJECTS) $(test_u16_strconv_to_enc_LDADD) $(LIBS)
+unistr/test-u16-strcpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strcpy$(EXEEXT): $(test_u16_strcpy_OBJECTS) $(test_u16_strcpy_DEPENDENCIES) 
+	@rm -f test-u16-strcpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strcpy_OBJECTS) $(test_u16_strcpy_LDADD) $(LIBS)
+unistr/test-u16-strdup.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strdup$(EXEEXT): $(test_u16_strdup_OBJECTS) $(test_u16_strdup_DEPENDENCIES) 
+	@rm -f test-u16-strdup$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strdup_OBJECTS) $(test_u16_strdup_LDADD) $(LIBS)
+unistr/test-u16-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strlen$(EXEEXT): $(test_u16_strlen_OBJECTS) $(test_u16_strlen_DEPENDENCIES) 
+	@rm -f test-u16-strlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strlen_OBJECTS) $(test_u16_strlen_LDADD) $(LIBS)
+unistr/test-u16-strmblen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strmblen$(EXEEXT): $(test_u16_strmblen_OBJECTS) $(test_u16_strmblen_DEPENDENCIES) 
+	@rm -f test-u16-strmblen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strmblen_OBJECTS) $(test_u16_strmblen_LDADD) $(LIBS)
+unistr/test-u16-strmbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strmbtouc$(EXEEXT): $(test_u16_strmbtouc_OBJECTS) $(test_u16_strmbtouc_DEPENDENCIES) 
+	@rm -f test-u16-strmbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strmbtouc_OBJECTS) $(test_u16_strmbtouc_LDADD) $(LIBS)
+unistr/test-u16-strncat.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strncat$(EXEEXT): $(test_u16_strncat_OBJECTS) $(test_u16_strncat_DEPENDENCIES) 
+	@rm -f test-u16-strncat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strncat_OBJECTS) $(test_u16_strncat_LDADD) $(LIBS)
+unistr/test-u16-strncmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strncmp$(EXEEXT): $(test_u16_strncmp_OBJECTS) $(test_u16_strncmp_DEPENDENCIES) 
+	@rm -f test-u16-strncmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strncmp_OBJECTS) $(test_u16_strncmp_LDADD) $(LIBS)
+unistr/test-u16-strncpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strncpy$(EXEEXT): $(test_u16_strncpy_OBJECTS) $(test_u16_strncpy_DEPENDENCIES) 
+	@rm -f test-u16-strncpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strncpy_OBJECTS) $(test_u16_strncpy_LDADD) $(LIBS)
+unistr/test-u16-strnlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-strnlen$(EXEEXT): $(test_u16_strnlen_OBJECTS) $(test_u16_strnlen_DEPENDENCIES) 
+	@rm -f test-u16-strnlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_strnlen_OBJECTS) $(test_u16_strnlen_LDADD) $(LIBS)
 uniwidth/$(am__dirstamp):
 	@$(MKDIR_P) uniwidth
 	@: > uniwidth/$(am__dirstamp)
@@ -5148,6 +6367,16 @@ uniwidth/test-u16-strwidth.$(OBJEXT): uniwidth/$(am__dirstamp) \
 test-u16-strwidth$(EXEEXT): $(test_u16_strwidth_OBJECTS) $(test_u16_strwidth_DEPENDENCIES) 
 	@rm -f test-u16-strwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_strwidth_OBJECTS) $(test_u16_strwidth_LDADD) $(LIBS)
+unistr/test-u16-to-u32.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-to-u32$(EXEEXT): $(test_u16_to_u32_OBJECTS) $(test_u16_to_u32_DEPENDENCIES) 
+	@rm -f test-u16-to-u32$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_to_u32_OBJECTS) $(test_u16_to_u32_LDADD) $(LIBS)
+unistr/test-u16-to-u8.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-to-u8$(EXEEXT): $(test_u16_to_u8_OBJECTS) $(test_u16_to_u8_DEPENDENCIES) 
+	@rm -f test-u16-to-u8$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_to_u8_OBJECTS) $(test_u16_to_u8_LDADD) $(LIBS)
 unicase/test-u16-tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-u16-tolower$(EXEEXT): $(test_u16_tolower_OBJECTS) $(test_u16_tolower_DEPENDENCIES) 
@@ -5163,6 +6392,11 @@ unicase/test-u16-toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u16-toupper$(EXEEXT): $(test_u16_toupper_OBJECTS) $(test_u16_toupper_DEPENDENCIES) 
 	@rm -f test-u16-toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u16_toupper_OBJECTS) $(test_u16_toupper_LDADD) $(LIBS)
+unistr/test-u16-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u16-uctomb$(EXEEXT): $(test_u16_uctomb_OBJECTS) $(test_u16_uctomb_DEPENDENCIES) 
+	@rm -f test-u16-uctomb$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u16_uctomb_OBJECTS) $(test_u16_uctomb_LDADD) $(LIBS)
 unistdio/test-u16-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
 test-u16-vasnprintf1$(EXEEXT): $(test_u16_vasnprintf1_OBJECTS) $(test_u16_vasnprintf1_DEPENDENCIES) 
@@ -5234,6 +6468,26 @@ unicase/test-u32-casefold.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u32-casefold$(EXEEXT): $(test_u32_casefold_OBJECTS) $(test_u32_casefold_DEPENDENCIES) 
 	@rm -f test-u32-casefold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_casefold_OBJECTS) $(test_u32_casefold_LDADD) $(LIBS)
+unistr/test-u32-check.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-check$(EXEEXT): $(test_u32_check_OBJECTS) $(test_u32_check_DEPENDENCIES) 
+	@rm -f test-u32-check$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_check_OBJECTS) $(test_u32_check_LDADD) $(LIBS)
+unistr/test-u32-chr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-chr$(EXEEXT): $(test_u32_chr_OBJECTS) $(test_u32_chr_DEPENDENCIES) 
+	@rm -f test-u32-chr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_chr_OBJECTS) $(test_u32_chr_LDADD) $(LIBS)
+unistr/test-u32-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-cmp$(EXEEXT): $(test_u32_cmp_OBJECTS) $(test_u32_cmp_DEPENDENCIES) 
+	@rm -f test-u32-cmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_cmp_OBJECTS) $(test_u32_cmp_LDADD) $(LIBS)
+unistr/test-u32-cmp2.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-cmp2$(EXEEXT): $(test_u32_cmp2_OBJECTS) $(test_u32_cmp2_DEPENDENCIES) 
+	@rm -f test-u32-cmp2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_cmp2_OBJECTS) $(test_u32_cmp2_LDADD) $(LIBS)
 uniconv/test-u32-conv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
 test-u32-conv-from-enc$(EXEEXT): $(test_u32_conv_from_enc_OBJECTS) $(test_u32_conv_from_enc_DEPENDENCIES) 
@@ -5244,6 +6498,16 @@ uniconv/test-u32-conv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 test-u32-conv-to-enc$(EXEEXT): $(test_u32_conv_to_enc_OBJECTS) $(test_u32_conv_to_enc_DEPENDENCIES) 
 	@rm -f test-u32-conv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_conv_to_enc_OBJECTS) $(test_u32_conv_to_enc_LDADD) $(LIBS)
+unistr/test-u32-cpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-cpy$(EXEEXT): $(test_u32_cpy_OBJECTS) $(test_u32_cpy_DEPENDENCIES) 
+	@rm -f test-u32-cpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_cpy_OBJECTS) $(test_u32_cpy_LDADD) $(LIBS)
+unistr/test-u32-cpy-alloc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-cpy-alloc$(EXEEXT): $(test_u32_cpy_alloc_OBJECTS) $(test_u32_cpy_alloc_DEPENDENCIES) 
+	@rm -f test-u32-cpy-alloc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_cpy_alloc_OBJECTS) $(test_u32_cpy_alloc_LDADD) $(LIBS)
 unicase/test-u32-is-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-u32-is-cased$(EXEEXT): $(test_u32_is_cased_OBJECTS) $(test_u32_is_cased_DEPENDENCIES) 
@@ -5269,6 +6533,41 @@ unicase/test-u32-is-uppercase.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u32-is-uppercase$(EXEEXT): $(test_u32_is_uppercase_OBJECTS) $(test_u32_is_uppercase_DEPENDENCIES) 
 	@rm -f test-u32-is-uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_is_uppercase_OBJECTS) $(test_u32_is_uppercase_LDADD) $(LIBS)
+unistr/test-u32-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-mblen$(EXEEXT): $(test_u32_mblen_OBJECTS) $(test_u32_mblen_DEPENDENCIES) 
+	@rm -f test-u32-mblen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_mblen_OBJECTS) $(test_u32_mblen_LDADD) $(LIBS)
+unistr/test-u32-mbsnlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-mbsnlen$(EXEEXT): $(test_u32_mbsnlen_OBJECTS) $(test_u32_mbsnlen_DEPENDENCIES) 
+	@rm -f test-u32-mbsnlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_mbsnlen_OBJECTS) $(test_u32_mbsnlen_LDADD) $(LIBS)
+unistr/test-u32-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-mbtouc$(EXEEXT): $(test_u32_mbtouc_OBJECTS) $(test_u32_mbtouc_DEPENDENCIES) 
+	@rm -f test-u32-mbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_mbtouc_OBJECTS) $(test_u32_mbtouc_LDADD) $(LIBS)
+unistr/test-u32-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-mbtouc-unsafe$(EXEEXT): $(test_u32_mbtouc_unsafe_OBJECTS) $(test_u32_mbtouc_unsafe_DEPENDENCIES) 
+	@rm -f test-u32-mbtouc-unsafe$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_mbtouc_unsafe_OBJECTS) $(test_u32_mbtouc_unsafe_LDADD) $(LIBS)
+unistr/test-u32-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-mbtoucr$(EXEEXT): $(test_u32_mbtoucr_OBJECTS) $(test_u32_mbtoucr_DEPENDENCIES) 
+	@rm -f test-u32-mbtoucr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_mbtoucr_OBJECTS) $(test_u32_mbtoucr_LDADD) $(LIBS)
+unistr/test-u32-move.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-move$(EXEEXT): $(test_u32_move_OBJECTS) $(test_u32_move_DEPENDENCIES) 
+	@rm -f test-u32-move$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_move_OBJECTS) $(test_u32_move_LDADD) $(LIBS)
+unistr/test-u32-next.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-next$(EXEEXT): $(test_u32_next_OBJECTS) $(test_u32_next_DEPENDENCIES) 
+	@rm -f test-u32-next$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_next_OBJECTS) $(test_u32_next_LDADD) $(LIBS)
 uninorm/test-u32-nfc-big.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 uninorm/test-u32-normalize-big.$(OBJEXT): uninorm/$(am__dirstamp) \
@@ -5306,6 +6605,41 @@ unilbrk/test-u32-possible-linebreaks.$(OBJEXT):  \
 test-u32-possible-linebreaks$(EXEEXT): $(test_u32_possible_linebreaks_OBJECTS) $(test_u32_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-u32-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_possible_linebreaks_OBJECTS) $(test_u32_possible_linebreaks_LDADD) $(LIBS)
+unistr/test-u32-prev.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-prev$(EXEEXT): $(test_u32_prev_OBJECTS) $(test_u32_prev_DEPENDENCIES) 
+	@rm -f test-u32-prev$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_prev_OBJECTS) $(test_u32_prev_LDADD) $(LIBS)
+unistr/test-u32-set.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-set$(EXEEXT): $(test_u32_set_OBJECTS) $(test_u32_set_DEPENDENCIES) 
+	@rm -f test-u32-set$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_set_OBJECTS) $(test_u32_set_LDADD) $(LIBS)
+unistr/test-u32-stpcpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-stpcpy$(EXEEXT): $(test_u32_stpcpy_OBJECTS) $(test_u32_stpcpy_DEPENDENCIES) 
+	@rm -f test-u32-stpcpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_stpcpy_OBJECTS) $(test_u32_stpcpy_LDADD) $(LIBS)
+unistr/test-u32-stpncpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-stpncpy$(EXEEXT): $(test_u32_stpncpy_OBJECTS) $(test_u32_stpncpy_DEPENDENCIES) 
+	@rm -f test-u32-stpncpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_stpncpy_OBJECTS) $(test_u32_stpncpy_LDADD) $(LIBS)
+unistr/test-u32-strcat.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strcat$(EXEEXT): $(test_u32_strcat_OBJECTS) $(test_u32_strcat_DEPENDENCIES) 
+	@rm -f test-u32-strcat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strcat_OBJECTS) $(test_u32_strcat_LDADD) $(LIBS)
+unistr/test-u32-strcmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strcmp$(EXEEXT): $(test_u32_strcmp_OBJECTS) $(test_u32_strcmp_DEPENDENCIES) 
+	@rm -f test-u32-strcmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strcmp_OBJECTS) $(test_u32_strcmp_LDADD) $(LIBS)
+unistr/test-u32-strcoll.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strcoll$(EXEEXT): $(test_u32_strcoll_OBJECTS) $(test_u32_strcoll_DEPENDENCIES) 
+	@rm -f test-u32-strcoll$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strcoll_OBJECTS) $(test_u32_strcoll_LDADD) $(LIBS)
 uniconv/test-u32-strconv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
 test-u32-strconv-from-enc$(EXEEXT): $(test_u32_strconv_from_enc_OBJECTS) $(test_u32_strconv_from_enc_DEPENDENCIES) 
@@ -5316,11 +6650,66 @@ uniconv/test-u32-strconv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 test-u32-strconv-to-enc$(EXEEXT): $(test_u32_strconv_to_enc_OBJECTS) $(test_u32_strconv_to_enc_DEPENDENCIES) 
 	@rm -f test-u32-strconv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strconv_to_enc_OBJECTS) $(test_u32_strconv_to_enc_LDADD) $(LIBS)
+unistr/test-u32-strcpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strcpy$(EXEEXT): $(test_u32_strcpy_OBJECTS) $(test_u32_strcpy_DEPENDENCIES) 
+	@rm -f test-u32-strcpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strcpy_OBJECTS) $(test_u32_strcpy_LDADD) $(LIBS)
+unistr/test-u32-strdup.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strdup$(EXEEXT): $(test_u32_strdup_OBJECTS) $(test_u32_strdup_DEPENDENCIES) 
+	@rm -f test-u32-strdup$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strdup_OBJECTS) $(test_u32_strdup_LDADD) $(LIBS)
+unistr/test-u32-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strlen$(EXEEXT): $(test_u32_strlen_OBJECTS) $(test_u32_strlen_DEPENDENCIES) 
+	@rm -f test-u32-strlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strlen_OBJECTS) $(test_u32_strlen_LDADD) $(LIBS)
+unistr/test-u32-strmblen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strmblen$(EXEEXT): $(test_u32_strmblen_OBJECTS) $(test_u32_strmblen_DEPENDENCIES) 
+	@rm -f test-u32-strmblen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strmblen_OBJECTS) $(test_u32_strmblen_LDADD) $(LIBS)
+unistr/test-u32-strmbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strmbtouc$(EXEEXT): $(test_u32_strmbtouc_OBJECTS) $(test_u32_strmbtouc_DEPENDENCIES) 
+	@rm -f test-u32-strmbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strmbtouc_OBJECTS) $(test_u32_strmbtouc_LDADD) $(LIBS)
+unistr/test-u32-strncat.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strncat$(EXEEXT): $(test_u32_strncat_OBJECTS) $(test_u32_strncat_DEPENDENCIES) 
+	@rm -f test-u32-strncat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strncat_OBJECTS) $(test_u32_strncat_LDADD) $(LIBS)
+unistr/test-u32-strncmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strncmp$(EXEEXT): $(test_u32_strncmp_OBJECTS) $(test_u32_strncmp_DEPENDENCIES) 
+	@rm -f test-u32-strncmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strncmp_OBJECTS) $(test_u32_strncmp_LDADD) $(LIBS)
+unistr/test-u32-strncpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strncpy$(EXEEXT): $(test_u32_strncpy_OBJECTS) $(test_u32_strncpy_DEPENDENCIES) 
+	@rm -f test-u32-strncpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strncpy_OBJECTS) $(test_u32_strncpy_LDADD) $(LIBS)
+unistr/test-u32-strnlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-strnlen$(EXEEXT): $(test_u32_strnlen_OBJECTS) $(test_u32_strnlen_DEPENDENCIES) 
+	@rm -f test-u32-strnlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_strnlen_OBJECTS) $(test_u32_strnlen_LDADD) $(LIBS)
 uniwidth/test-u32-strwidth.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
 test-u32-strwidth$(EXEEXT): $(test_u32_strwidth_OBJECTS) $(test_u32_strwidth_DEPENDENCIES) 
 	@rm -f test-u32-strwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_strwidth_OBJECTS) $(test_u32_strwidth_LDADD) $(LIBS)
+unistr/test-u32-to-u16.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-to-u16$(EXEEXT): $(test_u32_to_u16_OBJECTS) $(test_u32_to_u16_DEPENDENCIES) 
+	@rm -f test-u32-to-u16$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_to_u16_OBJECTS) $(test_u32_to_u16_LDADD) $(LIBS)
+unistr/test-u32-to-u8.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-to-u8$(EXEEXT): $(test_u32_to_u8_OBJECTS) $(test_u32_to_u8_DEPENDENCIES) 
+	@rm -f test-u32-to-u8$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_to_u8_OBJECTS) $(test_u32_to_u8_LDADD) $(LIBS)
 unicase/test-u32-tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-u32-tolower$(EXEEXT): $(test_u32_tolower_OBJECTS) $(test_u32_tolower_DEPENDENCIES) 
@@ -5336,6 +6725,11 @@ unicase/test-u32-toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u32-toupper$(EXEEXT): $(test_u32_toupper_OBJECTS) $(test_u32_toupper_DEPENDENCIES) 
 	@rm -f test-u32-toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u32_toupper_OBJECTS) $(test_u32_toupper_LDADD) $(LIBS)
+unistr/test-u32-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u32-uctomb$(EXEEXT): $(test_u32_uctomb_OBJECTS) $(test_u32_uctomb_DEPENDENCIES) 
+	@rm -f test-u32-uctomb$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u32_uctomb_OBJECTS) $(test_u32_uctomb_LDADD) $(LIBS)
 unistdio/test-u32-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
 test-u32-vasnprintf1$(EXEEXT): $(test_u32_vasnprintf1_OBJECTS) $(test_u32_vasnprintf1_DEPENDENCIES) 
@@ -5401,6 +6795,26 @@ unicase/test-u8-casefold.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u8-casefold$(EXEEXT): $(test_u8_casefold_OBJECTS) $(test_u8_casefold_DEPENDENCIES) 
 	@rm -f test-u8-casefold$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_casefold_OBJECTS) $(test_u8_casefold_LDADD) $(LIBS)
+unistr/test-u8-check.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-check$(EXEEXT): $(test_u8_check_OBJECTS) $(test_u8_check_DEPENDENCIES) 
+	@rm -f test-u8-check$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_check_OBJECTS) $(test_u8_check_LDADD) $(LIBS)
+unistr/test-u8-chr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-chr$(EXEEXT): $(test_u8_chr_OBJECTS) $(test_u8_chr_DEPENDENCIES) 
+	@rm -f test-u8-chr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_chr_OBJECTS) $(test_u8_chr_LDADD) $(LIBS)
+unistr/test-u8-cmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-cmp$(EXEEXT): $(test_u8_cmp_OBJECTS) $(test_u8_cmp_DEPENDENCIES) 
+	@rm -f test-u8-cmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_cmp_OBJECTS) $(test_u8_cmp_LDADD) $(LIBS)
+unistr/test-u8-cmp2.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-cmp2$(EXEEXT): $(test_u8_cmp2_OBJECTS) $(test_u8_cmp2_DEPENDENCIES) 
+	@rm -f test-u8-cmp2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_cmp2_OBJECTS) $(test_u8_cmp2_LDADD) $(LIBS)
 uniconv/test-u8-conv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
 test-u8-conv-from-enc$(EXEEXT): $(test_u8_conv_from_enc_OBJECTS) $(test_u8_conv_from_enc_DEPENDENCIES) 
@@ -5411,6 +6825,16 @@ uniconv/test-u8-conv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 test-u8-conv-to-enc$(EXEEXT): $(test_u8_conv_to_enc_OBJECTS) $(test_u8_conv_to_enc_DEPENDENCIES) 
 	@rm -f test-u8-conv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_conv_to_enc_OBJECTS) $(test_u8_conv_to_enc_LDADD) $(LIBS)
+unistr/test-u8-cpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-cpy$(EXEEXT): $(test_u8_cpy_OBJECTS) $(test_u8_cpy_DEPENDENCIES) 
+	@rm -f test-u8-cpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_cpy_OBJECTS) $(test_u8_cpy_LDADD) $(LIBS)
+unistr/test-u8-cpy-alloc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-cpy-alloc$(EXEEXT): $(test_u8_cpy_alloc_OBJECTS) $(test_u8_cpy_alloc_DEPENDENCIES) 
+	@rm -f test-u8-cpy-alloc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_cpy_alloc_OBJECTS) $(test_u8_cpy_alloc_LDADD) $(LIBS)
 unicase/test-u8-is-cased.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-u8-is-cased$(EXEEXT): $(test_u8_is_cased_OBJECTS) $(test_u8_is_cased_DEPENDENCIES) 
@@ -5436,6 +6860,41 @@ unicase/test-u8-is-uppercase.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u8-is-uppercase$(EXEEXT): $(test_u8_is_uppercase_OBJECTS) $(test_u8_is_uppercase_DEPENDENCIES) 
 	@rm -f test-u8-is-uppercase$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_is_uppercase_OBJECTS) $(test_u8_is_uppercase_LDADD) $(LIBS)
+unistr/test-u8-mblen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mblen$(EXEEXT): $(test_u8_mblen_OBJECTS) $(test_u8_mblen_DEPENDENCIES) 
+	@rm -f test-u8-mblen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mblen_OBJECTS) $(test_u8_mblen_LDADD) $(LIBS)
+unistr/test-u8-mbsnlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mbsnlen$(EXEEXT): $(test_u8_mbsnlen_OBJECTS) $(test_u8_mbsnlen_DEPENDENCIES) 
+	@rm -f test-u8-mbsnlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mbsnlen_OBJECTS) $(test_u8_mbsnlen_LDADD) $(LIBS)
+unistr/test-u8-mbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mbtouc$(EXEEXT): $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_DEPENDENCIES) 
+	@rm -f test-u8-mbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mbtouc_OBJECTS) $(test_u8_mbtouc_LDADD) $(LIBS)
+unistr/test-u8-mbtouc-unsafe.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mbtouc-unsafe$(EXEEXT): $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_DEPENDENCIES) 
+	@rm -f test-u8-mbtouc-unsafe$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mbtouc_unsafe_OBJECTS) $(test_u8_mbtouc_unsafe_LDADD) $(LIBS)
+unistr/test-u8-mbtoucr.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-mbtoucr$(EXEEXT): $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_DEPENDENCIES) 
+	@rm -f test-u8-mbtoucr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_mbtoucr_OBJECTS) $(test_u8_mbtoucr_LDADD) $(LIBS)
+unistr/test-u8-move.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-move$(EXEEXT): $(test_u8_move_OBJECTS) $(test_u8_move_DEPENDENCIES) 
+	@rm -f test-u8-move$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_move_OBJECTS) $(test_u8_move_LDADD) $(LIBS)
+unistr/test-u8-next.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-next$(EXEEXT): $(test_u8_next_OBJECTS) $(test_u8_next_DEPENDENCIES) 
+	@rm -f test-u8-next$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_next_OBJECTS) $(test_u8_next_LDADD) $(LIBS)
 uninorm/test-u8-normcmp.$(OBJEXT): uninorm/$(am__dirstamp) \
 	uninorm/$(DEPDIR)/$(am__dirstamp)
 test-u8-normcmp$(EXEEXT): $(test_u8_normcmp_OBJECTS) $(test_u8_normcmp_DEPENDENCIES) 
@@ -5451,6 +6910,41 @@ unilbrk/test-u8-possible-linebreaks.$(OBJEXT):  \
 test-u8-possible-linebreaks$(EXEEXT): $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_DEPENDENCIES) 
 	@rm -f test-u8-possible-linebreaks$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_possible_linebreaks_OBJECTS) $(test_u8_possible_linebreaks_LDADD) $(LIBS)
+unistr/test-u8-prev.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-prev$(EXEEXT): $(test_u8_prev_OBJECTS) $(test_u8_prev_DEPENDENCIES) 
+	@rm -f test-u8-prev$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_prev_OBJECTS) $(test_u8_prev_LDADD) $(LIBS)
+unistr/test-u8-set.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-set$(EXEEXT): $(test_u8_set_OBJECTS) $(test_u8_set_DEPENDENCIES) 
+	@rm -f test-u8-set$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_set_OBJECTS) $(test_u8_set_LDADD) $(LIBS)
+unistr/test-u8-stpcpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-stpcpy$(EXEEXT): $(test_u8_stpcpy_OBJECTS) $(test_u8_stpcpy_DEPENDENCIES) 
+	@rm -f test-u8-stpcpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_stpcpy_OBJECTS) $(test_u8_stpcpy_LDADD) $(LIBS)
+unistr/test-u8-stpncpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-stpncpy$(EXEEXT): $(test_u8_stpncpy_OBJECTS) $(test_u8_stpncpy_DEPENDENCIES) 
+	@rm -f test-u8-stpncpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_stpncpy_OBJECTS) $(test_u8_stpncpy_LDADD) $(LIBS)
+unistr/test-u8-strcat.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strcat$(EXEEXT): $(test_u8_strcat_OBJECTS) $(test_u8_strcat_DEPENDENCIES) 
+	@rm -f test-u8-strcat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strcat_OBJECTS) $(test_u8_strcat_LDADD) $(LIBS)
+unistr/test-u8-strcmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strcmp$(EXEEXT): $(test_u8_strcmp_OBJECTS) $(test_u8_strcmp_DEPENDENCIES) 
+	@rm -f test-u8-strcmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strcmp_OBJECTS) $(test_u8_strcmp_LDADD) $(LIBS)
+unistr/test-u8-strcoll.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strcoll$(EXEEXT): $(test_u8_strcoll_OBJECTS) $(test_u8_strcoll_DEPENDENCIES) 
+	@rm -f test-u8-strcoll$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strcoll_OBJECTS) $(test_u8_strcoll_LDADD) $(LIBS)
 uniconv/test-u8-strconv-from-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 	uniconv/$(DEPDIR)/$(am__dirstamp)
 test-u8-strconv-from-enc$(EXEEXT): $(test_u8_strconv_from_enc_OBJECTS) $(test_u8_strconv_from_enc_DEPENDENCIES) 
@@ -5461,11 +6955,66 @@ uniconv/test-u8-strconv-to-enc.$(OBJEXT): uniconv/$(am__dirstamp) \
 test-u8-strconv-to-enc$(EXEEXT): $(test_u8_strconv_to_enc_OBJECTS) $(test_u8_strconv_to_enc_DEPENDENCIES) 
 	@rm -f test-u8-strconv-to-enc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strconv_to_enc_OBJECTS) $(test_u8_strconv_to_enc_LDADD) $(LIBS)
+unistr/test-u8-strcpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strcpy$(EXEEXT): $(test_u8_strcpy_OBJECTS) $(test_u8_strcpy_DEPENDENCIES) 
+	@rm -f test-u8-strcpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strcpy_OBJECTS) $(test_u8_strcpy_LDADD) $(LIBS)
+unistr/test-u8-strdup.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strdup$(EXEEXT): $(test_u8_strdup_OBJECTS) $(test_u8_strdup_DEPENDENCIES) 
+	@rm -f test-u8-strdup$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strdup_OBJECTS) $(test_u8_strdup_LDADD) $(LIBS)
+unistr/test-u8-strlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strlen$(EXEEXT): $(test_u8_strlen_OBJECTS) $(test_u8_strlen_DEPENDENCIES) 
+	@rm -f test-u8-strlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strlen_OBJECTS) $(test_u8_strlen_LDADD) $(LIBS)
+unistr/test-u8-strmblen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strmblen$(EXEEXT): $(test_u8_strmblen_OBJECTS) $(test_u8_strmblen_DEPENDENCIES) 
+	@rm -f test-u8-strmblen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strmblen_OBJECTS) $(test_u8_strmblen_LDADD) $(LIBS)
+unistr/test-u8-strmbtouc.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strmbtouc$(EXEEXT): $(test_u8_strmbtouc_OBJECTS) $(test_u8_strmbtouc_DEPENDENCIES) 
+	@rm -f test-u8-strmbtouc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strmbtouc_OBJECTS) $(test_u8_strmbtouc_LDADD) $(LIBS)
+unistr/test-u8-strncat.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strncat$(EXEEXT): $(test_u8_strncat_OBJECTS) $(test_u8_strncat_DEPENDENCIES) 
+	@rm -f test-u8-strncat$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strncat_OBJECTS) $(test_u8_strncat_LDADD) $(LIBS)
+unistr/test-u8-strncmp.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strncmp$(EXEEXT): $(test_u8_strncmp_OBJECTS) $(test_u8_strncmp_DEPENDENCIES) 
+	@rm -f test-u8-strncmp$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strncmp_OBJECTS) $(test_u8_strncmp_LDADD) $(LIBS)
+unistr/test-u8-strncpy.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strncpy$(EXEEXT): $(test_u8_strncpy_OBJECTS) $(test_u8_strncpy_DEPENDENCIES) 
+	@rm -f test-u8-strncpy$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strncpy_OBJECTS) $(test_u8_strncpy_LDADD) $(LIBS)
+unistr/test-u8-strnlen.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-strnlen$(EXEEXT): $(test_u8_strnlen_OBJECTS) $(test_u8_strnlen_DEPENDENCIES) 
+	@rm -f test-u8-strnlen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_strnlen_OBJECTS) $(test_u8_strnlen_LDADD) $(LIBS)
 uniwidth/test-u8-strwidth.$(OBJEXT): uniwidth/$(am__dirstamp) \
 	uniwidth/$(DEPDIR)/$(am__dirstamp)
 test-u8-strwidth$(EXEEXT): $(test_u8_strwidth_OBJECTS) $(test_u8_strwidth_DEPENDENCIES) 
 	@rm -f test-u8-strwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_strwidth_OBJECTS) $(test_u8_strwidth_LDADD) $(LIBS)
+unistr/test-u8-to-u16.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-to-u16$(EXEEXT): $(test_u8_to_u16_OBJECTS) $(test_u8_to_u16_DEPENDENCIES) 
+	@rm -f test-u8-to-u16$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_to_u16_OBJECTS) $(test_u8_to_u16_LDADD) $(LIBS)
+unistr/test-u8-to-u32.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-to-u32$(EXEEXT): $(test_u8_to_u32_OBJECTS) $(test_u8_to_u32_DEPENDENCIES) 
+	@rm -f test-u8-to-u32$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_to_u32_OBJECTS) $(test_u8_to_u32_LDADD) $(LIBS)
 unicase/test-u8-tolower.$(OBJEXT): unicase/$(am__dirstamp) \
 	unicase/$(DEPDIR)/$(am__dirstamp)
 test-u8-tolower$(EXEEXT): $(test_u8_tolower_OBJECTS) $(test_u8_tolower_DEPENDENCIES) 
@@ -5481,6 +7030,11 @@ unicase/test-u8-toupper.$(OBJEXT): unicase/$(am__dirstamp) \
 test-u8-toupper$(EXEEXT): $(test_u8_toupper_OBJECTS) $(test_u8_toupper_DEPENDENCIES) 
 	@rm -f test-u8-toupper$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_u8_toupper_OBJECTS) $(test_u8_toupper_LDADD) $(LIBS)
+unistr/test-u8-uctomb.$(OBJEXT): unistr/$(am__dirstamp) \
+	unistr/$(DEPDIR)/$(am__dirstamp)
+test-u8-uctomb$(EXEEXT): $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_DEPENDENCIES) 
+	@rm -f test-u8-uctomb$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_u8_uctomb_OBJECTS) $(test_u8_uctomb_LDADD) $(LIBS)
 unistdio/test-u8-vasnprintf1.$(OBJEXT): unistdio/$(am__dirstamp) \
 	unistdio/$(DEPDIR)/$(am__dirstamp)
 test-u8-vasnprintf1$(EXEEXT): $(test_u8_vasnprintf1_OBJECTS) $(test_u8_vasnprintf1_DEPENDENCIES) 
@@ -5630,6 +7184,9 @@ test-uninorm-filter-nfc$(EXEEXT): $(test_uninorm_filter_nfc_OBJECTS) $(test_unin
 test-unistd$(EXEEXT): $(test_unistd_OBJECTS) $(test_unistd_DEPENDENCIES) 
 	@rm -f test-unistd$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_unistd_OBJECTS) $(test_unistd_LDADD) $(LIBS)
+test-unsetenv$(EXEEXT): $(test_unsetenv_OBJECTS) $(test_unsetenv_DEPENDENCIES) 
+	@rm -f test-unsetenv$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_unsetenv_OBJECTS) $(test_unsetenv_LDADD) $(LIBS)
 test-wchar$(EXEEXT): $(test_wchar_OBJECTS) $(test_wchar_DEPENDENCIES) 
 	@rm -f test-wchar$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wchar_OBJECTS) $(test_wchar_LDADD) $(LIBS)
@@ -5639,9 +7196,13 @@ test-wctype$(EXEEXT): $(test_wctype_OBJECTS) $(test_wctype_DEPENDENCIES)
 test-wcwidth$(EXEEXT): $(test_wcwidth_OBJECTS) $(test_wcwidth_DEPENDENCIES) 
 	@rm -f test-wcwidth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_wcwidth_OBJECTS) $(test_wcwidth_LDADD) $(LIBS)
+test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENCIES) 
+	@rm -f test-xalloc-die$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_xalloc_die_OBJECTS) $(test_xalloc_die_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f glthread/thread.$(OBJEXT)
 	-rm -f unicase/test-cased.$(OBJEXT)
 	-rm -f unicase/test-ignorable.$(OBJEXT)
 	-rm -f unicase/test-locale-language.$(OBJEXT)
@@ -5920,6 +7481,102 @@ mostlyclean-compile:
 	-rm -f unistdio/test-ulc-vasprintf1.$(OBJEXT)
 	-rm -f unistdio/test-ulc-vsnprintf1.$(OBJEXT)
 	-rm -f unistdio/test-ulc-vsprintf1.$(OBJEXT)
+	-rm -f unistr/test-u16-check.$(OBJEXT)
+	-rm -f unistr/test-u16-chr.$(OBJEXT)
+	-rm -f unistr/test-u16-cmp.$(OBJEXT)
+	-rm -f unistr/test-u16-cmp2.$(OBJEXT)
+	-rm -f unistr/test-u16-cpy-alloc.$(OBJEXT)
+	-rm -f unistr/test-u16-cpy.$(OBJEXT)
+	-rm -f unistr/test-u16-mblen.$(OBJEXT)
+	-rm -f unistr/test-u16-mbsnlen.$(OBJEXT)
+	-rm -f unistr/test-u16-mbtouc-unsafe.$(OBJEXT)
+	-rm -f unistr/test-u16-mbtouc.$(OBJEXT)
+	-rm -f unistr/test-u16-mbtoucr.$(OBJEXT)
+	-rm -f unistr/test-u16-move.$(OBJEXT)
+	-rm -f unistr/test-u16-next.$(OBJEXT)
+	-rm -f unistr/test-u16-prev.$(OBJEXT)
+	-rm -f unistr/test-u16-set.$(OBJEXT)
+	-rm -f unistr/test-u16-stpcpy.$(OBJEXT)
+	-rm -f unistr/test-u16-stpncpy.$(OBJEXT)
+	-rm -f unistr/test-u16-strcat.$(OBJEXT)
+	-rm -f unistr/test-u16-strcmp.$(OBJEXT)
+	-rm -f unistr/test-u16-strcoll.$(OBJEXT)
+	-rm -f unistr/test-u16-strcpy.$(OBJEXT)
+	-rm -f unistr/test-u16-strdup.$(OBJEXT)
+	-rm -f unistr/test-u16-strlen.$(OBJEXT)
+	-rm -f unistr/test-u16-strmblen.$(OBJEXT)
+	-rm -f unistr/test-u16-strmbtouc.$(OBJEXT)
+	-rm -f unistr/test-u16-strncat.$(OBJEXT)
+	-rm -f unistr/test-u16-strncmp.$(OBJEXT)
+	-rm -f unistr/test-u16-strncpy.$(OBJEXT)
+	-rm -f unistr/test-u16-strnlen.$(OBJEXT)
+	-rm -f unistr/test-u16-to-u32.$(OBJEXT)
+	-rm -f unistr/test-u16-to-u8.$(OBJEXT)
+	-rm -f unistr/test-u16-uctomb.$(OBJEXT)
+	-rm -f unistr/test-u32-check.$(OBJEXT)
+	-rm -f unistr/test-u32-chr.$(OBJEXT)
+	-rm -f unistr/test-u32-cmp.$(OBJEXT)
+	-rm -f unistr/test-u32-cmp2.$(OBJEXT)
+	-rm -f unistr/test-u32-cpy-alloc.$(OBJEXT)
+	-rm -f unistr/test-u32-cpy.$(OBJEXT)
+	-rm -f unistr/test-u32-mblen.$(OBJEXT)
+	-rm -f unistr/test-u32-mbsnlen.$(OBJEXT)
+	-rm -f unistr/test-u32-mbtouc-unsafe.$(OBJEXT)
+	-rm -f unistr/test-u32-mbtouc.$(OBJEXT)
+	-rm -f unistr/test-u32-mbtoucr.$(OBJEXT)
+	-rm -f unistr/test-u32-move.$(OBJEXT)
+	-rm -f unistr/test-u32-next.$(OBJEXT)
+	-rm -f unistr/test-u32-prev.$(OBJEXT)
+	-rm -f unistr/test-u32-set.$(OBJEXT)
+	-rm -f unistr/test-u32-stpcpy.$(OBJEXT)
+	-rm -f unistr/test-u32-stpncpy.$(OBJEXT)
+	-rm -f unistr/test-u32-strcat.$(OBJEXT)
+	-rm -f unistr/test-u32-strcmp.$(OBJEXT)
+	-rm -f unistr/test-u32-strcoll.$(OBJEXT)
+	-rm -f unistr/test-u32-strcpy.$(OBJEXT)
+	-rm -f unistr/test-u32-strdup.$(OBJEXT)
+	-rm -f unistr/test-u32-strlen.$(OBJEXT)
+	-rm -f unistr/test-u32-strmblen.$(OBJEXT)
+	-rm -f unistr/test-u32-strmbtouc.$(OBJEXT)
+	-rm -f unistr/test-u32-strncat.$(OBJEXT)
+	-rm -f unistr/test-u32-strncmp.$(OBJEXT)
+	-rm -f unistr/test-u32-strncpy.$(OBJEXT)
+	-rm -f unistr/test-u32-strnlen.$(OBJEXT)
+	-rm -f unistr/test-u32-to-u16.$(OBJEXT)
+	-rm -f unistr/test-u32-to-u8.$(OBJEXT)
+	-rm -f unistr/test-u32-uctomb.$(OBJEXT)
+	-rm -f unistr/test-u8-check.$(OBJEXT)
+	-rm -f unistr/test-u8-chr.$(OBJEXT)
+	-rm -f unistr/test-u8-cmp.$(OBJEXT)
+	-rm -f unistr/test-u8-cmp2.$(OBJEXT)
+	-rm -f unistr/test-u8-cpy-alloc.$(OBJEXT)
+	-rm -f unistr/test-u8-cpy.$(OBJEXT)
+	-rm -f unistr/test-u8-mblen.$(OBJEXT)
+	-rm -f unistr/test-u8-mbsnlen.$(OBJEXT)
+	-rm -f unistr/test-u8-mbtouc-unsafe.$(OBJEXT)
+	-rm -f unistr/test-u8-mbtouc.$(OBJEXT)
+	-rm -f unistr/test-u8-mbtoucr.$(OBJEXT)
+	-rm -f unistr/test-u8-move.$(OBJEXT)
+	-rm -f unistr/test-u8-next.$(OBJEXT)
+	-rm -f unistr/test-u8-prev.$(OBJEXT)
+	-rm -f unistr/test-u8-set.$(OBJEXT)
+	-rm -f unistr/test-u8-stpcpy.$(OBJEXT)
+	-rm -f unistr/test-u8-stpncpy.$(OBJEXT)
+	-rm -f unistr/test-u8-strcat.$(OBJEXT)
+	-rm -f unistr/test-u8-strcmp.$(OBJEXT)
+	-rm -f unistr/test-u8-strcoll.$(OBJEXT)
+	-rm -f unistr/test-u8-strcpy.$(OBJEXT)
+	-rm -f unistr/test-u8-strdup.$(OBJEXT)
+	-rm -f unistr/test-u8-strlen.$(OBJEXT)
+	-rm -f unistr/test-u8-strmblen.$(OBJEXT)
+	-rm -f unistr/test-u8-strmbtouc.$(OBJEXT)
+	-rm -f unistr/test-u8-strncat.$(OBJEXT)
+	-rm -f unistr/test-u8-strncmp.$(OBJEXT)
+	-rm -f unistr/test-u8-strncpy.$(OBJEXT)
+	-rm -f unistr/test-u8-strnlen.$(OBJEXT)
+	-rm -f unistr/test-u8-to-u16.$(OBJEXT)
+	-rm -f unistr/test-u8-to-u32.$(OBJEXT)
+	-rm -f unistr/test-u8-uctomb.$(OBJEXT)
 	-rm -f uniwbrk/test-u16-wordbreaks.$(OBJEXT)
 	-rm -f uniwbrk/test-u32-wordbreaks.$(OBJEXT)
 	-rm -f uniwbrk/test-u8-wordbreaks.$(OBJEXT)
@@ -5938,8 +7595,9 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-alloca-opt.Po@am__quote@
@@ -5947,26 +7605,26 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strcasecmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strncasecmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dup2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-environ.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-errno.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fcntl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-frexpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fseterr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv-h.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnand-nolibm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnanf-nolibm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isnanl-nolibm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localename.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lock.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-malloca.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbrtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbsinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-memchr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-open.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexpl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signbit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdbool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stddef.Po@am__quote@
@@ -5976,14 +7634,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconveh.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-striconveha.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-string.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strncat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unsetenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wchar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcwidth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xalloc-die.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctob.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/thread.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/test-cased.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/test-ignorable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unicase/$(DEPDIR)/test-locale-language.Po@am__quote@
@@ -6262,6 +7924,102 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@unistdio/$(DEPDIR)/test-ulc-vasprintf1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistdio/$(DEPDIR)/test-ulc-vsnprintf1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unistdio/$(DEPDIR)/test-ulc-vsprintf1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-check.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-chr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-cmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-cmp2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-cpy-alloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-cpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-mblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-mbsnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-mbtouc-unsafe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-mbtouc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-mbtoucr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-move.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-prev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-set.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-stpcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-stpncpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcoll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strdup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strmblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strmbtouc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strncat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strncmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strncpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-to-u32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-to-u8.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u16-uctomb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-check.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-chr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-cmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-cmp2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-cpy-alloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-cpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-mblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-mbsnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-mbtouc-unsafe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-mbtouc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-mbtoucr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-move.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-prev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-set.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-stpcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-stpncpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcoll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strdup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strmblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strmbtouc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strncat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strncmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strncpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-to-u16.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-to-u8.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u32-uctomb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-check.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-chr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-cmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-cmp2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-cpy-alloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-cpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbsnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbtouc-unsafe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbtouc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-mbtoucr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-move.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-prev.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-set.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-stpcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-stpncpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcoll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strdup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strmblen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strmbtouc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strncat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strncmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strncpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-to-u16.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-to-u32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@unistr/$(DEPDIR)/test-u8-uctomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-u16-wordbreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-u32-wordbreaks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@uniwbrk/$(DEPDIR)/test-u8-wordbreaks.Po@am__quote@
@@ -6315,7 +8073,7 @@ clean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -6340,7 +8098,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -6625,6 +8383,8 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f glthread/$(DEPDIR)/$(am__dirstamp)
+	-rm -f glthread/$(am__dirstamp)
 	-rm -f unicase/$(DEPDIR)/$(am__dirstamp)
 	-rm -f unicase/$(am__dirstamp)
 	-rm -f uniconv/$(DEPDIR)/$(am__dirstamp)
@@ -6639,6 +8399,8 @@ distclean-generic:
 	-rm -f uninorm/$(am__dirstamp)
 	-rm -f unistdio/$(DEPDIR)/$(am__dirstamp)
 	-rm -f unistdio/$(am__dirstamp)
+	-rm -f unistr/$(DEPDIR)/$(am__dirstamp)
+	-rm -f unistr/$(am__dirstamp)
 	-rm -f uniwbrk/$(DEPDIR)/$(am__dirstamp)
 	-rm -f uniwbrk/$(am__dirstamp)
 	-rm -f uniwidth/$(DEPDIR)/$(am__dirstamp)
@@ -6657,7 +8419,7 @@ clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) unistr/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -6703,7 +8465,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) glthread/$(DEPDIR) unicase/$(DEPDIR) uniconv/$(DEPDIR) unictype/$(DEPDIR) unilbrk/$(DEPDIR) uniname/$(DEPDIR) uninorm/$(DEPDIR) unistdio/$(DEPDIR) unistr/$(DEPDIR) uniwbrk/$(DEPDIR) uniwidth/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -6743,31 +8505,57 @@ uninstall-am:
 	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
 	tags-recursive uninstall uninstall-am
 
-
-# We need the following in order to create <fcntl.h> when the system
-# doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h
-	rm -f $@-t $@
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
-	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
-	      < $(srcdir)/fcntl.in.h; \
-	} > $@-t
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
+	  > $@-t && \
+	mv $@-t $@
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/_GL_CXXDEFS/,$$p' \
+	  < $(top_srcdir)/build-aux/c++defs.h \
+	  > $@-t && \
 	mv $@-t $@
 
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
-locale.h: locale.in.h
-	rm -f $@-t $@
+locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+	      -e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+	      -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+	      -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|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)/locale.in.h; \
-	} > $@-t
+	} > $@-t && \
+	mv $@-t $@
+# The unused-parameter.h that gets inserted into generated .h files is the same
+# as build-aux/unused-parameter.h, except that it has the copyright header cut
+# off.
+unused-parameter.h: $(top_srcdir)/build-aux/unused-parameter.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \
+	  < $(top_srcdir)/build-aux/unused-parameter.h \
+	  > $@-t && \
+	mv $@-t $@
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	sed -n -e '/^.ifndef/,$$p' \
+	  < $(top_srcdir)/build-aux/warn-on-use.h \
+	  > $@-t && \
 	mv $@-t $@
 
 # Clean up after Solaris cc.