From 1a4f1aef1fd1f58e2f40fc74c57d005cf19d7cc4 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Thu, 29 Jan 2004 17:12:36 +0000 Subject: [PATCH] 2004-01-27 Artem B. Bityuckiy * 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. --- newlib/configure | 43 ++++++++++++++++++++++++++++++++++++------- newlib/configure.in | 42 ++++++++++++++++++++++++++++++++++++++---- newlib/newlib.hin | 29 +++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 11 deletions(-) diff --git a/newlib/configure b/newlib/configure index 7997b0076..2f3f7d005 100755 --- a/newlib/configure +++ b/newlib/configure @@ -3216,13 +3216,6 @@ EOF fi -if test "${newlib_iconv}" = "yes"; then -cat >> confdefs.h <> confdefs.h <> confdefs.h <&2; exit 1; } + fi + + builtin_converters=`echo "${builtin_converters}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + + available_converters=`cat "${srcdir}/libc/iconv/charset.aliases" | sed -e '/#/d' | sed -e 'N; s/\n //;'` + + builtin_converters1="${builtin_converters}" + builtin_converters="" + for converter in ${builtin_converters1}; do + result=`echo "${available_converters}" | grep -e "\(^\| \)${converter}\( \|\$\)"` + if test $? != "0"; then + { echo "configure: error: ${converter} is not supported - see ${srcdir}/libc/iconv/charset.aliases file for the list of available converters" 1>&2; exit 1; } + fi + converter1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'` + builtin_converters="${builtin_converters} ${converter1}" + done + + for converter in ${builtin_converters}; do + opt=_ICONV_CONVERTER_`echo "${converter}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h < confcache <<\EOF diff --git a/newlib/configure.in b/newlib/configure.in index a38d9b583..fe4a36fed 100644 --- a/newlib/configure.in +++ b/newlib/configure.in @@ -150,10 +150,6 @@ else AC_DEFINE_UNQUOTED(_MB_LEN_MAX,1) fi -if test "${newlib_iconv}" = "yes"; then -AC_DEFINE_UNQUOTED(_ICONV_ENABLED,1) -fi - AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION") if test "${multilib}" = "yes"; then @@ -162,6 +158,44 @@ else multilib_arg= fi +if test "${newlib_iconv}" = "yes"; then +AC_DEFINE_UNQUOTED(_ICONV_ENABLED,1) +fi + +dnl Parse --enable-newlib-builtin-converters option argument +if test "x${builtin_converters}" != "x"; then + + dnl Check that --enable-newlib-iconv was enabled + if test x${newlib_iconv} = x; then + AC_MSG_ERROR(--enable-newlib-builtin-converters option can't be used if iconv library is disabled - use --enable-newlib-iconv to enable it) + fi + + dnl Normalize converter names and delete commas + builtin_converters=`echo "${builtin_converters}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` + + dnl Get the list of available converters excluding comments + dnl Join line with previous if the first character is whitespace + available_converters=`cat "${srcdir}/libc/iconv/charset.aliases" | sed -e '/#/d' | sed -e 'N; s/\n //;'` + + dnl Check if required converters are supported + dnl Convert aliases to "official" names + builtin_converters1="${builtin_converters}" + builtin_converters="" + for converter in ${builtin_converters1}; do + result=`echo "${available_converters}" | grep -e "\(^\| \)${converter}\( \|\$\)"` + if test $? != "0"; then + AC_MSG_ERROR(${converter} is not supported - see ${srcdir}/libc/iconv/charset.aliases file for the list of available converters) + fi + converter1=`echo "${result}" | sed -e 's/\(^[[^ ]]*\).*$/\1/'` + builtin_converters="${builtin_converters} ${converter1}" + done + + dnl Enable appropriate option in newlib.h + for converter in ${builtin_converters}; do + opt=_ICONV_CONVERTER_`echo "${converter}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + AC_DEFINE_UNQUOTED($opt,1) + done +fi; AC_OUTPUT(Makefile, [if test -n "$CONFIG_FILES"; then diff --git a/newlib/newlib.hin b/newlib/newlib.hin index 74bb81f29..6f5497c08 100644 --- a/newlib/newlib.hin +++ b/newlib/newlib.hin @@ -14,5 +14,34 @@ /* ICONV enabled */ #undef _ICONV_ENABLED +/* + * ICONV converters enabled + */ +#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 + #endif /* !__NEWLIB_H__ */