2004-01-27 Artem B. Bityuckiy <abitytsky@softminecorp.com>

	* configure.in: Add support to generate iconv converter flags
	for newlib.h
	* newlib.hin: Add iconv converter flags.
	* configure: Regenerated.
	* libc/Makefile.in: Ditto.
	* libc/configure.in: Moved iconv converter parsing logic to
	top level newlib configure.in.
	* libc/configure: Regenerated.
	* libc/iconv/Makefile.in: Ditto.
	* libc/iconv/README.TODO
	* libc/iconv/charset.aliases: Remove wrong BE aliases for
	UCS2/UCS4/UTF8.
	* libc/iconv/ccs/Makefile.am: Remove C flag setting now that
	newlib.h can be used.
	* libc/iconv/ces/Makefile.am: Ditto.
	* libc/iconv/lib/Makefile.am: Ditto.
	* libc/iconv/ccs/Makefile.in: Regenerated.
	* libc/iconv/ces/Makefile.in: Ditto.
	* libc/iconv/lib/Makefile.in: Ditto.
	* libc/iconv/ccs/README.CCS.SOURCES: Updated.
	* libc/iconv/ccs/iconv_mktbl: Don't write junk strings to binaries.
	* libc/iconv/ccs/big5.c: Switch to use new underscored flags
	defined in newlib.h.
	* 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/gb_2312_80.c: Ditto.
	* libc/iconv/ccs/iso_8859_1.c: Ditto.
	* libc/iconv/ccs/iso_8859_15.c: Ditto.
	* libc/iconv/ccs/iso_8859_2.c: Ditto.
	* libc/iconv/ccs/iso_8859_4.c: Ditto.
	* libc/iconv/ccs/iso_8859_5.c: Ditto.
	* libc/iconv/ccs/jis_x0201.c: Ditto.
	* libc/iconv/ccs/jis_x0208_1983.c: Ditto.
	* libc/iconv/ccs/jis_x0212_1990.c: Ditto.
	* libc/iconv/ccs/koi8_r.c: Ditto.
	* libc/iconv/ccs/koi8_u.c: Ditto.
	* libc/iconv/ccs/ksx1001.c: Ditto.
	* libc/iconv/ccs/shift_jis.c: Ditto.
	* libc/iconv/ccs/us_ascii.c: Ditto.
	* libc/iconv/ccs/binary/big5.cct: Newly generated.
	* 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: Ditto.
	* libc/iconv/ccs/binary/cp850.cct: Ditto.
	* libc/iconv/ccs/binary/cp852.cct: Ditto.
	* libc/iconv/ccs/binary/cp855.cct: Ditto.
	* libc/iconv/ccs/binary/cp866.cct: Ditto.
	* libc/iconv/ccs/binary/gb_2312_80.cct: 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_2.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_4.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_5.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0201.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0208_1983.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/shift_jis.cct: Ditto.
	* libc/iconv/ccs/binary/us_ascii.cct: Ditto.
	* libc/iconv/lib/bialiasesi.c: Sync with charset.aliases.
	* libc/iconv/ces/euc-jp.c: Use newlib.h macros.
	* 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.c: Ditto.
	* libc/iconv/ces/iso-10646-ucs-4.c: Ditto.
	* libc/iconv/ces/ucs-2-internal.c: Ditto.
	* libc/iconv/ces/ucs-4-internal.c: Ditto.
	* libc/iconv/ces/utf-16.c: Ditto.
	* libc/iconv/ces/utf-8.c: Ditto.
	* libc/iconv/lib/aliases.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/endian.h: Ditto.
	* libc/iconv/lib/iconv.c: Ditto.
	* libc/iconv/lib/loaddata.c: Ditto.
	* libc/iconv/lib/local.h: Include newlib.h.
	* libc/argz/Makefile.in: Regenerated.
	* libc/ctype/Makefile.in: Ditto.
	* libc/errno/Makefile.in: Ditto.
	* libc/iconv/ccs/binary/Makefile.in: Ditto.
	* libc/locale/Makefile.in: Ditto.
	* libc/misc/Makefile.in: Ditto.
	* libc/posix/Makefile.in: Ditto.
	* libc/reent/Makefile.in: Ditto.
	* libc/search/Makefile.in: Ditto.
	* libc/signal/Makefile.in: Ditto.
	* libc/stdio/Makefile.in: Ditto.
	* libc/stdio64/Makefile.in: Ditto.
	* libc/stdlib/Makefile.in: Ditto.
	* libc/string/Makefile.in: Ditto.
	* libc/syscalls/Makefile.in: Ditto.
	* libc/time/Makefile.in: Ditto.
	* libc/unix/Makefile.in: Ditto.
	* testsuite/newlib.iconv/iconv.exp: New file.
	* testsuite/newlib.iconv/iconvjp.c: Ditto.
	* testsuite/newlib.iconv/iconvnm.c: Ditto.
	* testsuite/newlib.iconv/iconvru.c: Ditto.

1 files changed, 42 insertions, 47 deletions

diff --git a/newlib/libc/iconv/lib/bices.c b/newlib/libc/iconv/lib/bices.c
index 39587a0df..b87213fe4 100644
--- a/newlib/libc/iconv/lib/bices.c
+++ b/newlib/libc/iconv/lib/bices.c
@@ -23,80 +23,75 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifdef ENABLE_ICONV
- 
 #include "deps.h"
-#include <_ansi.h>
 #include "local.h"
 
 /*
  * Each known CES should be registered here
  */
-#ifdef ICONV_CONVERTER_EUC_JP
-extern _CONST struct iconv_ces_desc iconv_ces_euc_jp;
+#ifdef _ICONV_CONVERTER_EUC_JP
+extern _CONST struct iconv_ces_desc _iconv_ces_module_euc_jp;
 #endif 
-#ifdef ICONV_CONVERTER_EUC_KR
-extern _CONST struct iconv_ces_desc iconv_ces_euc_kr;
+#ifdef _ICONV_CONVERTER_EUC_KR
+extern _CONST struct iconv_ces_desc _iconv_ces_module_euc_kr;
 #endif 
-#ifdef ICONV_CONVERTER_EUC_TW
-extern _CONST struct iconv_ces_desc iconv_ces_euc_tw;
+#ifdef _ICONV_CONVERTER_EUC_TW
+extern _CONST struct iconv_ces_desc _iconv_ces_module_euc_tw;
 #endif 
-#ifdef ICONV_CONVERTER_GB2312
-extern _CONST struct iconv_ces_desc iconv_ces_gb2312;
+#ifdef _ICONV_CONVERTER_GB2312
+extern _CONST struct iconv_ces_desc _iconv_ces_module_gb2312;
 #endif 
-#ifdef ICONV_CONVERTER_ISO_10646_UCS_2
-extern _CONST struct iconv_ces_desc iconv_ces_iso_10646_ucs_2;
+#ifdef _ICONV_CONVERTER_ISO_10646_UCS_2
+extern _CONST struct iconv_ces_desc _iconv_ces_module_iso_10646_ucs_2;
 #endif 
-#ifdef ICONV_CONVERTER_ISO_10646_UCS_4
-extern _CONST struct iconv_ces_desc iconv_ces_iso_10646_ucs_4;
+#ifdef _ICONV_CONVERTER_ISO_10646_UCS_4
+extern _CONST struct iconv_ces_desc _iconv_ces_module_iso_10646_ucs_4;
 #endif 
-#ifdef ICONV_CONVERTER_UCS_2_INTERNAL
-extern _CONST struct iconv_ces_desc iconv_ces_ucs_2_internal;
+#ifdef _ICONV_CONVERTER_UCS_2_INTERNAL
+extern _CONST struct iconv_ces_desc _iconv_ces_module_ucs_2_internal;
 #endif 
-#ifdef ICONV_CONVERTER_UCS_4_INTERNAL
-extern _CONST struct iconv_ces_desc iconv_ces_ucs_4_internal;
+#ifdef _ICONV_CONVERTER_UCS_4_INTERNAL
+extern _CONST struct iconv_ces_desc _iconv_ces_module_ucs_4_internal;
 #endif 
-#ifdef ICONV_CONVERTER_UTF_16
-extern _CONST struct iconv_ces_desc iconv_ces_utf_16;
+#ifdef _ICONV_CONVERTER_UTF_16
+extern _CONST struct iconv_ces_desc _iconv_ces_module_utf_16;
 #endif 
-#ifdef ICONV_CONVERTER_UTF_8
-extern _CONST struct iconv_ces_desc iconv_ces_utf_8;
+#ifdef _ICONV_CONVERTER_UTF_8
+extern _CONST struct iconv_ces_desc _iconv_ces_module_utf_8;
 #endif 
 
-_CONST iconv_builtin_table iconv_builtin_ces[] =
+_CONST iconv_builtin_table_t _iconv_builtin_ces[] =
 {
-#ifdef ICONV_CONVERTER_EUC_JP
-    {(_VOID_PTR)"euc_jp", (_VOID_PTR)&iconv_ces_euc_jp},
+#ifdef _ICONV_CONVERTER_EUC_JP
+    {"euc_jp", (_CONST _VOID_PTR)&_iconv_ces_module_euc_jp},
 #endif 
-#ifdef ICONV_CONVERTER_EUC_KR
-    {(_VOID_PTR)"euc_kr", (_VOID_PTR)&iconv_ces_euc_kr},
+#ifdef _ICONV_CONVERTER_EUC_KR
+    {"euc_kr", (_CONST _VOID_PTR)&_iconv_ces_module_euc_kr},
 #endif 
-#ifdef ICONV_CONVERTER_EUC_TW
-    {(_VOID_PTR)"euc_tw", (_VOID_PTR)&iconv_ces_euc_tw},
+#ifdef _ICONV_CONVERTER_EUC_TW
+    {"euc_tw", (_CONST _VOID_PTR)&_iconv_ces_module_euc_tw},
 #endif 
-#ifdef ICONV_CONVERTER_GB2312
-    {(_VOID_PTR)"gb_2312_80", (_VOID_PTR)&iconv_ces_gb2312},
+#ifdef _ICONV_CONVERTER_GB2312
+    {"gb_2312_80", (_CONST _VOID_PTR)&_iconv_ces_module_gb2312},
 #endif 
-#ifdef ICONV_CONVERTER_ISO_10646_UCS_2
-    {(_VOID_PTR)"iso_10646_ucs_2", (_VOID_PTR)&iconv_ces_iso_10646_ucs_2},
+#ifdef _ICONV_CONVERTER_ISO_10646_UCS_2
+    {"iso_10646_ucs_2", (_CONST _VOID_PTR)&_iconv_ces_module_iso_10646_ucs_2},
 #endif 
-#ifdef ICONV_CONVERTER_ISO_10646_UCS_4
-    {(_VOID_PTR)"iso_10646_ucs_4", (_VOID_PTR)&iconv_ces_iso_10646_ucs_4},
+#ifdef _ICONV_CONVERTER_ISO_10646_UCS_4
+    {"iso_10646_ucs_4", (_CONST _VOID_PTR)&_iconv_ces_module_iso_10646_ucs_4},
 #endif 
-#ifdef ICONV_CONVERTER_UCS_2_INTERNAL
-    {(_VOID_PTR)"ucs_2_internal", (_VOID_PTR)&iconv_ces_ucs_2_internal},
+#ifdef _ICONV_CONVERTER_UCS_2_INTERNAL
+    {"ucs_2_internal", (_CONST _VOID_PTR)&_iconv_ces_module_ucs_2_internal},
 #endif 
-#ifdef ICONV_CONVERTER_UCS_4_INTERNAL
-    {(_VOID_PTR)"ucs_4_internal", (_VOID_PTR)&iconv_ces_ucs_4_internal},
+#ifdef _ICONV_CONVERTER_UCS_4_INTERNAL
+    {"ucs_4_internal", (_CONST _VOID_PTR)&_iconv_ces_module_ucs_4_internal},
 #endif 
-#ifdef ICONV_CONVERTER_UTF_16
-    {(_VOID_PTR)"utf_16", (_VOID_PTR)&iconv_ces_utf_16},
+#ifdef _ICONV_CONVERTER_UTF_16
+    {"utf_16", (_CONST _VOID_PTR)&_iconv_ces_module_utf_16},
 #endif 
-#ifdef ICONV_CONVERTER_UTF_8
-    {(_VOID_PTR)"utf_8", (_VOID_PTR)&iconv_ces_utf_8},
+#ifdef _ICONV_CONVERTER_UTF_8
+    {"utf_8", (_CONST _VOID_PTR)&_iconv_ces_module_utf_8},
 #endif 
-    {NULL, NULL}
+    {NULL, (_CONST _VOID_PTR)NULL}
 };
 
-#endif /* #ifdef ENABLE_ICONV */
-