New upstream version 0.9.9upstream/0.9.9

1 files changed, 125 insertions, 79 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c9c52b94..865d1f9a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -125,26 +125,26 @@ TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
 	test-isnanl-nolibm$(EXEEXT) test-iswblank$(EXEEXT) \
 	test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \
 	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-malloca$(EXEEXT) \
-	test-math$(EXEEXT) test-mbrtowc1.sh test-mbrtowc2.sh \
-	test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \
-	test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
-	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
-	test-mbrtowc-w32-5.sh test-mbsinit.sh test-memchr$(EXEEXT) \
-	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
-	test-pthread_sigmask1$(EXEEXT) test-pthread_sigmask2$(EXEEXT) \
-	test-raise$(EXEEXT) test-setenv$(EXEEXT) test-setlocale1.sh \
-	test-setlocale2.sh test-signal-h$(EXEEXT) \
-	test-signbit$(EXEEXT) test-sigprocmask$(EXEEXT) \
-	test-sleep$(EXEEXT) test-stdalign$(EXEEXT) \
-	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
-	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
-	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
-	test-strncat$(EXEEXT) test-strstr$(EXEEXT) \
-	test-sys_types$(EXEEXT) test-init.sh test-thread_self$(EXEEXT) \
-	test-thread_create$(EXEEXT) test-time$(EXEEXT) \
-	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
+	test-rwlock1$(EXEEXT) test-lock$(EXEEXT) test-once1$(EXEEXT) \
+	test-once2$(EXEEXT) test-malloca$(EXEEXT) test-math$(EXEEXT) \
+	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \
+	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
+	test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbsinit.sh \
+	test-memchr$(EXEEXT) test-printf-frexp$(EXEEXT) \
+	test-printf-frexpl$(EXEEXT) test-pthread_sigmask1$(EXEEXT) \
+	test-pthread_sigmask2$(EXEEXT) test-raise$(EXEEXT) \
+	test-setenv$(EXEEXT) test-setlocale1.sh test-setlocale2.sh \
+	test-signal-h$(EXEEXT) test-signbit$(EXEEXT) \
+	test-sigprocmask$(EXEEXT) test-sleep$(EXEEXT) \
+	test-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
+	test-stdlib$(EXEEXT) test-strerror$(EXEEXT) \
+	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
+	test-string$(EXEEXT) test-strncat$(EXEEXT) \
+	test-strstr$(EXEEXT) test-sys_types$(EXEEXT) test-init.sh \
+	test-thread_self$(EXEEXT) test-thread_create$(EXEEXT) \
+	test-time$(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) \
@@ -414,23 +414,24 @@ check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
 	test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
-	test-lock$(EXEEXT) test-malloca$(EXEEXT) test-math$(EXEEXT) \
-	test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
-	test-mbsinit$(EXEEXT) test-memchr$(EXEEXT) \
-	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
-	test-pthread_sigmask1$(EXEEXT) test-pthread_sigmask2$(EXEEXT) \
-	test-raise$(EXEEXT) test-setenv$(EXEEXT) \
-	test-setlocale1$(EXEEXT) test-setlocale2$(EXEEXT) \
-	test-signal-h$(EXEEXT) test-signbit$(EXEEXT) \
-	test-sigprocmask$(EXEEXT) test-sleep$(EXEEXT) \
-	test-stdalign$(EXEEXT) test-stdbool$(EXEEXT) \
-	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdio$(EXEEXT) \
-	test-stdlib$(EXEEXT) test-strerror$(EXEEXT) \
-	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
-	test-string$(EXEEXT) test-strncat$(EXEEXT) \
-	test-strstr$(EXEEXT) test-sys_types$(EXEEXT) \
-	test-thread_self$(EXEEXT) test-thread_create$(EXEEXT) \
-	test-time$(EXEEXT) test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
+	test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
+	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc$(EXEEXT) \
+	test-mbrtowc-w32$(EXEEXT) test-mbsinit$(EXEEXT) \
+	test-memchr$(EXEEXT) test-printf-frexp$(EXEEXT) \
+	test-printf-frexpl$(EXEEXT) test-pthread_sigmask1$(EXEEXT) \
+	test-pthread_sigmask2$(EXEEXT) test-raise$(EXEEXT) \
+	test-setenv$(EXEEXT) test-setlocale1$(EXEEXT) \
+	test-setlocale2$(EXEEXT) test-signal-h$(EXEEXT) \
+	test-signbit$(EXEEXT) test-sigprocmask$(EXEEXT) \
+	test-sleep$(EXEEXT) test-stdalign$(EXEEXT) \
+	test-stdbool$(EXEEXT) test-stddef$(EXEEXT) \
+	test-stdint$(EXEEXT) test-stdio$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
+	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
+	test-strncat$(EXEEXT) test-strstr$(EXEEXT) \
+	test-sys_types$(EXEEXT) test-thread_self$(EXEEXT) \
+	test-thread_create$(EXEEXT) test-time$(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) \
@@ -1362,6 +1363,12 @@ test_nfkd_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_numeric_OBJECTS = unictype/test-numeric.$(OBJEXT)
 test_numeric_OBJECTS = $(am_test_numeric_OBJECTS)
 test_numeric_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_once1_OBJECTS = test-once.$(OBJEXT)
+test_once1_OBJECTS = $(am_test_once1_OBJECTS)
+test_once1_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_once2_OBJECTS = test-once.$(OBJEXT)
+test_once2_OBJECTS = $(am_test_once2_OBJECTS)
+test_once2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_pr_alphabetic_OBJECTS = unictype/test-pr_alphabetic.$(OBJEXT)
 test_pr_alphabetic_OBJECTS = $(am_test_pr_alphabetic_OBJECTS)
 test_pr_alphabetic_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1837,8 +1844,9 @@ test_strerror_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 test_striconveh_SOURCES = test-striconveh.c
 test_striconveh_OBJECTS = test-striconveh.$(OBJEXT)
 test_striconveh_DEPENDENCIES = $(am__DEPENDENCIES_2)
-test_striconveha_SOURCES = test-striconveha.c
-test_striconveha_OBJECTS = test-striconveha.$(OBJEXT)
+am_test_striconveha_OBJECTS = test-striconveha.$(OBJEXT) \
+	iconvsupport.$(OBJEXT)
+test_striconveha_OBJECTS = $(am_test_striconveha_OBJECTS)
 test_striconveha_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_string_SOURCES = test-string.c
 test_string_OBJECTS = test-string.$(OBJEXT)
@@ -1912,7 +1920,8 @@ am_test_u16_cmp2_OBJECTS = unistr/test-u16-cmp2.$(OBJEXT)
 test_u16_cmp2_OBJECTS = $(am_test_u16_cmp2_OBJECTS)
 test_u16_cmp2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_conv_from_enc_OBJECTS =  \
-	uniconv/test-u16-conv-from-enc.$(OBJEXT)
+	uniconv/test-u16-conv-from-enc.$(OBJEXT) \
+	iconvsupport.$(OBJEXT)
 test_u16_conv_from_enc_OBJECTS = $(am_test_u16_conv_from_enc_OBJECTS)
 test_u16_conv_from_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u16_conv_to_enc_OBJECTS =  \
@@ -2015,7 +2024,8 @@ 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)
+	uniconv/test-u16-strconv-from-enc.$(OBJEXT) \
+	iconvsupport.$(OBJEXT)
 test_u16_strconv_from_enc_OBJECTS =  \
 	$(am_test_u16_strconv_from_enc_OBJECTS)
 test_u16_strconv_from_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2139,7 +2149,8 @@ am_test_u32_cmp2_OBJECTS = unistr/test-u32-cmp2.$(OBJEXT)
 test_u32_cmp2_OBJECTS = $(am_test_u32_cmp2_OBJECTS)
 test_u32_cmp2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_conv_from_enc_OBJECTS =  \
-	uniconv/test-u32-conv-from-enc.$(OBJEXT)
+	uniconv/test-u32-conv-from-enc.$(OBJEXT) \
+	iconvsupport.$(OBJEXT)
 test_u32_conv_from_enc_OBJECTS = $(am_test_u32_conv_from_enc_OBJECTS)
 test_u32_conv_from_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u32_conv_to_enc_OBJECTS =  \
@@ -2258,7 +2269,8 @@ 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)
+	uniconv/test-u32-strconv-from-enc.$(OBJEXT) \
+	iconvsupport.$(OBJEXT)
 test_u32_strconv_from_enc_OBJECTS =  \
 	$(am_test_u32_strconv_from_enc_OBJECTS)
 test_u32_strconv_from_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2381,7 +2393,7 @@ am_test_u8_cmp2_OBJECTS = unistr/test-u8-cmp2.$(OBJEXT)
 test_u8_cmp2_OBJECTS = $(am_test_u8_cmp2_OBJECTS)
 test_u8_cmp2_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_conv_from_enc_OBJECTS =  \
-	uniconv/test-u8-conv-from-enc.$(OBJEXT)
+	uniconv/test-u8-conv-from-enc.$(OBJEXT) iconvsupport.$(OBJEXT)
 test_u8_conv_from_enc_OBJECTS = $(am_test_u8_conv_from_enc_OBJECTS)
 test_u8_conv_from_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_u8_conv_to_enc_OBJECTS =  \
@@ -2484,7 +2496,8 @@ 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)
+	uniconv/test-u8-strconv-from-enc.$(OBJEXT) \
+	iconvsupport.$(OBJEXT)
 test_u8_strconv_from_enc_OBJECTS =  \
 	$(am_test_u8_strconv_from_enc_OBJECTS)
 test_u8_strconv_from_enc_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -2821,7 +2834,8 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-mbrtowc.c test-mbrtowc-w32.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_pr_alphabetic_SOURCES) \
+	$(test_numeric_SOURCES) $(test_once1_SOURCES) \
+	$(test_once2_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) \
@@ -2898,9 +2912,9 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-signbit.c test-sigprocmask.c test-sleep.c test-stdalign.c \
 	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
 	test-stdlib.c test-strerror.c test-striconveh.c \
-	test-striconveha.c test-string.c test-strncat.c test-strstr.c \
-	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
-	$(test_sy_java_ident_SOURCES) \
+	$(test_striconveha_SOURCES) test-string.c test-strncat.c \
+	test-strstr.c $(test_sy_c_ident_SOURCES) \
+	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) test-sys_types.c \
 	test-thread_create.c test-thread_self.c test-time.c \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
@@ -3103,7 +3117,8 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-mbrtowc.c test-mbrtowc-w32.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_pr_alphabetic_SOURCES) \
+	$(test_numeric_SOURCES) $(test_once1_SOURCES) \
+	$(test_once2_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) \
@@ -3180,9 +3195,9 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-signbit.c test-sigprocmask.c test-sleep.c test-stdalign.c \
 	test-stdbool.c test-stddef.c test-stdint.c test-stdio.c \
 	test-stdlib.c test-strerror.c test-striconveh.c \
-	test-striconveha.c test-string.c test-strncat.c test-strstr.c \
-	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
-	$(test_sy_java_ident_SOURCES) \
+	$(test_striconveha_SOURCES) test-string.c test-strncat.c \
+	test-strstr.c $(test_sy_c_ident_SOURCES) \
+	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) test-sys_types.c \
 	test-thread_create.c test-thread_self.c test-time.c \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
@@ -4130,6 +4145,7 @@ HAVE_ISNANF = @HAVE_ISNANF@
 HAVE_ISNANL = @HAVE_ISNANL@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
+HAVE_LANGINFO_ALTMON = @HAVE_LANGINFO_ALTMON@
 HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
 HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
 HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
@@ -4767,15 +4783,16 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 	infinity.h nan.h macros.h test-iswblank.c macros.h \
 	test-langinfo.c test-limits-h.c locale.in.h test-locale.c \
 	test-localename.c macros.h test-rwlock1.c test-lock.c \
-	test-malloca.c test-math.c macros.h test-mbrtowc1.sh \
-	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
-	test-mbrtowc5.sh test-mbrtowc.c test-mbrtowc-w32-1.sh \
-	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
-	test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbrtowc-w32.c \
-	signature.h macros.h test-mbsinit.sh test-mbsinit.c \
-	signature.h macros.h mbtowc-impl.h mbtowc.c test-memchr.c \
-	zerosize-ptr.h signature.h macros.h msvc-inval.c msvc-inval.h \
-	msvc-nothrow.c msvc-nothrow.h test-printf-frexp.c macros.h \
+	test-once.c test-malloca.c test-math.c macros.h \
+	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c \
+	test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
+	test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h \
+	test-mbsinit.sh test-mbsinit.c signature.h macros.h \
+	mbtowc-impl.h mbtowc.c test-memchr.c zerosize-ptr.h \
+	signature.h macros.h msvc-inval.c msvc-inval.h msvc-nothrow.c \
+	msvc-nothrow.h test-printf-frexp.c macros.h \
 	test-printf-frexpl.c macros.h pthread_sigmask.c \
 	test-pthread_sigmask1.c test-pthread_sigmask2.c signature.h \
 	macros.h putenv.c raise.c test-raise.c signature.h macros.h \
@@ -4790,8 +4807,8 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 	test-stddef.c test-stdint.c stdio.in.h test-stdio.c \
 	test-stdlib.c test-sys_wait.h strerror.c strerror-override.c \
 	strerror-override.h 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 \
+	test-striconveh.c macros.h test-striconveha.c iconvsupport.c \
+	macros.h test-string.c test-strncat.c unistr/test-strncat.h \
 	zerosize-ptr.h signature.h macros.h test-strstr.c \
 	zerosize-ptr.h signature.h macros.h test-sys_types.c init.sh \
 	test-init.sh test-thread_self.c test-thread_create.c macros.h \
@@ -4847,17 +4864,17 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c macros.h btowc.c \
 	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 macros.h \
-	uniconv/test-u16-conv-from-enc.c macros.h \
+	uniconv/test-u16-conv-from-enc.c iconvsupport.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-from-enc.c iconvsupport.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-from-enc.c iconvsupport.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-from-enc.c iconvsupport.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-from-enc.c iconvsupport.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-from-enc.c iconvsupport.c macros.h \
 	uniconv/test-u8-strconv-to-enc.c macros.h \
 	unictype/test-bidi_byname.c macros.h \
 	unictype/test-bidi_longname.c macros.h \
@@ -5496,6 +5513,10 @@ test_iconv_LDADD = $(LDADD) @LIBICONV@
 test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
 test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
+test_once1_SOURCES = test-once.c
+test_once1_LDADD = $(LDADD) @LIBTHREAD@
+test_once2_SOURCES = test-once.c
+test_once2_LDADD = $(LDADD) @LIBMULTITHREAD@
 test_pthread_sigmask1_LDADD = $(LDADD) @LIB_PTHREAD_SIGMASK@
 test_pthread_sigmask2_LDADD = $(LDADD) @LIB_PTHREAD_SIGMASK@ @LIBMULTITHREAD@
 
@@ -5524,6 +5545,7 @@ UNUSED_PARAMETER_H = $(srcdir)/unused-parameter.h
 # need it. This is ensured by the applicability 'all' defined above.
 WARN_ON_USE_H = $(srcdir)/warn-on-use.h
 test_striconveh_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_striconveha_SOURCES = test-striconveha.c iconvsupport.c
 test_striconveha_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
 test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
@@ -5609,27 +5631,27 @@ test_ulc_casecmp_SOURCES = unicase/test-ulc-casecmp.c
 test_ulc_casecmp_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_ulc_casecoll_SOURCES = unicase/test-ulc-casecoll.c
 test_ulc_casecoll_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c
+test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c iconvsupport.c
 test_u16_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_conv_to_enc_SOURCES = uniconv/test-u16-conv-to-enc.c
 test_u16_conv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c
+test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c iconvsupport.c
 test_u16_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u16_strconv_to_enc_SOURCES = uniconv/test-u16-strconv-to-enc.c
 test_u16_strconv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c
+test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c iconvsupport.c
 test_u32_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_conv_to_enc_SOURCES = uniconv/test-u32-conv-to-enc.c
 test_u32_conv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c
+test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c iconvsupport.c
 test_u32_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_strconv_to_enc_SOURCES = uniconv/test-u32-strconv-to-enc.c
 test_u32_strconv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c
+test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c iconvsupport.c
 test_u8_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_conv_to_enc_SOURCES = uniconv/test-u8-conv-to-enc.c
 test_u8_conv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
-test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c
+test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c iconvsupport.c
 test_u8_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u8_strconv_to_enc_SOURCES = uniconv/test-u8-strconv-to-enc.c
 test_u8_strconv_to_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
@@ -7236,6 +7258,14 @@ unictype/test-numeric.$(OBJEXT): unictype/$(am__dirstamp) \
 test-numeric$(EXEEXT): $(test_numeric_OBJECTS) $(test_numeric_DEPENDENCIES) $(EXTRA_test_numeric_DEPENDENCIES) 
 	@rm -f test-numeric$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_numeric_OBJECTS) $(test_numeric_LDADD) $(LIBS)
+
+test-once1$(EXEEXT): $(test_once1_OBJECTS) $(test_once1_DEPENDENCIES) $(EXTRA_test_once1_DEPENDENCIES) 
+	@rm -f test-once1$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_once1_OBJECTS) $(test_once1_LDADD) $(LIBS)
+
+test-once2$(EXEEXT): $(test_once2_OBJECTS) $(test_once2_DEPENDENCIES) $(EXTRA_test_once2_DEPENDENCIES) 
+	@rm -f test-once2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_once2_OBJECTS) $(test_once2_LDADD) $(LIBS)
 unictype/test-pr_alphabetic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
 
@@ -9405,6 +9435,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconvsupport.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isblank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@
@@ -9460,6 +9491,7 @@ distclean-compile:
 @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-once.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-pthread_sigmask1.Po@am__quote@
@@ -10446,6 +10478,20 @@ test-lock.log: test-lock$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-once1.log: test-once1$(EXEEXT)
+	@p='test-once1$(EXEEXT)'; \
+	b='test-once1'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-once2.log: test-once2$(EXEEXT)
+	@p='test-once2$(EXEEXT)'; \
+	b='test-once2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-malloca.log: test-malloca$(EXEEXT)
 	@p='test-malloca$(EXEEXT)'; \
 	b='test-malloca'; \
@@ -14103,8 +14149,8 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
+	      -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \
+	      -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \
 	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
 	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
 	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \