2004-06-25 Artem B. Bityuckiy <dedekind@oktetlabs.ru>

	* acinclude.m4: Move iconv options into configure.in.
	* aclocal.m4: Regenerated.
	* configure: Ditto.
	* configure.in: Add iconv options.
	* newlib.hin: Add new iconv encodings and remove deleted ones.
	* doc/aclocal.m4: Regenerated.
	* doc/configure: Ditto.
	* iconvdata/aclocal.m4: Ditto.
	* iconvdata/configure: Ditto.
	* libc/iconv: Design change.  New size-optimized ccs format.
	* libc/iconv/AUTHORS: Removed.
	* libc/iconv/COPYING: Ditto.
	* libc/iconv/README.ORIGINAL: Ditto.
	* libc/iconv/README.TODO: Ditto.
	* libc/iconv/charset.aliases: Ditto.
	* libc/iconv/encoding.aliases: New file.
	* libc/iconv/Makefile.am: Updated.
	* libc/iconv/Makefile.in: Regenerated.
	* libc/iconv/iconv.tex: Updated.
	* libc/iconv/ccs/Makefile.am: Ditto.
	* libc/iconv/ccs/Makefile.in: Regenerated.
	* libc/iconv/ccs/big5.c: Updated.
	* libc/iconv/ccs/cns11643_plane1.c: Ditto.
	* libc/iconv/ccs/cns11643_plane14.c: Ditto.
	* libc/iconv/ccs/cns11643_plane2.c: Ditto.
	* libc/iconv/ccs/cp775.c: Ditto.
	* libc/iconv/ccs/cp850.c: Ditto.
	* libc/iconv/ccs/cp852.c: Ditto.
	* libc/iconv/ccs/cp855.c: Ditto.
	* libc/iconv/ccs/cp866.c: Ditto.
	* libc/iconv/ccs/iso_8859_1.c: Ditto.
	* libc/iconv/ccs/README.CCS.SOURCES: Removed.
	* libc/iconv/ccs/gb_2312_80.c: Ditto.
	* libc/iconv/ccs/iconv_mktbl: Ditto.
	* libc/iconv/ccs/jis_x0201.c: Ditto.
	* libc/iconv/ccs/jis_x0208_1983.c: Ditto.
	* libc/iconv/ccs/shift_jis.c: Ditto.
	* libc/iconv/ccs/us_ascii.c: Ditto.
	* libc/iconv/ccs/ccs.h: New file.
	* libc/iconv/ccs/ccsbi.c: Ditto.
	* libc/iconv/ccs/ccsbi.h: Ditto.
	* libc/iconv/ccs/ccsnames.h: Ditto.
	* libc/iconv/ccs/iso_8859_10.c: Ditto.
	* libc/iconv/ccs/iso_8859_11.c: Ditto.
	* libc/iconv/ccs/iso_8859_13.c: Ditto.
	* libc/iconv/ccs/iso_8859_14.c: Ditto.
	* libc/iconv/ccs/iso_8859_3.c: Ditto.
	* libc/iconv/ccs/iso_8859_6.c: Ditto.
	* libc/iconv/ccs/iso_8859_7.c: Ditto.
	* libc/iconv/ccs/iso_8859_8.c: Ditto.
	* libc/iconv/ccs/iso_8859_9.c: Ditto.
	* libc/iconv/ccs/iso_ir_111.c: Ditto.
	* libc/iconv/ccs/jis_x0201_1976.c: Ditto.
	* libc/iconv/ccs/jis_x0208_1990.c: Ditto.
	* libc/iconv/ccs/koi8_ru.c: Ditto.
	* libc/iconv/ccs/koi8_uni.c: Ditto.
	* libc/iconv/ccs/mktbl.pl: Ditto.
	* libc/iconv/ccs/win_1250.c: Ditto.
	* libc/iconv/ccs/win_1251.c: Ditto.
	* libc/iconv/ccs/win_1252.c: Ditto.
	* libc/iconv/ccs/win_1253.c: Ditto.
	* libc/iconv/ccs/win_1254.c: Ditto.
	* libc/iconv/ccs/win_1255.c: Ditto.
	* libc/iconv/ccs/win_1256.c: Ditto.
	* libc/iconv/ccs/win_1257.c: Ditto.
	* libc/iconv/ccs/win_1258.c: Ditto.
	* libc/iconv/ccs/iso_8859_15.c
	* libc/iconv/ccs/iso_8859_2.c
	* libc/iconv/ccs/iso_8859_4.c
	* libc/iconv/ccs/iso_8859_5.c
	* libc/iconv/ccs/jis_x0212_1990.c
	* libc/iconv/ccs/koi8_r.c
	* libc/iconv/ccs/koi8_u.c
	* libc/iconv/ccs/ksx1001.c
	* libc/iconv/ccs/binary/gb_2312_80.cct: Removed.
	* libc/iconv/ccs/binary/jis_x0201.cct: Ditto.
	* libc/iconv/ccs/binary/shift_jis.cct: Ditto.
	* libc/iconv/ccs/binary/us_ascii.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0208_1983.cct: Ditto.
	* libc/iconv/ccs/binary/Makefile.am: Updated.
	* libc/iconv/ccs/binary/Makefile.in: Regenerated.
	* libc/iconv/ccs/binary/big5.cct: Updated.
	* libc/iconv/ccs/binary/cns11643_plane1.cct: Ditto.
	* libc/iconv/ccs/binary/cns11643_plane14.cct: Ditto.
	* libc/iconv/ccs/binary/cns11643_plane2.cct: Ditto.
	* libc/iconv/ccs/binary/cp775.cct: Updated.: Ditto.
	* libc/iconv/ccs/binary/cp850.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/cp852.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/cp855.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/cp866.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/iso_8859_1.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_15.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_4.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_5.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_2.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0212_1990.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_r.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_u.cct: Ditto.
	* libc/iconv/ccs/binary/ksx1001.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_10.cct: New file.
	* libc/iconv/ccs/binary/iso_8859_11.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_13.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_14.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_3.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_6.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_7.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_8.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_9.cct: Ditto.
	* libc/iconv/ccs/binary/iso_ir_111.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0201_1976.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0208_1990.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_ru.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_uni.cct: Ditto.
	* libc/iconv/ccs/binary/win_1250.cct: Ditto.
	* libc/iconv/ccs/binary/win_1251.cct: Ditto.
	* libc/iconv/ccs/binary/win_1252.cct: Ditto.
	* libc/iconv/ccs/binary/win_1253.cct: Ditto.
	* libc/iconv/ccs/binary/win_1254.cct: Ditto.
	* libc/iconv/ccs/binary/win_1255.cct: Ditto.
	* libc/iconv/ccs/binary/win_1256.cct: Ditto.
	* libc/iconv/ccs/binary/win_1257.cct: Ditto.
	* libc/iconv/ccs/binary/win_1258.cct: Ditto.
	* libc/iconv/ces/Makefile.am: Updated.
	* libc/iconv/ces/Makefile.in: Regenerated.
	* libc/iconv/ces/ucs-2-internal.c: Updated.
	* libc/iconv/ces/ucs-4-internal.c: Ditto.
	* libc/iconv/ces/utf-16.c: Ditto.
	* libc/iconv/ces/utf-8.c: Ditto.
	* libc/iconv/ces/cesbi.c: New file.
	* libc/iconv/ces/cesbi.h: Ditto.
	* libc/iconv/ces/cesdeps.h: Ditto.
	* libc/iconv/ces/euc.c: Ditto.
	* libc/iconv/ces/mkdeps.pl: Ditto.
	* libc/iconv/ces/table-pcs.c: Ditto.
	* libc/iconv/ces/table.c: Ditto.
	* libc/iconv/ces/ucs-2.c: Ditto.
	* libc/iconv/ces/ucs-4.c: Ditto.
	* libc/iconv/ces/us-ascii.c: Ditto.
	* libc/iconv/ces/euc-jp.c: Removed.
	* libc/iconv/ces/euc-kr.c: Ditto.
	* libc/iconv/ces/euc-tw.c: Ditto.
	* libc/iconv/ces/gb2312.c: Ditto.
	* libc/iconv/ces/iso-10646-ucs-2.: Ditto.c
	* libc/iconv/ces/iso-10646-ucs-4.c: Ditto.
	* libc/iconv/lib/Makefile.am: Updated.
	* libc/iconv/lib/Makefile.in: Regenerated.
	* libc/iconv/lib/endian.h: Updated.
	* libc/iconv/lib/iconv.c: Ditto.
	* libc/iconv/lib/local.h: Ditto.
	* libc/iconv/lib/aliases.c: Removed.
	* libc/iconv/lib/bialiasesi.c: Ditto.
	* libc/iconv/lib/biccs.c: Ditto.
	* libc/iconv/lib/bices.c: Ditto.
	* libc/iconv/lib/ccs.c: Ditto.
	* libc/iconv/lib/ces.c: Ditto.
	* libc/iconv/lib/ces_euc.c: Ditto.
	* libc/iconv/lib/ces_iso2022.c: Ditto.
	* libc/iconv/lib/ces_table.c: Ditto.
	* libc/iconv/lib/converter.c: Ditto.
	* libc/iconv/lib/deps.h: Ditto.
	* libc/iconv/lib/aliasesbi.c: Ditto.
	* libc/iconv/lib/aliasesi.c: Ditto.
	* libc/iconv/lib/conv.h: Ditto.
	* libc/iconv/lib/encnames.h: Ditto.
	* libc/iconv/lib/encoding.deps: Ditto.
	* libc/iconv/lib/iconvnls.c: Ditto.
	* libc/iconv/lib/iconvnls.h: Ditto.
	* libc/iconv/lib/loaddata.c: Ditto.
	* libc/iconv/lib/nullconv.c: Ditto.
	* libc/iconv/lib/ucsconv.c: Ditto.
	* libc/iconv/lib/ucsconv.h: Ditto.
	* libc/include/iconv.h: Update copyright.
	* libc/*/aclocal.m4: Regenerated.
	* libc/*/configure: Ditto.
	* libm/*/aclocal.m4: Ditto.
	* libm/*/configure: Ditto.

1 files changed, 108 insertions, 26 deletions

diff --git a/newlib/newlib.hin b/newlib/newlib.hin
index bb0e2d75a..cb6f96d58 100644
--- a/newlib/newlib.hin
+++ b/newlib/newlib.hin
@@ -26,34 +26,116 @@
 /* ICONV enabled */
 #undef _ICONV_ENABLED
 
+/* Enable ICONV external CCS files loading capabilities */
+#undef _ICONV_ENABLE_EXTERNAL_CCS
+
+/*
+ * Iconv encodings enabled ("to" direction)
+ */
+#undef _ICONV_TO_ENCODING_BIG5
+#undef _ICONV_TO_ENCODING_CP775
+#undef _ICONV_TO_ENCODING_CP850
+#undef _ICONV_TO_ENCODING_CP852
+#undef _ICONV_TO_ENCODING_CP855
+#undef _ICONV_TO_ENCODING_CP866
+#undef _ICONV_TO_ENCODING_EUC_JP
+#undef _ICONV_TO_ENCODING_EUC_TW
+#undef _ICONV_TO_ENCODING_EUC_KR
+#undef _ICONV_TO_ENCODING_ISO_8859_1
+#undef _ICONV_TO_ENCODING_ISO_8859_10
+#undef _ICONV_TO_ENCODING_ISO_8859_11
+#undef _ICONV_TO_ENCODING_ISO_8859_13
+#undef _ICONV_TO_ENCODING_ISO_8859_14
+#undef _ICONV_TO_ENCODING_ISO_8859_15
+#undef _ICONV_TO_ENCODING_ISO_8859_2
+#undef _ICONV_TO_ENCODING_ISO_8859_3
+#undef _ICONV_TO_ENCODING_ISO_8859_4
+#undef _ICONV_TO_ENCODING_ISO_8859_5
+#undef _ICONV_TO_ENCODING_ISO_8859_6
+#undef _ICONV_TO_ENCODING_ISO_8859_7
+#undef _ICONV_TO_ENCODING_ISO_8859_8
+#undef _ICONV_TO_ENCODING_ISO_8859_9
+#undef _ICONV_TO_ENCODING_ISO_IR_111
+#undef _ICONV_TO_ENCODING_KOI8_R
+#undef _ICONV_TO_ENCODING_KOI8_RU
+#undef _ICONV_TO_ENCODING_KOI8_U
+#undef _ICONV_TO_ENCODING_KOI8_UNI
+#undef _ICONV_TO_ENCODING_UCS_2
+#undef _ICONV_TO_ENCODING_UCS_2_INTERNAL
+#undef _ICONV_TO_ENCODING_UCS_2BE
+#undef _ICONV_TO_ENCODING_UCS_2LE
+#undef _ICONV_TO_ENCODING_UCS_4
+#undef _ICONV_TO_ENCODING_UCS_4_INTERNAL
+#undef _ICONV_TO_ENCODING_UCS_4BE
+#undef _ICONV_TO_ENCODING_UCS_4LE
+#undef _ICONV_TO_ENCODING_US_ASCII
+#undef _ICONV_TO_ENCODING_UTF_16
+#undef _ICONV_TO_ENCODING_UTF_16BE
+#undef _ICONV_TO_ENCODING_UTF_16LE
+#undef _ICONV_TO_ENCODING_UTF_8
+#undef _ICONV_TO_ENCODING_WIN_1250
+#undef _ICONV_TO_ENCODING_WIN_1251
+#undef _ICONV_TO_ENCODING_WIN_1252
+#undef _ICONV_TO_ENCODING_WIN_1253
+#undef _ICONV_TO_ENCODING_WIN_1254
+#undef _ICONV_TO_ENCODING_WIN_1255
+#undef _ICONV_TO_ENCODING_WIN_1256
+#undef _ICONV_TO_ENCODING_WIN_1257
+#undef _ICONV_TO_ENCODING_WIN_1258
+
 /*
- * ICONV converters enabled
+ * Iconv encodings enabled ("from" direction)
  */
-#undef _ICONV_CONVERTER_US_ASCII
-#undef _ICONV_CONVERTER_BIG5
-#undef _ICONV_CONVERTER_SHIFT_JIS
-#undef _ICONV_CONVERTER_GB_2312_80
-#undef _ICONV_CONVERTER_CP866
-#undef _ICONV_CONVERTER_CP855
-#undef _ICONV_CONVERTER_CP852
-#undef _ICONV_CONVERTER_CP850
-#undef _ICONV_CONVERTER_CP775
-#undef _ICONV_CONVERTER_KOI8_U
-#undef _ICONV_CONVERTER_KOI8_R
-#undef _ICONV_CONVERTER_ISO_8859_1
-#undef _ICONV_CONVERTER_ISO_8859_2
-#undef _ICONV_CONVERTER_ISO_8859_4
-#undef _ICONV_CONVERTER_ISO_8859_5
-#undef _ICONV_CONVERTER_ISO_8859_15
-#undef _ICONV_CONVERTER_EUC_JP
-#undef _ICONV_CONVERTER_EUC_KR
-#undef _ICONV_CONVERTER_EUC_TW
-#undef _ICONV_CONVERTER_ISO_10646_UCS_2
-#undef _ICONV_CONVERTER_ISO_10646_UCS_4
-#undef _ICONV_CONVERTER_UCS_2_INTERNAL
-#undef _ICONV_CONVERTER_UCS_4_INTERNAL
-#undef _ICONV_CONVERTER_UTF_16
-#undef _ICONV_CONVERTER_UTF_8
+#undef _ICONV_FROM_ENCODING_BIG5
+#undef _ICONV_FROM_ENCODING_CP775
+#undef _ICONV_FROM_ENCODING_CP850
+#undef _ICONV_FROM_ENCODING_CP852
+#undef _ICONV_FROM_ENCODING_CP855
+#undef _ICONV_FROM_ENCODING_CP866
+#undef _ICONV_FROM_ENCODING_EUC_JP
+#undef _ICONV_FROM_ENCODING_EUC_TW
+#undef _ICONV_FROM_ENCODING_EUC_KR
+#undef _ICONV_FROM_ENCODING_ISO_8859_1
+#undef _ICONV_FROM_ENCODING_ISO_8859_10
+#undef _ICONV_FROM_ENCODING_ISO_8859_11
+#undef _ICONV_FROM_ENCODING_ISO_8859_13
+#undef _ICONV_FROM_ENCODING_ISO_8859_14
+#undef _ICONV_FROM_ENCODING_ISO_8859_15
+#undef _ICONV_FROM_ENCODING_ISO_8859_2
+#undef _ICONV_FROM_ENCODING_ISO_8859_3
+#undef _ICONV_FROM_ENCODING_ISO_8859_4
+#undef _ICONV_FROM_ENCODING_ISO_8859_5
+#undef _ICONV_FROM_ENCODING_ISO_8859_6
+#undef _ICONV_FROM_ENCODING_ISO_8859_7
+#undef _ICONV_FROM_ENCODING_ISO_8859_8
+#undef _ICONV_FROM_ENCODING_ISO_8859_9
+#undef _ICONV_FROM_ENCODING_ISO_IR_111
+#undef _ICONV_FROM_ENCODING_KOI8_R
+#undef _ICONV_FROM_ENCODING_KOI8_RU
+#undef _ICONV_FROM_ENCODING_KOI8_U
+#undef _ICONV_FROM_ENCODING_KOI8_UNI
+#undef _ICONV_FROM_ENCODING_UCS_2
+#undef _ICONV_FROM_ENCODING_UCS_2_INTERNAL
+#undef _ICONV_FROM_ENCODING_UCS_2BE
+#undef _ICONV_FROM_ENCODING_UCS_2LE
+#undef _ICONV_FROM_ENCODING_UCS_4
+#undef _ICONV_FROM_ENCODING_UCS_4_INTERNAL
+#undef _ICONV_FROM_ENCODING_UCS_4BE
+#undef _ICONV_FROM_ENCODING_UCS_4LE
+#undef _ICONV_FROM_ENCODING_US_ASCII
+#undef _ICONV_FROM_ENCODING_UTF_16
+#undef _ICONV_FROM_ENCODING_UTF_16BE
+#undef _ICONV_FROM_ENCODING_UTF_16LE
+#undef _ICONV_FROM_ENCODING_UTF_8
+#undef _ICONV_FROM_ENCODING_WIN_1250
+#undef _ICONV_FROM_ENCODING_WIN_1251
+#undef _ICONV_FROM_ENCODING_WIN_1252
+#undef _ICONV_FROM_ENCODING_WIN_1253
+#undef _ICONV_FROM_ENCODING_WIN_1254
+#undef _ICONV_FROM_ENCODING_WIN_1255
+#undef _ICONV_FROM_ENCODING_WIN_1256
+#undef _ICONV_FROM_ENCODING_WIN_1257
+#undef _ICONV_FROM_ENCODING_WIN_1258
 
 #endif /* !__NEWLIB_H__ */