From fcbf63e62c627deae76c1b8cb8c0876c536ed811 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <jari.vetoniemi@indooratlas.com>
Date: Mon, 16 Mar 2020 18:49:26 +0900
Subject: Fresh start

---
 jni/iconv/libcharset/tools/README                |  25 ++
 jni/iconv/libcharset/tools/aix-3.2.5             |   8 +
 jni/iconv/libcharset/tools/aix-4.1.5             |  86 ++++++
 jni/iconv/libcharset/tools/aix-4.2.0             | 150 ++++++++++
 jni/iconv/libcharset/tools/aix-4.3.2             | 342 +++++++++++++++++++++++
 jni/iconv/libcharset/tools/all-charsets          |  34 +++
 jni/iconv/libcharset/tools/all-charsets-X11      |  28 ++
 jni/iconv/libcharset/tools/all-locales           |  27 ++
 jni/iconv/libcharset/tools/beos-5                |   3 +
 jni/iconv/libcharset/tools/darwin-6.8            |  93 ++++++
 jni/iconv/libcharset/tools/darwin-7.5            | 181 ++++++++++++
 jni/iconv/libcharset/tools/darwin-9.5            | 205 ++++++++++++++
 jni/iconv/libcharset/tools/freebsd-3.3           |  66 +++++
 jni/iconv/libcharset/tools/glibc-2.1.3           | 122 ++++++++
 jni/iconv/libcharset/tools/glibc-2.1.90          | 100 +++++++
 jni/iconv/libcharset/tools/glibc-2.2             | 186 ++++++++++++
 jni/iconv/libcharset/tools/glibc-2.2-XF86-3.3.6  | 187 +++++++++++++
 jni/iconv/libcharset/tools/glibc-2.2-XF86-4.0.1f | 187 +++++++++++++
 jni/iconv/libcharset/tools/hpux-10.01            |  56 ++++
 jni/iconv/libcharset/tools/hpux-10.20            |  68 +++++
 jni/iconv/libcharset/tools/hpux-11.00            |  78 ++++++
 jni/iconv/libcharset/tools/irix-6.5              |  42 +++
 jni/iconv/libcharset/tools/locale_charmap        |   4 +
 jni/iconv/libcharset/tools/locale_charset.c      |  13 +
 jni/iconv/libcharset/tools/locale_codeset.c      |  15 +
 jni/iconv/libcharset/tools/locale_monthnames.c   |  26 ++
 jni/iconv/libcharset/tools/locale_x11encoding.c  |  40 +++
 jni/iconv/libcharset/tools/netbsd-3.0            | 109 ++++++++
 jni/iconv/libcharset/tools/openbsd-4.1           |  64 +++++
 jni/iconv/libcharset/tools/osf1-4.0a             |  23 ++
 jni/iconv/libcharset/tools/osf1-4.0d             |  24 ++
 jni/iconv/libcharset/tools/osf1-5.1              | 161 +++++++++++
 jni/iconv/libcharset/tools/solaris-2.4           |  11 +
 jni/iconv/libcharset/tools/solaris-2.5.1         |  53 ++++
 jni/iconv/libcharset/tools/solaris-2.6           |  53 ++++
 jni/iconv/libcharset/tools/solaris-2.6-cjk       |  64 +++++
 jni/iconv/libcharset/tools/solaris-2.7           | 109 ++++++++
 jni/iconv/libcharset/tools/sunos-4.1.4           |   5 +
 jni/iconv/libcharset/tools/win32                 |  16 ++
 39 files changed, 3064 insertions(+)
 create mode 100644 jni/iconv/libcharset/tools/README
 create mode 100644 jni/iconv/libcharset/tools/aix-3.2.5
 create mode 100644 jni/iconv/libcharset/tools/aix-4.1.5
 create mode 100644 jni/iconv/libcharset/tools/aix-4.2.0
 create mode 100644 jni/iconv/libcharset/tools/aix-4.3.2
 create mode 100755 jni/iconv/libcharset/tools/all-charsets
 create mode 100755 jni/iconv/libcharset/tools/all-charsets-X11
 create mode 100755 jni/iconv/libcharset/tools/all-locales
 create mode 100644 jni/iconv/libcharset/tools/beos-5
 create mode 100644 jni/iconv/libcharset/tools/darwin-6.8
 create mode 100644 jni/iconv/libcharset/tools/darwin-7.5
 create mode 100644 jni/iconv/libcharset/tools/darwin-9.5
 create mode 100644 jni/iconv/libcharset/tools/freebsd-3.3
 create mode 100644 jni/iconv/libcharset/tools/glibc-2.1.3
 create mode 100644 jni/iconv/libcharset/tools/glibc-2.1.90
 create mode 100644 jni/iconv/libcharset/tools/glibc-2.2
 create mode 100644 jni/iconv/libcharset/tools/glibc-2.2-XF86-3.3.6
 create mode 100644 jni/iconv/libcharset/tools/glibc-2.2-XF86-4.0.1f
 create mode 100644 jni/iconv/libcharset/tools/hpux-10.01
 create mode 100644 jni/iconv/libcharset/tools/hpux-10.20
 create mode 100644 jni/iconv/libcharset/tools/hpux-11.00
 create mode 100644 jni/iconv/libcharset/tools/irix-6.5
 create mode 100755 jni/iconv/libcharset/tools/locale_charmap
 create mode 100644 jni/iconv/libcharset/tools/locale_charset.c
 create mode 100644 jni/iconv/libcharset/tools/locale_codeset.c
 create mode 100644 jni/iconv/libcharset/tools/locale_monthnames.c
 create mode 100644 jni/iconv/libcharset/tools/locale_x11encoding.c
 create mode 100644 jni/iconv/libcharset/tools/netbsd-3.0
 create mode 100644 jni/iconv/libcharset/tools/openbsd-4.1
 create mode 100644 jni/iconv/libcharset/tools/osf1-4.0a
 create mode 100644 jni/iconv/libcharset/tools/osf1-4.0d
 create mode 100644 jni/iconv/libcharset/tools/osf1-5.1
 create mode 100644 jni/iconv/libcharset/tools/solaris-2.4
 create mode 100644 jni/iconv/libcharset/tools/solaris-2.5.1
 create mode 100644 jni/iconv/libcharset/tools/solaris-2.6
 create mode 100644 jni/iconv/libcharset/tools/solaris-2.6-cjk
 create mode 100644 jni/iconv/libcharset/tools/solaris-2.7
 create mode 100644 jni/iconv/libcharset/tools/sunos-4.1.4
 create mode 100644 jni/iconv/libcharset/tools/win32

(limited to 'jni/iconv/libcharset/tools')

diff --git a/jni/iconv/libcharset/tools/README b/jni/iconv/libcharset/tools/README
new file mode 100644
index 0000000..7c5f7d7
--- /dev/null
+++ b/jni/iconv/libcharset/tools/README
@@ -0,0 +1,25 @@
+This directory contains tools for maintaining the config.charset file.
+
+The main script is "all-charsets". Before using it, you must configure
+this package. For all installed locales, it prints
+  - the result of the command "locale charmap",
+  - the result of "nl_langinfo (CODESET)",
+  - the result of "locale_charset ()".
+
+It uses the following auxiliary scripts and programs:
+  - all-locales
+    Prints all usable locales in the system, one per line.
+  - locale_charmap
+    Executes "locale charmap".
+  - locale_codeset.c
+    Prints nl_langinfo (CODESET).
+  - locale_charset.c
+    Prints locale_charset().
+
+A second main script is "all-charsets-X11". It also prints the X11
+encoding name. Before using it, you must tweak the X11 paths needed
+for compiling locale_x11encoding (a simple X11 program), and let your
+DISPLAY environment variable point to a running X11 screen.
+
+The other files are test results from various operating systems.
+
diff --git a/jni/iconv/libcharset/tools/aix-3.2.5 b/jni/iconv/libcharset/tools/aix-3.2.5
new file mode 100644
index 0000000..1d798d8
--- /dev/null
+++ b/jni/iconv/libcharset/tools/aix-3.2.5
@@ -0,0 +1,8 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+En_US.IBM-850    IBM-850           IBM-850           CP850             
+Fr_FR.IBM-850    IBM-850           IBM-850           CP850             
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
diff --git a/jni/iconv/libcharset/tools/aix-4.1.5 b/jni/iconv/libcharset/tools/aix-4.1.5
new file mode 100644
index 0000000..1061e88
--- /dev/null
+++ b/jni/iconv/libcharset/tools/aix-4.1.5
@@ -0,0 +1,86 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+Ar_AA            IBM-1046          IBM-1046          CP1046            
+Ar_AA.IBM-1046   IBM-1046          IBM-1046          CP1046            
+C                ISO8859-1         ISO8859-1         ISO-8859-1        
+Ca_ES            IBM-850           IBM-850           CP850             
+Ca_ES.IBM-850    IBM-850           IBM-850           CP850             
+Da_DK            IBM-850           IBM-850           CP850             
+Da_DK.IBM-850    IBM-850           IBM-850           CP850             
+De_CH            IBM-850           IBM-850           CP850             
+De_CH.IBM-850    IBM-850           IBM-850           CP850             
+De_DE            IBM-850           IBM-850           CP850             
+De_DE.IBM-850    IBM-850           IBM-850           CP850             
+En_GB            IBM-850           IBM-850           CP850             
+En_GB.IBM-850    IBM-850           IBM-850           CP850             
+En_US            IBM-850           IBM-850           CP850             
+En_US.IBM-850    IBM-850           IBM-850           CP850             
+Es_ES            IBM-850           IBM-850           CP850             
+Es_ES.IBM-850    IBM-850           IBM-850           CP850             
+Fi_FI            IBM-850           IBM-850           CP850             
+Fi_FI.IBM-850    IBM-850           IBM-850           CP850             
+Fr_BE            IBM-850           IBM-850           CP850             
+Fr_BE.IBM-850    IBM-850           IBM-850           CP850             
+Fr_CA            IBM-850           IBM-850           CP850             
+Fr_CA.IBM-850    IBM-850           IBM-850           CP850             
+Fr_CH            IBM-850           IBM-850           CP850             
+Fr_CH.IBM-850    IBM-850           IBM-850           CP850             
+Fr_FR            IBM-850           IBM-850           CP850             
+Fr_FR.IBM-850    IBM-850           IBM-850           CP850             
+Is_IS            IBM-850           IBM-850           CP850             
+Is_IS.IBM-850    IBM-850           IBM-850           CP850             
+It_IT            IBM-850           IBM-850           CP850             
+It_IT.IBM-850    IBM-850           IBM-850           CP850             
+Iw_IL            IBM-856           IBM-856           CP856             
+Iw_IL.IBM-856    IBM-856           IBM-856           CP856             
+Ja_JP            IBM-932           IBM-932           CP932             
+Ja_JP.IBM-932    IBM-932           IBM-932           CP932             
+Nl_BE            IBM-850           IBM-850           CP850             
+Nl_BE.IBM-850    IBM-850           IBM-850           CP850             
+Nl_NL            IBM-850           IBM-850           CP850             
+Nl_NL.IBM-850    IBM-850           IBM-850           CP850             
+No_NO            IBM-850           IBM-850           CP850             
+No_NO.IBM-850    IBM-850           IBM-850           CP850             
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+Pt_PT            IBM-850           IBM-850           CP850             
+Pt_PT.IBM-850    IBM-850           IBM-850           CP850             
+Sv_SE            IBM-850           IBM-850           CP850             
+Sv_SE.IBM-850    IBM-850           IBM-850           CP850             
+ZH_CN            UTF-8             UTF-8             UTF-8             
+ZH_CN.UTF-8      UTF-8             UTF-8             UTF-8             
+ar_AA            ISO8859-6         ISO8859-6         ISO-8859-6        
+ar_AA.ISO8859-6  ISO8859-6         ISO8859-6         ISO-8859-6        
+bg_BG            ISO8859-5         ISO8859-5         ISO-8859-5        
+bg_BG.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+cs_CZ            ISO8859-2         ISO8859-2         ISO-8859-2        
+cs_CZ.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+fr_FR            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+hr_HR            ISO8859-2         ISO8859-2         ISO-8859-2        
+hr_HR.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU            ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+iw_IL            ISO8859-8         ISO8859-8         ISO-8859-8        
+iw_IL.ISO8859-8  ISO8859-8         ISO8859-8         ISO-8859-8        
+ja_JP.IBM-eucJP  IBM-eucJP         IBM-eucJP         EUC-JP            
+ko_KR.IBM-eucKR  IBM-eucKR         IBM-eucKR         EUC-KR            
+mk_MK            ISO8859-5         ISO8859-5         ISO-8859-5        
+mk_MK.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+pl_PL            ISO8859-2         ISO8859-2         ISO-8859-2        
+pl_PL.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+ro_RO            ISO8859-2         ISO8859-2         ISO-8859-2        
+ro_RO.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+ru_RU            ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+sh_SP            ISO8859-2         ISO8859-2         ISO-8859-2        
+sh_SP.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK            ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI            ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sr_SP            ISO8859-5         ISO8859-5         ISO-8859-5        
+sr_SP.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+zh_CN.IBM-eucCN  IBM-eucCN         IBM-eucCN         EUC-CN            
+zh_TW.IBM-eucTW  IBM-eucTW         IBM-eucTW         EUC-TW            
diff --git a/jni/iconv/libcharset/tools/aix-4.2.0 b/jni/iconv/libcharset/tools/aix-4.2.0
new file mode 100644
index 0000000..20dbed2
--- /dev/null
+++ b/jni/iconv/libcharset/tools/aix-4.2.0
@@ -0,0 +1,150 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+Ar_AA            IBM-1046          IBM-1046          CP1046            
+Ar_AA.IBM-1046   IBM-1046          IBM-1046          CP1046            
+C                ISO8859-1         ISO8859-1         ISO-8859-1        
+Ca_ES            IBM-850           IBM-850           CP850             
+Ca_ES.IBM-850    IBM-850           IBM-850           CP850             
+Da_DK            IBM-850           IBM-850           CP850             
+Da_DK.IBM-850    IBM-850           IBM-850           CP850             
+De_CH            IBM-850           IBM-850           CP850             
+De_CH.IBM-850    IBM-850           IBM-850           CP850             
+De_DE            IBM-850           IBM-850           CP850             
+De_DE.IBM-850    IBM-850           IBM-850           CP850             
+ET_EE            UTF-8             UTF-8             UTF-8             
+ET_EE.UTF-8      UTF-8             UTF-8             UTF-8             
+En_GB            IBM-850           IBM-850           CP850             
+En_GB.IBM-850    IBM-850           IBM-850           CP850             
+En_US            IBM-850           IBM-850           CP850             
+En_US.IBM-850    IBM-850           IBM-850           CP850             
+Es_ES            IBM-850           IBM-850           CP850             
+Es_ES.IBM-850    IBM-850           IBM-850           CP850             
+Et_EE            IBM-922           IBM-922           CP922             
+Et_EE.IBM-922    IBM-922           IBM-922           CP922             
+Fi_FI            IBM-850           IBM-850           CP850             
+Fi_FI.IBM-850    IBM-850           IBM-850           CP850             
+Fr_BE            IBM-850           IBM-850           CP850             
+Fr_BE.IBM-850    IBM-850           IBM-850           CP850             
+Fr_CA            IBM-850           IBM-850           CP850             
+Fr_CA.IBM-850    IBM-850           IBM-850           CP850             
+Fr_CH            IBM-850           IBM-850           CP850             
+Fr_CH.IBM-850    IBM-850           IBM-850           CP850             
+Fr_FR            IBM-850           IBM-850           CP850             
+Fr_FR.IBM-850    IBM-850           IBM-850           CP850             
+Is_IS            IBM-850           IBM-850           CP850             
+Is_IS.IBM-850    IBM-850           IBM-850           CP850             
+It_IT            IBM-850           IBM-850           CP850             
+It_IT.IBM-850    IBM-850           IBM-850           CP850             
+Iw_IL            IBM-856           IBM-856           CP856             
+Iw_IL.IBM-856    IBM-856           IBM-856           CP856             
+Ja_JP            IBM-932           IBM-932           CP932             
+Ja_JP.IBM-932    IBM-932           IBM-932           CP932             
+Jp_JP            IBM-932           IBM-932           CP932             
+Jp_JP.pc932      IBM-932           IBM-932           CP932             
+LT_LT            UTF-8             UTF-8             UTF-8             
+LT_LT.UTF-8      UTF-8             UTF-8             UTF-8             
+LV_LV            UTF-8             UTF-8             UTF-8             
+LV_LV.UTF-8      UTF-8             UTF-8             UTF-8             
+Lt_LT            IBM-921           IBM-921           ISO-8859-13       
+Lt_LT.IBM-921    IBM-921           IBM-921           ISO-8859-13       
+Lv_LV            IBM-921           IBM-921           ISO-8859-13       
+Lv_LV.IBM-921    IBM-921           IBM-921           ISO-8859-13       
+Nl_BE            IBM-850           IBM-850           CP850             
+Nl_BE.IBM-850    IBM-850           IBM-850           CP850             
+Nl_NL            IBM-850           IBM-850           CP850             
+Nl_NL.IBM-850    IBM-850           IBM-850           CP850             
+No_NO            IBM-850           IBM-850           CP850             
+No_NO.IBM-850    IBM-850           IBM-850           CP850             
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+Pt_PT            IBM-850           IBM-850           CP850             
+Pt_PT.IBM-850    IBM-850           IBM-850           CP850             
+Sv_SE            IBM-850           IBM-850           CP850             
+Sv_SE.IBM-850    IBM-850           IBM-850           CP850             
+ZH_CN            UTF-8             UTF-8             UTF-8             
+ZH_CN.UTF-8      UTF-8             UTF-8             UTF-8             
+Zh_TW            big5              big5              BIG5              
+Zh_TW.big5       big5              big5              BIG5              
+ar_AA            ISO8859-6         ISO8859-6         ISO-8859-6        
+ar_AA.ISO8859-6  ISO8859-6         ISO8859-6         ISO-8859-6        
+bg_BG            ISO8859-5         ISO8859-5         ISO-8859-5        
+bg_BG.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+ca_ES            ISO8859-1         ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+cs_CZ            ISO8859-2         ISO8859-2         ISO-8859-2        
+cs_CZ.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+da_DK            ISO8859-1         ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+el_GR            ISO8859-7         ISO8859-7         ISO-8859-7        
+el_GR.ISO8859-7  ISO8859-7         ISO8859-7         ISO-8859-7        
+en_GB            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+es_ES            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI            ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+hr_HR            ISO8859-2         ISO8859-2         ISO-8859-2        
+hr_HR.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU            ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+is_IS            ISO8859-1         ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT            ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+iw_IL            ISO8859-8         ISO8859-8         ISO-8859-8        
+iw_IL.ISO8859-8  ISO8859-8         ISO8859-8         ISO-8859-8        
+ja_JP            IBM-eucJP         IBM-eucJP         EUC-JP            
+ja_JP.IBM-eucJP  IBM-eucJP         IBM-eucJP         EUC-JP            
+ko_KR            IBM-eucKR         IBM-eucKR         EUC-KR            
+ko_KR.IBM-eucKR  IBM-eucKR         IBM-eucKR         EUC-KR            
+mk_MK            ISO8859-5         ISO8859-5         ISO-8859-5        
+mk_MK.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL            ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO            ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pl_PL            ISO8859-2         ISO8859-2         ISO-8859-2        
+pl_PL.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_BR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT            ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+ro_RO            ISO8859-2         ISO8859-2         ISO-8859-2        
+ro_RO.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+ru_RU            ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+sh_SP            ISO8859-2         ISO8859-2         ISO-8859-2        
+sh_SP.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK            ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI            ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sq_AL            ISO8859-1         ISO8859-1         ISO-8859-1        
+sq_AL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+sr_SP            ISO8859-5         ISO8859-5         ISO-8859-5        
+sr_SP.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+sv_SE            ISO8859-1         ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+tr_TR            ISO8859-9         ISO8859-9         ISO-8859-9        
+tr_TR.ISO8859-9  ISO8859-9         ISO8859-9         ISO-8859-9        
+zh_CN            IBM-eucCN         IBM-eucCN         EUC-CN            
+zh_CN.IBM-eucCN  IBM-eucCN         IBM-eucCN         EUC-CN            
+zh_TW            IBM-eucTW         IBM-eucTW         EUC-TW            
+zh_TW.IBM-eucTW  IBM-eucTW         IBM-eucTW         EUC-TW            
diff --git a/jni/iconv/libcharset/tools/aix-4.3.2 b/jni/iconv/libcharset/tools/aix-4.3.2
new file mode 100644
index 0000000..63969f2
--- /dev/null
+++ b/jni/iconv/libcharset/tools/aix-4.3.2
@@ -0,0 +1,342 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+AR_AA            UTF-8             UTF-8             UTF-8             
+AR_AA.UTF-8      UTF-8             UTF-8             UTF-8             
+Ar_AA            IBM-1046          IBM-1046          CP1046            
+Ar_AA.IBM-1046   IBM-1046          IBM-1046          CP1046            
+BE_BY            UTF-8             UTF-8             UTF-8             
+BE_BY.UTF-8      UTF-8             UTF-8             UTF-8             
+BG_BG            UTF-8             UTF-8             UTF-8             
+BG_BG.UTF-8      UTF-8             UTF-8             UTF-8             
+C                ISO8859-1         ISO8859-1         ISO-8859-1        
+CA_ES            UTF-8             UTF-8             UTF-8             
+CA_ES.UTF-8      UTF-8             UTF-8             UTF-8             
+CA_ES.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+CA_ES@euro       UTF-8             UTF-8             UTF-8             
+CS_CZ            UTF-8             UTF-8             UTF-8             
+CS_CZ.UTF-8      UTF-8             UTF-8             UTF-8             
+Ca_ES            IBM-850           IBM-850           CP850             
+Ca_ES.IBM-850    IBM-850           IBM-850           CP850             
+DA_DK            UTF-8             UTF-8             UTF-8             
+DA_DK.UTF-8      UTF-8             UTF-8             UTF-8             
+DE_CH            UTF-8             UTF-8             UTF-8             
+DE_CH.UTF-8      UTF-8             UTF-8             UTF-8             
+DE_DE            UTF-8             UTF-8             UTF-8             
+DE_DE.UTF-8      UTF-8             UTF-8             UTF-8             
+DE_DE.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+DE_DE@euro       UTF-8             UTF-8             UTF-8             
+Da_DK            IBM-850           IBM-850           CP850             
+Da_DK.IBM-850    IBM-850           IBM-850           CP850             
+De_CH            IBM-850           IBM-850           CP850             
+De_CH.IBM-850    IBM-850           IBM-850           CP850             
+De_DE            IBM-850           IBM-850           CP850             
+De_DE.IBM-850    IBM-850           IBM-850           CP850             
+EL_GR            UTF-8             UTF-8             UTF-8             
+EL_GR.UTF-8      UTF-8             UTF-8             UTF-8             
+EN_AU            UTF-8             UTF-8             UTF-8             
+EN_AU.UTF-8      UTF-8             UTF-8             UTF-8             
+EN_BE            UTF-8             UTF-8             UTF-8             
+EN_BE.UTF-8      UTF-8             UTF-8             UTF-8             
+EN_BE.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+EN_BE@euro       UTF-8             UTF-8             UTF-8             
+EN_GB            UTF-8             UTF-8             UTF-8             
+EN_GB.UTF-8      UTF-8             UTF-8             UTF-8             
+EN_US            UTF-8             UTF-8             UTF-8             
+EN_US.UTF-8      UTF-8             UTF-8             UTF-8             
+EN_ZA            UTF-8             UTF-8             UTF-8             
+EN_ZA.UTF-8      UTF-8             UTF-8             UTF-8             
+ES_ES            UTF-8             UTF-8             UTF-8             
+ES_ES.UTF-8      UTF-8             UTF-8             UTF-8             
+ES_ES.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+ES_ES@euro       UTF-8             UTF-8             UTF-8             
+ET_EE            UTF-8             UTF-8             UTF-8             
+ET_EE.UTF-8      UTF-8             UTF-8             UTF-8             
+En_GB            IBM-850           IBM-850           CP850             
+En_GB.IBM-850    IBM-850           IBM-850           CP850             
+En_US            IBM-850           IBM-850           CP850             
+En_US.IBM-850    IBM-850           IBM-850           CP850             
+Es_ES            IBM-850           IBM-850           CP850             
+Es_ES.IBM-850    IBM-850           IBM-850           CP850             
+Et_EE            IBM-922           IBM-922           CP922             
+Et_EE.IBM-922    IBM-922           IBM-922           CP922             
+FI_FI            UTF-8             UTF-8             UTF-8             
+FI_FI.UTF-8      UTF-8             UTF-8             UTF-8             
+FI_FI.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+FI_FI@euro       UTF-8             UTF-8             UTF-8             
+FR_BE            UTF-8             UTF-8             UTF-8             
+FR_BE.UTF-8      UTF-8             UTF-8             UTF-8             
+FR_BE.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+FR_BE@euro       UTF-8             UTF-8             UTF-8             
+FR_CA            UTF-8             UTF-8             UTF-8             
+FR_CA.UTF-8      UTF-8             UTF-8             UTF-8             
+FR_CH            UTF-8             UTF-8             UTF-8             
+FR_CH.UTF-8      UTF-8             UTF-8             UTF-8             
+FR_FR            UTF-8             UTF-8             UTF-8             
+FR_FR.UTF-8      UTF-8             UTF-8             UTF-8             
+FR_FR.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+FR_FR@euro       UTF-8             UTF-8             UTF-8             
+Fi_FI            IBM-850           IBM-850           CP850             
+Fi_FI.IBM-850    IBM-850           IBM-850           CP850             
+Fr_BE            IBM-850           IBM-850           CP850             
+Fr_BE.IBM-850    IBM-850           IBM-850           CP850             
+Fr_CA            IBM-850           IBM-850           CP850             
+Fr_CA.IBM-850    IBM-850           IBM-850           CP850             
+Fr_CH            IBM-850           IBM-850           CP850             
+Fr_CH.IBM-850    IBM-850           IBM-850           CP850             
+Fr_FR            IBM-850           IBM-850           CP850             
+Fr_FR.IBM-850    IBM-850           IBM-850           CP850             
+HE_IL            UTF-8             UTF-8             UTF-8             
+HE_IL.UTF-8      UTF-8             UTF-8             UTF-8             
+HR_HR            UTF-8             UTF-8             UTF-8             
+HR_HR.UTF-8      UTF-8             UTF-8             UTF-8             
+HU_HU            UTF-8             UTF-8             UTF-8             
+HU_HU.UTF-8      UTF-8             UTF-8             UTF-8             
+IS_IS            UTF-8             UTF-8             UTF-8             
+IS_IS.UTF-8      UTF-8             UTF-8             UTF-8             
+IT_CH            UTF-8             UTF-8             UTF-8             
+IT_CH.UTF-8      UTF-8             UTF-8             UTF-8             
+IT_IT            UTF-8             UTF-8             UTF-8             
+IT_IT.UTF-8      UTF-8             UTF-8             UTF-8             
+IT_IT.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+IT_IT@euro       UTF-8             UTF-8             UTF-8             
+Is_IS            IBM-850           IBM-850           CP850             
+Is_IS.IBM-850    IBM-850           IBM-850           CP850             
+It_IT            IBM-850           IBM-850           CP850             
+It_IT.IBM-850    IBM-850           IBM-850           CP850             
+Iw_IL            IBM-856           IBM-856           CP856             
+Iw_IL.IBM-856    IBM-856           IBM-856           CP856             
+JA_JP            UTF-8             UTF-8             UTF-8             
+JA_JP.UTF-8      UTF-8             UTF-8             UTF-8             
+Ja_JP            IBM-943           IBM-943           CP943             
+Ja_JP.IBM-932    IBM-932           IBM-932           CP932             
+Ja_JP.IBM-943    IBM-943           IBM-943           CP943             
+Jp_JP            IBM-932           IBM-932           CP932             
+Jp_JP.pc932      IBM-932           IBM-932           CP932             
+KO_KR            UTF-8             UTF-8             UTF-8             
+KO_KR.UTF-8      UTF-8             UTF-8             UTF-8             
+LT_LT            UTF-8             UTF-8             UTF-8             
+LT_LT.UTF-8      UTF-8             UTF-8             UTF-8             
+LV_LV            UTF-8             UTF-8             UTF-8             
+LV_LV.UTF-8      UTF-8             UTF-8             UTF-8             
+Lt_LT            IBM-921           IBM-921           ISO-8859-13       
+Lt_LT.IBM-921    IBM-921           IBM-921           ISO-8859-13       
+Lv_LV            IBM-921           IBM-921           ISO-8859-13       
+Lv_LV.IBM-921    IBM-921           IBM-921           ISO-8859-13       
+MK_MK            UTF-8             UTF-8             UTF-8             
+MK_MK.UTF-8      UTF-8             UTF-8             UTF-8             
+NL_BE            UTF-8             UTF-8             UTF-8             
+NL_BE.UTF-8      UTF-8             UTF-8             UTF-8             
+NL_BE.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+NL_BE@euro       UTF-8             UTF-8             UTF-8             
+NL_NL            UTF-8             UTF-8             UTF-8             
+NL_NL.UTF-8      UTF-8             UTF-8             UTF-8             
+NL_NL.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+NL_NL@euro       UTF-8             UTF-8             UTF-8             
+NO_NO            UTF-8             UTF-8             UTF-8             
+NO_NO.UTF-8      UTF-8             UTF-8             UTF-8             
+Nl_BE            IBM-850           IBM-850           CP850             
+Nl_BE.IBM-850    IBM-850           IBM-850           CP850             
+Nl_NL            IBM-850           IBM-850           CP850             
+Nl_NL.IBM-850    IBM-850           IBM-850           CP850             
+No_NO            IBM-850           IBM-850           CP850             
+No_NO.IBM-850    IBM-850           IBM-850           CP850             
+PL_PL            UTF-8             UTF-8             UTF-8             
+PL_PL.UTF-8      UTF-8             UTF-8             UTF-8             
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+PT_BR            UTF-8             UTF-8             UTF-8             
+PT_BR.UTF-8      UTF-8             UTF-8             UTF-8             
+PT_PT            UTF-8             UTF-8             UTF-8             
+PT_PT.UTF-8      UTF-8             UTF-8             UTF-8             
+PT_PT.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+PT_PT@euro       UTF-8             UTF-8             UTF-8             
+Pt_PT            IBM-850           IBM-850           CP850             
+Pt_PT.IBM-850    IBM-850           IBM-850           CP850             
+RO_RO            UTF-8             UTF-8             UTF-8             
+RO_RO.UTF-8      UTF-8             UTF-8             UTF-8             
+RU_RU            UTF-8             UTF-8             UTF-8             
+RU_RU.UTF-8      UTF-8             UTF-8             UTF-8             
+SH_SP            UTF-8             UTF-8             UTF-8             
+SH_SP.UTF-8      UTF-8             UTF-8             UTF-8             
+SK_SK            UTF-8             UTF-8             UTF-8             
+SK_SK.UTF-8      UTF-8             UTF-8             UTF-8             
+SL_SI            UTF-8             UTF-8             UTF-8             
+SL_SI.UTF-8      UTF-8             UTF-8             UTF-8             
+SQ_AL            UTF-8             UTF-8             UTF-8             
+SQ_AL.UTF-8      UTF-8             UTF-8             UTF-8             
+SR_SP            UTF-8             UTF-8             UTF-8             
+SR_SP.UTF-8      UTF-8             UTF-8             UTF-8             
+SV_SE            UTF-8             UTF-8             UTF-8             
+SV_SE.UTF-8      UTF-8             UTF-8             UTF-8             
+Sv_SE            IBM-850           IBM-850           CP850             
+Sv_SE.IBM-850    IBM-850           IBM-850           CP850             
+TH_TH            UTF-8             UTF-8             UTF-8             
+TH_TH.UTF-8      UTF-8             UTF-8             UTF-8             
+TR_TR            UTF-8             UTF-8             UTF-8             
+TR_TR.UTF-8      UTF-8             UTF-8             UTF-8             
+UK_UA            UTF-8             UTF-8             UTF-8             
+UK_UA.UTF-8      UTF-8             UTF-8             UTF-8             
+Uk_UA            IBM-1124          IBM-1124          CP1124            
+Uk_UA.IBM-1124   IBM-1124          IBM-1124          CP1124            
+VI_VN            UTF-8             UTF-8             UTF-8             
+VI_VN.UTF-8      UTF-8             UTF-8             UTF-8             
+Vi_VN            IBM-1129          IBM-1129          CP1129            
+Vi_VN.IBM-1129   IBM-1129          IBM-1129          CP1129            
+ZH_CN            UTF-8             UTF-8             UTF-8             
+ZH_CN.UTF-8      UTF-8             UTF-8             UTF-8             
+ZH_TW            UTF-8             UTF-8             UTF-8             
+ZH_TW.UTF-8      UTF-8             UTF-8             UTF-8             
+Zh_CN            GBK               GBK               GBK               
+Zh_CN.GBK        GBK               GBK               GBK               
+Zh_TW            big5              big5              BIG5              
+Zh_TW.big5       big5              big5              BIG5              
+ar_AA            ISO8859-6         ISO8859-6         ISO-8859-6        
+ar_AA.ISO8859-6  ISO8859-6         ISO8859-6         ISO-8859-6        
+be_BY            ISO8859-5         ISO8859-5         ISO-8859-5        
+be_BY.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+bg_BG            ISO8859-5         ISO8859-5         ISO-8859-5        
+bg_BG.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+ca_ES            ISO8859-1         ISO8859-1         ISO-8859-1        
+ca_ES.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+ca_ES.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+ca_ES.IBM-1252   IBM-1252          IBM-1252          CP1252            
+ca_ES.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+ca_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+cs_CZ            ISO8859-2         ISO8859-2         ISO-8859-2        
+cs_CZ.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+da_DK            ISO8859-1         ISO8859-1         ISO-8859-1        
+da_DK.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+da_DK.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+de_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+de_DE.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_DE.IBM-1252   IBM-1252          IBM-1252          CP1252            
+de_DE.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+de_DE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+el_GR            ISO8859-7         ISO8859-7         ISO-8859-7        
+el_GR.ISO8859-7  ISO8859-7         ISO8859-7         ISO-8859-7        
+en_AU            ISO8859-15        ISO8859-15        ISO-8859-15       
+en_AU.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+en_BE            ISO8859-15        ISO8859-15        ISO-8859-15       
+en_BE.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+en_BE.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_GB            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_GB.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+en_GB.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_GB.IBM-1252   IBM-1252          IBM-1252          CP1252            
+en_GB.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+en_GB.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_ZA            ISO8859-15        ISO8859-15        ISO-8859-15       
+en_ZA.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+es_ES            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_ES.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+es_ES.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+es_ES.IBM-1252   IBM-1252          IBM-1252          CP1252            
+es_ES.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+es_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI            ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fi_FI.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+fi_FI.IBM-1252   IBM-1252          IBM-1252          CP1252            
+fi_FI.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+fi_FI.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_BE.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_BE.IBM-1252   IBM-1252          IBM-1252          CP1252            
+fr_BE.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+fr_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_FR.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_FR.IBM-1252   IBM-1252          IBM-1252          CP1252            
+fr_FR.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+hr_HR            ISO8859-2         ISO8859-2         ISO-8859-2        
+hr_HR.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU            ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+is_IS            ISO8859-1         ISO8859-1         ISO-8859-1        
+is_IS.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+is_IS.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_CH            ISO8859-15        ISO8859-15        ISO-8859-15       
+it_CH.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+it_IT            ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+it_IT.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+it_IT.IBM-1252   IBM-1252          IBM-1252          CP1252            
+it_IT.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+it_IT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+iw_IL            ISO8859-8         ISO8859-8         ISO-8859-8        
+iw_IL.ISO8859-8  ISO8859-8         ISO8859-8         ISO-8859-8        
+ja_JP            IBM-eucJP         IBM-eucJP         EUC-JP            
+ja_JP.IBM-eucJP  IBM-eucJP         IBM-eucJP         EUC-JP            
+ko_KR            IBM-eucKR         IBM-eucKR         EUC-KR            
+ko_KR.IBM-eucKR  IBM-eucKR         IBM-eucKR         EUC-KR            
+mk_MK            ISO8859-5         ISO8859-5         ISO-8859-5        
+mk_MK.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_BE.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_BE.IBM-1252   IBM-1252          IBM-1252          CP1252            
+nl_BE.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+nl_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL            ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_NL.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_NL.IBM-1252   IBM-1252          IBM-1252          CP1252            
+nl_NL.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+nl_NL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO            ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+no_NO.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pl_PL            ISO8859-2         ISO8859-2         ISO-8859-2        
+pl_PL.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_BR.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+pt_BR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT            ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+pt_PT.8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+pt_PT.IBM-1252   IBM-1252          IBM-1252          CP1252            
+pt_PT.IBM-1252@euro  IBM-1252          IBM-1252          CP1252            
+pt_PT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+ro_RO            ISO8859-2         ISO8859-2         ISO-8859-2        
+ro_RO.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+ru_RU            ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+sh_SP            ISO8859-2         ISO8859-2         ISO-8859-2        
+sh_SP.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK            ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI            ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sq_AL            ISO8859-1         ISO8859-1         ISO-8859-1        
+sq_AL.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+sq_AL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+sr_SP            ISO8859-5         ISO8859-5         ISO-8859-5        
+sr_SP.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+sv_SE            ISO8859-1         ISO8859-1         ISO-8859-1        
+sv_SE.8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+sv_SE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+th_TH            TIS-620           TIS-620           TIS-620           
+th_TH.TIS-620    TIS-620           TIS-620           TIS-620           
+tr_TR            ISO8859-9         ISO8859-9         ISO-8859-9        
+tr_TR.ISO8859-9  ISO8859-9         ISO8859-9         ISO-8859-9        
+zh_CN            IBM-eucCN         IBM-eucCN         EUC-CN            
+zh_CN.IBM-eucCN  IBM-eucCN         IBM-eucCN         EUC-CN            
+zh_TW            IBM-eucTW         IBM-eucTW         EUC-TW            
+zh_TW.IBM-eucTW  IBM-eucTW         IBM-eucTW         EUC-TW            
diff --git a/jni/iconv/libcharset/tools/all-charsets b/jni/iconv/libcharset/tools/all-charsets
new file mode 100755
index 0000000..22b3368
--- /dev/null
+++ b/jni/iconv/libcharset/tools/all-charsets
@@ -0,0 +1,34 @@
+#! /bin/sh
+
+# Prints a table of the charsets (system dependent name and portable name)
+# for all locales.
+
+${CC-cc} -o locale_codeset locale_codeset.c
+${CC-cc} -o locale_charset -I../include locale_charset.c \
+    -DHAVE_CONFIG_H -I.. -DLIBDIR='"'`cd ../lib && pwd`'"' \
+    ../lib/localcharset.c
+
+printf '%-15s%-17s%-17s %-17s\n\n' \
+       "locale name" "locale charmap" "nl_langinfo(CODESET)" "locale_charset()"
+for lc in `./all-locales | sort | uniq`
+do
+  charmap=`LC_ALL=$lc ./locale_charmap 2>/dev/null || echo '<error>'`
+  codeset=`LC_ALL=$lc ./locale_codeset 2>/dev/null || echo '<error>'`
+  charset=`LC_ALL=$lc ./locale_charset 2>/dev/null || echo '<error>'`
+  case "$charset" in
+    ASCII | ANSI_X3.4-1968 | \
+    ISO-8859-1 | ISO-8859-2 | ISO-8859-3 | ISO-8859-4 | ISO-8859-5 | ISO-8859-6 | \
+    ISO-8859-7 | ISO-8859-8 | ISO-8859-9 | ISO-8859-13 | ISO-8859-14 | ISO-8859-15 | \
+    KOI8-R | KOI8-U | KOI8-T | \
+    CP437 | CP775 | CP850 | CP852 | CP855 | CP856 | CP857 | CP861 | CP862 | CP864 | CP865 | CP866 | CP869 | CP874 | CP922 | CP932 | CP943 | CP949 | CP950 | CP1046 | CP1124 | CP1125 | CP1129 | CP1131 | \
+    CP1250 | CP1251 | CP1252 | CP1253 | CP1254 | CP1255 | CP1256 | CP1257 | \
+    GB2312 | EUC-JP | EUC-KR | EUC-TW | BIG5 | BIG5-HKSCS | GBK | GB18030 | SHIFT_JIS | JOHAB | \
+    TIS-620 | VISCII | TCVN5712-1 | ARMSCII-8 | GEORGIAN-PS | PT154 | \
+    HP-ROMAN8 | HP-ARABIC8 | HP-GREEK8 | HP-HEBREW8 | HP-TURKISH8 | HP-KANA8 | \
+    DEC-KANJI | DEC-HANYU | \
+    UTF-8 ) comment="";;
+    * ) comment="bug";;
+  esac
+  printf '%-15s  %-17s %-17s %-17s %s\n' \
+         "$lc" "$charmap" "$codeset" "$charset" "$comment"
+done
diff --git a/jni/iconv/libcharset/tools/all-charsets-X11 b/jni/iconv/libcharset/tools/all-charsets-X11
new file mode 100755
index 0000000..95003ca
--- /dev/null
+++ b/jni/iconv/libcharset/tools/all-charsets-X11
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Prints a table of the charsets (system dependent name, portable name, and
+# X11 name) for all locales.
+
+${CC-cc} -o locale_codeset locale_codeset.c
+${CC-cc} -o locale_charset -I../include locale_charset.c \
+    -DHAVE_CONFIG_H -I.. -DLIBDIR='"'`cd ../lib && pwd`'"' \
+    ../lib/localcharset.c
+${CC-cc} -o locale_x11encoding locale_x11encoding.c \
+    -I/usr/X11R6/include \
+    -L/usr/X11R6/lib -lX11
+#${CC-cc} -o locale_x11encoding locale_x11encoding.c \
+#    -I/packages/gnu/XFree86/include \
+#    -L/packages/gnu/XFree86/lib -lX11 \
+#    -Wl,-rpath,/packages/gnu/XFree86/lib
+
+printf '%-15s%-17s%-17s %-17s %-17s\n\n' \
+       "locale name" "locale charmap" "nl_langinfo(CODESET)" "locale_charset()" "X11 encoding"
+for lc in `./all-locales | sort | uniq`
+do
+  charmap=`LC_ALL=$lc ./locale_charmap 2>/dev/null || echo '<error>'`
+  codeset=`LC_ALL=$lc ./locale_codeset 2>/dev/null || echo '<error>'`
+  charset=`LC_ALL=$lc ./locale_charset 2>/dev/null || echo '<error>'`
+  x11encoding=`LC_ALL=$lc ./locale_x11encoding 2>/dev/null || echo '<error>'`
+  printf '%-15s  %-17s %-17s %-17s %-17s\n' \
+         "$lc" "$charmap" "$codeset" "$charset" "$x11encoding"
+done
diff --git a/jni/iconv/libcharset/tools/all-locales b/jni/iconv/libcharset/tools/all-locales
new file mode 100755
index 0000000..54283b8
--- /dev/null
+++ b/jni/iconv/libcharset/tools/all-locales
@@ -0,0 +1,27 @@
+#! /bin/sh
+# Prints the list of all locale names, one per line.
+
+locale -a
+test $? = 0 && exit 0
+
+host=`/bin/sh ../build-aux/config.guess`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+case "$host_os" in
+  sunos* | solaris*)
+    cd /usr/lib/locale && ls -1
+    ;;
+  freebsd*)
+    cd /usr/share/locale && ls -1
+    ;;
+  darwin* | openbsd*)
+    echo C
+    cd /usr/share/locale && ls -1 */LC_CTYPE | sed -e 's,/LC_CTYPE$,,'
+    ;;
+  *)
+    echo "Don't know how to determine list of locales on $host_os" 1>&2
+    exit 1
+    ;;
+esac
diff --git a/jni/iconv/libcharset/tools/beos-5 b/jni/iconv/libcharset/tools/beos-5
new file mode 100644
index 0000000..fd8e022
--- /dev/null
+++ b/jni/iconv/libcharset/tools/beos-5
@@ -0,0 +1,3 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset()
+
+C                <error>           <error>           UTF-8
diff --git a/jni/iconv/libcharset/tools/darwin-6.8 b/jni/iconv/libcharset/tools/darwin-6.8
new file mode 100644
index 0000000..6692431
--- /dev/null
+++ b/jni/iconv/libcharset/tools/darwin-6.8
@@ -0,0 +1,93 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+bg_BG.CP1251     <error>           <error>           CP1251            
+cs_CZ.ISO8859-2  <error>           <error>           ISO-8859-2        
+da_DK            <error>           <error>           ISO-8859-1        
+da_DK.ISO8859-1  <error>           <error>           ISO-8859-1        
+da_DK.ISO8859-15  <error>           <error>           ISO-8859-15       
+de_AT            <error>           <error>           ISO-8859-1        
+de_AT.ISO8859-1  <error>           <error>           ISO-8859-1        
+de_AT.ISO8859-15  <error>           <error>           ISO-8859-15       
+de_CH            <error>           <error>           ISO-8859-1        
+de_CH.ISO8859-1  <error>           <error>           ISO-8859-1        
+de_CH.ISO8859-15  <error>           <error>           ISO-8859-15       
+de_DE            <error>           <error>           ISO-8859-1        
+de_DE.ISO8859-1  <error>           <error>           ISO-8859-1        
+de_DE.ISO8859-15  <error>           <error>           ISO-8859-15       
+en_AU            <error>           <error>           ISO-8859-1        
+en_AU.ISO8859-1  <error>           <error>           ISO-8859-1        
+en_AU.ISO8859-15  <error>           <error>           ISO-8859-15       
+en_AU.US-ASCII   <error>           <error>           ASCII             
+en_CA            <error>           <error>           ISO-8859-1        
+en_CA.ISO8859-1  <error>           <error>           ISO-8859-1        
+en_CA.ISO8859-15  <error>           <error>           ISO-8859-15       
+en_CA.US-ASCII   <error>           <error>           ASCII             
+en_GB            <error>           <error>           ISO-8859-1        
+en_GB.ISO8859-1  <error>           <error>           ISO-8859-1        
+en_GB.ISO8859-15  <error>           <error>           ISO-8859-15       
+en_GB.US-ASCII   <error>           <error>           ASCII             
+en_US            <error>           <error>           ISO-8859-1        
+en_US.ISO8859-1  <error>           <error>           ISO-8859-1        
+en_US.ISO8859-15  <error>           <error>           ISO-8859-15       
+en_US.US-ASCII   <error>           <error>           ASCII             
+es_ES            <error>           <error>           ISO-8859-1        
+es_ES.ISO8859-1  <error>           <error>           ISO-8859-1        
+es_ES.ISO8859-15  <error>           <error>           ISO-8859-15       
+fi_FI            <error>           <error>           ISO-8859-1        
+fi_FI.ISO8859-1  <error>           <error>           ISO-8859-1        
+fi_FI.ISO8859-15  <error>           <error>           ISO-8859-15       
+fr_BE            <error>           <error>           ISO-8859-1        
+fr_BE.ISO8859-1  <error>           <error>           ISO-8859-1        
+fr_BE.ISO8859-15  <error>           <error>           ISO-8859-15       
+fr_CA            <error>           <error>           ISO-8859-1        
+fr_CA.ISO8859-1  <error>           <error>           ISO-8859-1        
+fr_CA.ISO8859-15  <error>           <error>           ISO-8859-15       
+fr_CH            <error>           <error>           ISO-8859-1        
+fr_CH.ISO8859-1  <error>           <error>           ISO-8859-1        
+fr_CH.ISO8859-15  <error>           <error>           ISO-8859-15       
+fr_FR            <error>           <error>           ISO-8859-1        
+fr_FR.ISO8859-1  <error>           <error>           ISO-8859-1        
+fr_FR.ISO8859-15  <error>           <error>           ISO-8859-15       
+hr_HR.ISO8859-2  <error>           <error>           ISO-8859-2        
+hu_HU.ISO8859-2  <error>           <error>           ISO-8859-2        
+is_IS            <error>           <error>           ISO-8859-1        
+is_IS.ISO8859-1  <error>           <error>           ISO-8859-1        
+is_IS.ISO8859-15  <error>           <error>           ISO-8859-15       
+it_CH            <error>           <error>           ISO-8859-1        
+it_CH.ISO8859-1  <error>           <error>           ISO-8859-1        
+it_CH.ISO8859-15  <error>           <error>           ISO-8859-15       
+it_IT            <error>           <error>           ISO-8859-1        
+it_IT.ISO8859-1  <error>           <error>           ISO-8859-1        
+it_IT.ISO8859-15  <error>           <error>           ISO-8859-15       
+ja_JP.EUC        <error>           <error>           EUC-JP            
+ja_JP.SJIS       <error>           <error>           SHIFT_JIS         
+ko_KR.EUC        <error>           <error>           EUC-KR            
+la_LN.ISO8859-1  <error>           <error>           ISO-8859-1        
+la_LN.ISO8859-15  <error>           <error>           ISO-8859-15       
+la_LN.ISO8859-2  <error>           <error>           ISO-8859-2        
+la_LN.ISO8859-4  <error>           <error>           ISO-8859-4        
+la_LN.US-ASCII   <error>           <error>           ASCII             
+lt_LT.ISO8859-4  <error>           <error>           ISO-8859-4        
+nl_BE            <error>           <error>           ISO-8859-1        
+nl_BE.ISO8859-1  <error>           <error>           ISO-8859-1        
+nl_BE.ISO8859-15  <error>           <error>           ISO-8859-15       
+nl_NL            <error>           <error>           ISO-8859-1        
+nl_NL.ISO8859-1  <error>           <error>           ISO-8859-1        
+nl_NL.ISO8859-15  <error>           <error>           ISO-8859-15       
+no_NO            <error>           <error>           ISO-8859-1        
+no_NO.ISO8859-1  <error>           <error>           ISO-8859-1        
+no_NO.ISO8859-15  <error>           <error>           ISO-8859-15       
+pl_PL.ISO8859-2  <error>           <error>           ISO-8859-2        
+pt_PT            <error>           <error>           ISO-8859-1        
+pt_PT.ISO8859-1  <error>           <error>           ISO-8859-1        
+pt_PT.ISO8859-15  <error>           <error>           ISO-8859-15       
+ru_RU.CP866      <error>           <error>           CP866             
+ru_RU.ISO8859-5  <error>           <error>           ISO-8859-5        
+ru_RU.KOI8-R     <error>           <error>           KOI8-R            
+sl_SI.ISO8859-2  <error>           <error>           ISO-8859-2        
+sv_SE            <error>           <error>           ISO-8859-1        
+sv_SE.ISO8859-1  <error>           <error>           ISO-8859-1        
+sv_SE.ISO8859-15  <error>           <error>           ISO-8859-15       
+uk_UA.KOI8-U     <error>           <error>           KOI8-U            
+zh_CN.EUC        <error>           <error>           GB2312            
+zh_TW.Big5       <error>           <error>           BIG5              
diff --git a/jni/iconv/libcharset/tools/darwin-7.5 b/jni/iconv/libcharset/tools/darwin-7.5
new file mode 100644
index 0000000..fdd6217
--- /dev/null
+++ b/jni/iconv/libcharset/tools/darwin-7.5
@@ -0,0 +1,181 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                <error>           US-ASCII          UTF-8             
+af_ZA            <error>                             UTF-8             
+af_ZA.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+af_ZA.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+af_ZA.UTF-8      <error>           UTF-8             UTF-8             
+bg_BG            <error>                             UTF-8             
+bg_BG.CP1251     <error>           CP1251            CP1251            
+bg_BG.UTF-8      <error>           UTF-8             UTF-8             
+ca_ES            <error>                             UTF-8             
+ca_ES.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+ca_ES.UTF-8      <error>           UTF-8             UTF-8             
+cs_CZ            <error>                             UTF-8             
+cs_CZ.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+cs_CZ.UTF-8      <error>           UTF-8             UTF-8             
+da_DK            <error>                             UTF-8             
+da_DK.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+da_DK.UTF-8      <error>           UTF-8             UTF-8             
+de_AT            <error>                             UTF-8             
+de_AT.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+de_AT.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+de_AT.UTF-8      <error>           UTF-8             UTF-8             
+de_CH            <error>                             UTF-8             
+de_CH.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+de_CH.UTF-8      <error>           UTF-8             UTF-8             
+de_DE            <error>                             UTF-8             
+de_DE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+de_DE.UTF-8      <error>           UTF-8             UTF-8             
+el_GR            <error>                             UTF-8             
+el_GR.ISO8859-7  <error>           ISO8859-7         ISO-8859-7        
+el_GR.UTF-8      <error>           UTF-8             UTF-8             
+en_AU            <error>                             UTF-8             
+en_AU.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_AU.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_AU.US-ASCII   <error>           US-ASCII          UTF-8             
+en_AU.UTF-8      <error>           UTF-8             UTF-8             
+en_CA            <error>                             UTF-8             
+en_CA.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_CA.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_CA.US-ASCII   <error>           US-ASCII          UTF-8             
+en_CA.UTF-8      <error>           UTF-8             UTF-8             
+en_GB            <error>                             UTF-8             
+en_GB.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_GB.US-ASCII   <error>           US-ASCII          UTF-8             
+en_GB.UTF-8      <error>           UTF-8             UTF-8             
+en_NZ            <error>                             UTF-8             
+en_NZ.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_NZ.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_NZ.US-ASCII   <error>           US-ASCII          UTF-8             
+en_NZ.UTF-8      <error>           UTF-8             UTF-8             
+en_US            <error>                             UTF-8             
+en_US.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_US.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_US.US-ASCII   <error>           US-ASCII          UTF-8             
+en_US.UTF-8      <error>           UTF-8             UTF-8             
+es_ES            <error>                             UTF-8             
+es_ES.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+es_ES.UTF-8      <error>           UTF-8             UTF-8             
+et_EE            <error>                             UTF-8             
+et_EE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+et_EE.UTF-8      <error>           UTF-8             UTF-8             
+fi_FI            <error>                             UTF-8             
+fi_FI.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fi_FI.UTF-8      <error>           UTF-8             UTF-8             
+fr_BE            <error>                             UTF-8             
+fr_BE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_BE.UTF-8      <error>           UTF-8             UTF-8             
+fr_CA            <error>                             UTF-8             
+fr_CA.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_CA.UTF-8      <error>           UTF-8             UTF-8             
+fr_CH            <error>                             UTF-8             
+fr_CH.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_CH.UTF-8      <error>           UTF-8             UTF-8             
+fr_FR            <error>                             UTF-8             
+fr_FR.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_FR.UTF-8      <error>           UTF-8             UTF-8             
+hi_IN.ISCII-DEV  <error>           ISCII-DEV         UTF-8             
+hr_HR            <error>                             UTF-8             
+hr_HR.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+hr_HR.UTF-8      <error>           UTF-8             UTF-8             
+hu_HU            <error>                             UTF-8             
+hu_HU.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+hu_HU.UTF-8      <error>           UTF-8             UTF-8             
+is_IS            <error>                             UTF-8             
+is_IS.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+is_IS.UTF-8      <error>           UTF-8             UTF-8             
+it_CH            <error>                             UTF-8             
+it_CH.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+it_CH.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+it_CH.UTF-8      <error>           UTF-8             UTF-8             
+it_IT            <error>                             UTF-8             
+it_IT.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+it_IT.UTF-8      <error>           UTF-8             UTF-8             
+ja_JP            <error>                             UTF-8             
+ja_JP.SJIS       <error>           SJIS              SHIFT_JIS         
+ja_JP.UTF-8      <error>           UTF-8             UTF-8             
+ja_JP.eucJP      <error>           eucJP             EUC-JP            
+ko_KR            <error>                             UTF-8             
+ko_KR.UTF-8      <error>           UTF-8             UTF-8             
+ko_KR.eucKR      <error>           eucKR             EUC-KR            
+la_LN.ISO8859-1  <error>           US-ASCII          UTF-8             
+la_LN.ISO8859-15  <error>           US-ASCII          UTF-8             
+la_LN.ISO8859-2  <error>           US-ASCII          UTF-8             
+la_LN.ISO8859-4  <error>           US-ASCII          UTF-8             
+la_LN.US-ASCII   <error>           US-ASCII          UTF-8             
+la_LN.UTF-8      <error>           US-ASCII          UTF-8             
+lt_LT            <error>                             UTF-8             
+lt_LT.ISO8859-13  <error>           ISO8859-13        ISO-8859-13       
+lt_LT.ISO8859-4  <error>           ISO8859-4         ISO-8859-4        
+lt_LT.UTF-8      <error>           UTF-8             UTF-8             
+nl_BE            <error>                             UTF-8             
+nl_BE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+nl_BE.UTF-8      <error>           UTF-8             UTF-8             
+nl_NL            <error>                             UTF-8             
+nl_NL.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+nl_NL.UTF-8      <error>           UTF-8             UTF-8             
+no_NO            <error>                             UTF-8             
+no_NO.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+no_NO.UTF-8      <error>           UTF-8             UTF-8             
+pl_PL            <error>                             UTF-8             
+pl_PL.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+pl_PL.UTF-8      <error>           UTF-8             UTF-8             
+pt_BR            <error>                             UTF-8             
+pt_BR.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+pt_BR.UTF-8      <error>           UTF-8             UTF-8             
+pt_PT            <error>                             UTF-8             
+pt_PT.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+pt_PT.UTF-8      <error>           UTF-8             UTF-8             
+ro_RO            <error>                             UTF-8             
+ro_RO.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+ro_RO.UTF-8      <error>           UTF-8             UTF-8             
+ru_RU            <error>                             UTF-8             
+ru_RU.CP866      <error>           CP866             CP866             
+ru_RU.ISO8859-5  <error>           ISO8859-5         ISO-8859-5        
+ru_RU.KOI8-R     <error>           KOI8-R            KOI8-R            
+ru_RU.UTF-8      <error>           UTF-8             UTF-8             
+sk_SK            <error>                             UTF-8             
+sk_SK.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+sk_SK.UTF-8      <error>           UTF-8             UTF-8             
+sl_SI            <error>                             UTF-8             
+sl_SI.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+sl_SI.UTF-8      <error>           UTF-8             UTF-8             
+sr_YU            <error>                             UTF-8             
+sr_YU.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+sr_YU.ISO8859-5  <error>           ISO8859-5         ISO-8859-5        
+sr_YU.UTF-8      <error>           UTF-8             UTF-8             
+sv_SE            <error>                             UTF-8             
+sv_SE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+sv_SE.UTF-8      <error>           UTF-8             UTF-8             
+tr_TR            <error>                             UTF-8             
+tr_TR.ISO8859-9  <error>           ISO8859-9         ISO-8859-9        
+tr_TR.UTF-8      <error>           UTF-8             UTF-8             
+uk_UA            <error>                             UTF-8             
+uk_UA.ISO8859-5  <error>           ISO8859-5         ISO-8859-5        
+uk_UA.KOI8-U     <error>           KOI8-U            KOI8-U            
+uk_UA.UTF-8      <error>           UTF-8             UTF-8             
+zh_CN            <error>                             UTF-8             
+zh_CN.UTF-8      <error>           UTF-8             UTF-8             
+zh_CN.eucCN      <error>           eucCN             GB2312            
+zh_TW            <error>                             UTF-8             
+zh_TW.Big5       <error>           Big5              BIG5              
+zh_TW.UTF-8      <error>           UTF-8             UTF-8             
diff --git a/jni/iconv/libcharset/tools/darwin-9.5 b/jni/iconv/libcharset/tools/darwin-9.5
new file mode 100644
index 0000000..04cae50
--- /dev/null
+++ b/jni/iconv/libcharset/tools/darwin-9.5
@@ -0,0 +1,205 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                                  US-ASCII          UTF-8             
+POSIX                              US-ASCII          UTF-8             
+af_ZA                                                UTF-8             
+af_ZA.ISO8859-1                    ISO8859-1         ISO-8859-1        
+af_ZA.ISO8859-15                    ISO8859-15        ISO-8859-15       
+af_ZA.UTF-8                        UTF-8             UTF-8             
+am_ET                                                UTF-8             
+am_ET.UTF-8                        UTF-8             UTF-8             
+be_BY                                                UTF-8             
+be_BY.CP1131                       CP1131            CP1131            
+be_BY.CP1251                       CP1251            CP1251            
+be_BY.ISO8859-5                    ISO8859-5         ISO-8859-5        
+be_BY.UTF-8                        UTF-8             UTF-8             
+bg_BG                                                UTF-8             
+bg_BG.CP1251                       CP1251            CP1251            
+bg_BG.UTF-8                        UTF-8             UTF-8             
+ca_ES                                                UTF-8             
+ca_ES.ISO8859-1                    ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-15                    ISO8859-15        ISO-8859-15       
+ca_ES.UTF-8                        UTF-8             UTF-8             
+cs_CZ                                                UTF-8             
+cs_CZ.ISO8859-2                    ISO8859-2         ISO-8859-2        
+cs_CZ.UTF-8                        UTF-8             UTF-8             
+da_DK                                                UTF-8             
+da_DK.ISO8859-1                    ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-15                    ISO8859-15        ISO-8859-15       
+da_DK.UTF-8                        UTF-8             UTF-8             
+de_AT                                                UTF-8             
+de_AT.ISO8859-1                    ISO8859-1         ISO-8859-1        
+de_AT.ISO8859-15                    ISO8859-15        ISO-8859-15       
+de_AT.UTF-8                        UTF-8             UTF-8             
+de_CH                                                UTF-8             
+de_CH.ISO8859-1                    ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-15                    ISO8859-15        ISO-8859-15       
+de_CH.UTF-8                        UTF-8             UTF-8             
+de_DE                                                UTF-8             
+de_DE.ISO8859-1                    ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-15                    ISO8859-15        ISO-8859-15       
+de_DE.UTF-8                        UTF-8             UTF-8             
+el_GR                                                UTF-8             
+el_GR.ISO8859-7                    ISO8859-7         ISO-8859-7        
+el_GR.UTF-8                        UTF-8             UTF-8             
+en_AU                                                UTF-8             
+en_AU.ISO8859-1                    ISO8859-1         ISO-8859-1        
+en_AU.ISO8859-15                    ISO8859-15        ISO-8859-15       
+en_AU.US-ASCII                     US-ASCII          UTF-8             
+en_AU.UTF-8                        UTF-8             UTF-8             
+en_CA                                                UTF-8             
+en_CA.ISO8859-1                    ISO8859-1         ISO-8859-1        
+en_CA.ISO8859-15                    ISO8859-15        ISO-8859-15       
+en_CA.US-ASCII                     US-ASCII          UTF-8             
+en_CA.UTF-8                        UTF-8             UTF-8             
+en_GB                                                UTF-8             
+en_GB.ISO8859-1                    ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-15                    ISO8859-15        ISO-8859-15       
+en_GB.US-ASCII                     US-ASCII          UTF-8             
+en_GB.UTF-8                        UTF-8             UTF-8             
+en_IE                                                UTF-8             
+en_IE.UTF-8                        UTF-8             UTF-8             
+en_NZ                                                UTF-8             
+en_NZ.ISO8859-1                    ISO8859-1         ISO-8859-1        
+en_NZ.ISO8859-15                    ISO8859-15        ISO-8859-15       
+en_NZ.US-ASCII                     US-ASCII          UTF-8             
+en_NZ.UTF-8                        UTF-8             UTF-8             
+en_US                                                UTF-8             
+en_US.ISO8859-1                    ISO8859-1         ISO-8859-1        
+en_US.ISO8859-15                    ISO8859-15        ISO-8859-15       
+en_US.US-ASCII                     US-ASCII          UTF-8             
+en_US.UTF-8                        UTF-8             UTF-8             
+es_ES                                                UTF-8             
+es_ES.ISO8859-1                    ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-15                    ISO8859-15        ISO-8859-15       
+es_ES.UTF-8                        UTF-8             UTF-8             
+et_EE                                                UTF-8             
+et_EE.ISO8859-15                    ISO8859-15        ISO-8859-15       
+et_EE.UTF-8                        UTF-8             UTF-8             
+eu_ES                                                UTF-8             
+eu_ES.ISO8859-1                    ISO8859-1         ISO-8859-1        
+eu_ES.ISO8859-15                    ISO8859-15        ISO-8859-15       
+eu_ES.UTF-8                        UTF-8             UTF-8             
+fi_FI                                                UTF-8             
+fi_FI.ISO8859-1                    ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-15                    ISO8859-15        ISO-8859-15       
+fi_FI.UTF-8                        UTF-8             UTF-8             
+fr_BE                                                UTF-8             
+fr_BE.ISO8859-1                    ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-15                    ISO8859-15        ISO-8859-15       
+fr_BE.UTF-8                        UTF-8             UTF-8             
+fr_CA                                                UTF-8             
+fr_CA.ISO8859-1                    ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-15                    ISO8859-15        ISO-8859-15       
+fr_CA.UTF-8                        UTF-8             UTF-8             
+fr_CH                                                UTF-8             
+fr_CH.ISO8859-1                    ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-15                    ISO8859-15        ISO-8859-15       
+fr_CH.UTF-8                        UTF-8             UTF-8             
+fr_FR                                                UTF-8             
+fr_FR.ISO8859-1                    ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-15                    ISO8859-15        ISO-8859-15       
+fr_FR.UTF-8                        UTF-8             UTF-8             
+he_IL                                                UTF-8             
+he_IL.UTF-8                        UTF-8             UTF-8             
+hi_IN.ISCII-DEV                    ISCII-DEV         UTF-8             
+hr_HR                                                UTF-8             
+hr_HR.ISO8859-2                    ISO8859-2         ISO-8859-2        
+hr_HR.UTF-8                        UTF-8             UTF-8             
+hu_HU                                                UTF-8             
+hu_HU.ISO8859-2                    ISO8859-2         ISO-8859-2        
+hu_HU.UTF-8                        UTF-8             UTF-8             
+hy_AM                                                UTF-8             
+hy_AM.ARMSCII-8                    ARMSCII-8         ARMSCII-8         
+hy_AM.UTF-8                        UTF-8             UTF-8             
+is_IS                                                UTF-8             
+is_IS.ISO8859-1                    ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-15                    ISO8859-15        ISO-8859-15       
+is_IS.UTF-8                        UTF-8             UTF-8             
+it_CH                                                UTF-8             
+it_CH.ISO8859-1                    ISO8859-1         ISO-8859-1        
+it_CH.ISO8859-15                    ISO8859-15        ISO-8859-15       
+it_CH.UTF-8                        UTF-8             UTF-8             
+it_IT                                                UTF-8             
+it_IT.ISO8859-1                    ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-15                    ISO8859-15        ISO-8859-15       
+it_IT.UTF-8                        UTF-8             UTF-8             
+ja_JP                                                UTF-8             
+ja_JP.SJIS                         SJIS              SHIFT_JIS         
+ja_JP.UTF-8                        UTF-8             UTF-8             
+ja_JP.eucJP                        eucJP             EUC-JP            
+kk_KZ                                                UTF-8             
+kk_KZ.PT154                        PT154             PT154             
+kk_KZ.UTF-8                        UTF-8             UTF-8             
+ko_KR                                                UTF-8             
+ko_KR.CP949                        CP949             CP949             
+ko_KR.UTF-8                        UTF-8             UTF-8             
+ko_KR.eucKR                        eucKR             EUC-KR            
+lt_LT                                                UTF-8             
+lt_LT.ISO8859-13                    ISO8859-13        ISO-8859-13       
+lt_LT.ISO8859-4                    ISO8859-4         ISO-8859-4        
+lt_LT.UTF-8                        UTF-8             UTF-8             
+nl_BE                                                UTF-8             
+nl_BE.ISO8859-1                    ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-15                    ISO8859-15        ISO-8859-15       
+nl_BE.UTF-8                        UTF-8             UTF-8             
+nl_NL                                                UTF-8             
+nl_NL.ISO8859-1                    ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-15                    ISO8859-15        ISO-8859-15       
+nl_NL.UTF-8                        UTF-8             UTF-8             
+no_NO                                                UTF-8             
+no_NO.ISO8859-1                    ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-15                    ISO8859-15        ISO-8859-15       
+no_NO.UTF-8                        UTF-8             UTF-8             
+pl_PL                                                UTF-8             
+pl_PL.ISO8859-2                    ISO8859-2         ISO-8859-2        
+pl_PL.UTF-8                        UTF-8             UTF-8             
+pt_BR                                                UTF-8             
+pt_BR.ISO8859-1                    ISO8859-1         ISO-8859-1        
+pt_BR.UTF-8                        UTF-8             UTF-8             
+pt_PT                                                UTF-8             
+pt_PT.ISO8859-1                    ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-15                    ISO8859-15        ISO-8859-15       
+pt_PT.UTF-8                        UTF-8             UTF-8             
+ro_RO                                                UTF-8             
+ro_RO.ISO8859-2                    ISO8859-2         ISO-8859-2        
+ro_RO.UTF-8                        UTF-8             UTF-8             
+ru_RU                                                UTF-8             
+ru_RU.CP1251                       CP1251            CP1251            
+ru_RU.CP866                        CP866             CP866             
+ru_RU.ISO8859-5                    ISO8859-5         ISO-8859-5        
+ru_RU.KOI8-R                       KOI8-R            KOI8-R            
+ru_RU.UTF-8                        UTF-8             UTF-8             
+sk_SK                                                UTF-8             
+sk_SK.ISO8859-2                    ISO8859-2         ISO-8859-2        
+sk_SK.UTF-8                        UTF-8             UTF-8             
+sl_SI                                                UTF-8             
+sl_SI.ISO8859-2                    ISO8859-2         ISO-8859-2        
+sl_SI.UTF-8                        UTF-8             UTF-8             
+sr_YU                                                UTF-8             
+sr_YU.ISO8859-2                    ISO8859-2         ISO-8859-2        
+sr_YU.ISO8859-5                    ISO8859-5         ISO-8859-5        
+sr_YU.UTF-8                        UTF-8             UTF-8             
+sv_SE                                                UTF-8             
+sv_SE.ISO8859-1                    ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-15                    ISO8859-15        ISO-8859-15       
+sv_SE.UTF-8                        UTF-8             UTF-8             
+tr_TR                                                UTF-8             
+tr_TR.ISO8859-9                    ISO8859-9         ISO-8859-9        
+tr_TR.UTF-8                        UTF-8             UTF-8             
+uk_UA                                                UTF-8             
+uk_UA.ISO8859-5                    ISO8859-5         ISO-8859-5        
+uk_UA.KOI8-U                       KOI8-U            KOI8-U            
+uk_UA.UTF-8                        UTF-8             UTF-8             
+zh_CN                                                UTF-8             
+zh_CN.GB18030                      GB18030           GB18030           
+zh_CN.GB2312                       GB2312            GB2312            
+zh_CN.GBK                          GBK               GBK               
+zh_CN.UTF-8                        UTF-8             UTF-8             
+zh_CN.eucCN                        eucCN             GB2312            
+zh_HK                                                UTF-8             
+zh_HK.Big5HKSCS                    Big5HKSCS         BIG5-HKSCS        
+zh_HK.UTF-8                        UTF-8             UTF-8             
+zh_TW                                                UTF-8             
+zh_TW.Big5                         Big5              BIG5              
+zh_TW.UTF-8                        UTF-8             UTF-8             
diff --git a/jni/iconv/libcharset/tools/freebsd-3.3 b/jni/iconv/libcharset/tools/freebsd-3.3
new file mode 100644
index 0000000..2145a50
--- /dev/null
+++ b/jni/iconv/libcharset/tools/freebsd-3.3
@@ -0,0 +1,66 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+ASCII            <error>           <error>           ASCII             
+US-ASCII         <error>           <error>           ASCII             
+da_DK.DIS_8859-15  <error>           <error>           ISO-8859-15       
+da_DK.ISO_8859-1  <error>           <error>           ISO-8859-1        
+de_AT.DIS_8859-15  <error>           <error>           ISO-8859-15       
+de_AT.ISO_8859-1  <error>           <error>           ISO-8859-1        
+de_CH.DIS_8859-15  <error>           <error>           ISO-8859-15       
+de_CH.ISO_8859-1  <error>           <error>           ISO-8859-1        
+de_DE.DIS_8859-15  <error>           <error>           ISO-8859-15       
+de_DE.ISO_8859-1  <error>           <error>           ISO-8859-1        
+en_AU.DIS_8859-15  <error>           <error>           ISO-8859-15       
+en_AU.ISO_8859-1  <error>           <error>           ISO-8859-1        
+en_CA.DIS_8859-15  <error>           <error>           ISO-8859-15       
+en_CA.ISO_8859-1  <error>           <error>           ISO-8859-1        
+en_GB.DIS_8859-15  <error>           <error>           ISO-8859-15       
+en_GB.ISO_8859-1  <error>           <error>           ISO-8859-1        
+en_US.DIS_8859-15  <error>           <error>           ISO-8859-15       
+en_US.ISO_8859-1  <error>           <error>           ISO-8859-1        
+es_ES.DIS_8859-15  <error>           <error>           ISO-8859-15       
+es_ES.ISO_8859-1  <error>           <error>           ISO-8859-1        
+fi_FI.DIS_8859-15  <error>           <error>           ISO-8859-15       
+fi_FI.ISO_8859-1  <error>           <error>           ISO-8859-1        
+fr_BE.DIS_8859-15  <error>           <error>           ISO-8859-15       
+fr_BE.ISO_8859-1  <error>           <error>           ISO-8859-1        
+fr_CA.DIS_8859-15  <error>           <error>           ISO-8859-15       
+fr_CA.ISO_8859-1  <error>           <error>           ISO-8859-1        
+fr_CH.DIS_8859-15  <error>           <error>           ISO-8859-15       
+fr_CH.ISO_8859-1  <error>           <error>           ISO-8859-1        
+fr_FR.DIS_8859-15  <error>           <error>           ISO-8859-15       
+fr_FR.ISO_8859-1  <error>           <error>           ISO-8859-1        
+hr_HR.ISO_8859-2  <error>           <error>           ISO-8859-2        
+hu_HU.ISO_8859-2  <error>           <error>           ISO-8859-2        
+is_IS.DIS_8859-15  <error>           <error>           ISO-8859-15       
+is_IS.ISO_8859-1  <error>           <error>           ISO-8859-1        
+it_CH.DIS_8859-15  <error>           <error>           ISO-8859-15       
+it_CH.ISO_8859-1  <error>           <error>           ISO-8859-1        
+it_IT.DIS_8859-15  <error>           <error>           ISO-8859-15       
+it_IT.ISO_8859-1  <error>           <error>           ISO-8859-1        
+ja_JP.EUC        <error>           <error>           ASCII             
+ja_JP.SJIS       <error>           <error>           ASCII             
+ja_JP.Shift_JIS  <error>           <error>           ASCII             
+ko_KR.EUC        <error>           <error>           ASCII             
+lt_LN.ASCII      <error>           <error>           ASCII             
+lt_LN.DIS_8859-15  <error>           <error>           ISO-8859-15       
+lt_LN.ISO_8859-1  <error>           <error>           ISO-8859-1        
+lt_LN.ISO_8859-2  <error>           <error>           ISO-8859-2        
+nl_BE.DIS_8859-15  <error>           <error>           ISO-8859-15       
+nl_BE.ISO_8859-1  <error>           <error>           ISO-8859-1        
+nl_NL.DIS_8859-15  <error>           <error>           ISO-8859-15       
+nl_NL.ISO_8859-1  <error>           <error>           ISO-8859-1        
+no_NO.DIS_8859-15  <error>           <error>           ISO-8859-15       
+no_NO.ISO_8859-1  <error>           <error>           ISO-8859-1        
+pl_PL.ISO_8859-2  <error>           <error>           ISO-8859-2        
+pt_PT.DIS_8859-15  <error>           <error>           ISO-8859-15       
+pt_PT.ISO_8859-1  <error>           <error>           ISO-8859-1        
+ru_RU.CP866      <error>           <error>           CP866             
+ru_RU.KOI8-R     <error>           <error>           KOI8-R            
+ru_SU.CP866      <error>           <error>           CP866             
+ru_SU.KOI8-R     <error>           <error>           KOI8-R            
+sl_SI.ISO_8859-2  <error>           <error>           ISO-8859-2        
+sv_SE.DIS_8859-15  <error>           <error>           ISO-8859-15       
+sv_SE.ISO_8859-1  <error>           <error>           ISO-8859-1        
+zh_CN.EUC        <error>           <error>           ASCII             
+zh_TW.Big5       <error>           <error>           ASCII             
diff --git a/jni/iconv/libcharset/tools/glibc-2.1.3 b/jni/iconv/libcharset/tools/glibc-2.1.3
new file mode 100644
index 0000000..617f7ff
--- /dev/null
+++ b/jni/iconv/libcharset/tools/glibc-2.1.3
@@ -0,0 +1,122 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+ca               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+ca_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+croatian         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+cs               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+cs_CZ            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+czech            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+da               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+da_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+danish           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+dansk            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+de_AT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_DE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_DE.UTF-8      UTF-8             UTF-8             UTF-8             
+de_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+deutsch          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+dutch            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+el               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+el_GR            ISO-8859-7        ISO-8859-7        ISO-8859-7        
+en               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+en_AU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_IE            ISO-8859-1        ANSI_X3.4-1968    ISO-8859-1        
+en_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+es_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+et               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+et_EE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+eu               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+eu_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fi               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+fi_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+finnish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fo_FO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+fran�ais         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_CH            ISO-8859-1        ANSI_X3.4-1968    ISO-8859-1        
+french           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_FR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ga               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+ga_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+german           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+greek            ISO-8859-7        ISO-8859-7        ISO-8859-7        
+gr_GR            ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+hebrew           ISO-8859-8        ISO-8859-8        ISO-8859-8        
+hr               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+hr_HR            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hrvatski         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hu               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+hu_HU            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hungarian        ISO-8859-2        ISO-8859-2        ISO-8859-2        
+icelandic        ISO-8859-1        ISO-8859-1        ISO-8859-1        
+id               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+in_ID            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+is_IS            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+it               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+italian          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+it_CH            ISO-8859-1        ANSI_X3.4-1968    ISO-8859-1        
+it_IT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+iw_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        
+ja               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+japanese         ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+japanese.euc     ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+kl_GL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ko               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+lt_LT            BALTIC            ISO-8859-13       ISO-8859-13       
+lv_LV            BALTIC            ISO-8859-13       ISO-8859-13       
+nl               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+nl_BE            ISO-8859-1        ANSI_X3.4-1968    ISO-8859-1        
+nl_NL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+no               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+no_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+no@nynorsk       ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+norwegian        ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pl               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+pl_PL            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+polish           ISO-8859-2        ISO-8859-2        ISO-8859-2        
+portuguese       ISO-8859-1        ISO-8859-1        ISO-8859-1        
+POSIX            ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+pt               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+pt_BR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pt_PT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ro               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+romanian         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+ro_RO            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+ru               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+ru_RU            ISO-8859-5        ISO-8859-5        ISO-8859-5        
+ru_RU.KOI8-R     KOI8-R            KOI8-R            KOI8-R            
+russian          ISO-8859-5        ISO-8859-5        ISO-8859-5        
+ru_UA            KOI8-U            KOI8-U            KOI8-U            
+sk               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+sk_SK            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sl               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+slovak           ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovene          ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovenian        ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sl_SI            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+spanish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sr               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+sr_YU            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sv               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+sv_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sv_SE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+swedish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+tr               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+tr_TR            ISO-8859-9        ISO-8859-9        ISO-8859-9        
+turkish          ISO-8859-9        ISO-8859-9        ISO-8859-9        
+uk               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+uk_UA            KOI8-U            KOI8-U            KOI8-U            
+wa               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+zh               ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+zh_TW.Big5       ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
diff --git a/jni/iconv/libcharset/tools/glibc-2.1.90 b/jni/iconv/libcharset/tools/glibc-2.1.90
new file mode 100644
index 0000000..e662b36
--- /dev/null
+++ b/jni/iconv/libcharset/tools/glibc-2.1.90
@@ -0,0 +1,100 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+af_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ar_SA            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+bg_BG            CP1251            CP1251            CP1251            
+C                ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+ca_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+catalan          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+croatian         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+cs_CZ            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+czech            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+da_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+danish           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+dansk            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de               ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+de_AT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_DE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_DE.utf8       UTF-8             UTF-8             UTF-8             
+de_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+deutsch          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+dutch            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+eesti            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+el_GR            ISO-8859-7        ISO-8859-7        ISO-8859-7        
+en_AU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+estonian         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+et_EE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+eu_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fi_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+finnish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fo_FO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr               ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+fran�ais         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+french           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_FR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ga_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+galego           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+galician         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+german           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+gl_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+greek            ISO-8859-7        ISO-8859-7        ISO-8859-7        
+gv_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+hebrew           ISO-8859-8        ISO-8859-8        ISO-8859-8        
+hr_HR            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hrvatski         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hu_HU            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hungarian        ISO-8859-2        ISO-8859-2        ISO-8859-2        
+icelandic        ISO-8859-1        ISO-8859-1        ISO-8859-1        
+in_ID            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+is_IS            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+italian          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+it_IT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+iw_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        
+japanese         ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+japanese.euc     ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+kl_GL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+kw_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+lithuanian       ISO-8859-13       ISO-8859-13       ISO-8859-13       
+lt_LT            ISO-8859-13       ISO-8859-13       ISO-8859-13       
+lv_LV            ISO-8859-13       ISO-8859-13       ISO-8859-13       
+mk_MK            ISO-8859-5        ISO-8859-5        ISO-8859-5        
+nl               ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+nl_NL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+no_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+norwegian        ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pl_PL            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+polish           ISO-8859-2        ISO-8859-2        ISO-8859-2        
+portuguese       ISO-8859-1        ISO-8859-1        ISO-8859-1        
+POSIX            ANSI_X3.4-1968    ANSI_X3.4-1968    ASCII             
+pt_BR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pt_PT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+romanian         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+ro_RO            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+ru_RU            ISO-8859-5        ISO-8859-5        ISO-8859-5        
+ru_RU.KOI8-R     KOI8-R            KOI8-R            KOI8-R            
+russian          ISO-8859-5        ISO-8859-5        ISO-8859-5        
+ru_UA            KOI8-U            KOI8-U            KOI8-U            
+sk_SK            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovak           ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovene          ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovenian        ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sl_SI            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+spanish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sr_YU            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sv_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sv_SE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+swedish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+tr_TR            ISO-8859-9        ISO-8859-9        ISO-8859-9        
+turkish          ISO-8859-9        ISO-8859-9        ISO-8859-9        
+uk_UA            KOI8-U            KOI8-U            KOI8-U            
+uk_UA.utf8       UTF-8             UTF-8             UTF-8             
diff --git a/jni/iconv/libcharset/tools/glibc-2.2 b/jni/iconv/libcharset/tools/glibc-2.2
new file mode 100644
index 0000000..d7d56da
--- /dev/null
+++ b/jni/iconv/libcharset/tools/glibc-2.2
@@ -0,0 +1,186 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+af_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ar_AE            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_BH            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_DZ            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_EG            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_IQ            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_JO            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_KW            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_LB            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_LY            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_MA            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_OM            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_QA            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_SA            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_SD            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_SY            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_TN            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+ar_YE            ISO-8859-6        ISO-8859-6        ISO-8859-6        
+be_BY            CP1251            CP1251            CP1251            
+bg_BG            CP1251            CP1251            CP1251            
+bokmal           ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+bokm�l           ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+C                ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+ca_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ca_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+catalan          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+croatian         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+cs_CZ            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+czech            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+da_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+danish           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+dansk            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_AT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_AT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+de_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+de_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_DE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_DE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+de_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+de_LU@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+deutsch          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+dutch            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+eesti            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+el_GR            ISO-8859-7        ISO-8859-7        ISO-8859-7        
+en_AU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_BW            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_IE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+en_NZ            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+en_ZW            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_AR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_BO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_CL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_CO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_CR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_DO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_EC            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+es_GT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_HN            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_MX            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_NI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_PA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_PE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_PR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_PY            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_SV            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+estonian         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_UY            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+es_VE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+et_EE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+eu_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+eu_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+fa_IR            UTF-8             UTF-8             UTF-8             
+fi_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fi_FI@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+finnish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fo_FO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fran�ais         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+fr_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+french           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_FR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_FR@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+fr_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+fr_LU@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+ga_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ga_IE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+galego           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+galician         ISO-8859-1        ISO-8859-1        ISO-8859-1        
+german           ISO-8859-1        ISO-8859-1        ISO-8859-1        
+gl_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+gl_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+greek            ISO-8859-7        ISO-8859-7        ISO-8859-7        
+gv_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+hebrew           ISO-8859-8        ISO-8859-8        ISO-8859-8        
+he_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        
+hi_IN            UTF-8             UTF-8             UTF-8             
+hr_HR            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hrvatski         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hu_HU            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+hungarian        ISO-8859-2        ISO-8859-2        ISO-8859-2        
+icelandic        ISO-8859-1        ISO-8859-1        ISO-8859-1        
+id_ID            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+is_IS            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+italian          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+it_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+it_IT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+it_IT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+iw_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        
+ja_JP            EUC-JP            EUC-JP            EUC-JP            
+ja_JP.eucjp      EUC-JP            EUC-JP            EUC-JP            
+ja_JP.ujis       EUC-JP            EUC-JP            EUC-JP            
+japanese         EUC-JP            EUC-JP            EUC-JP            
+japanese.euc     EUC-JP            EUC-JP            EUC-JP            
+japanese.sjis    ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+kl_GL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+ko_KR            EUC-KR            EUC-KR            EUC-KR            
+ko_KR.euckr      EUC-KR            EUC-KR            EUC-KR            
+ko_KR.utf8       UTF-8             UTF-8             UTF-8             
+korean           EUC-KR            EUC-KR            EUC-KR            
+korean.euc       EUC-KR            EUC-KR            EUC-KR            
+kw_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+lithuanian       ISO-8859-13       ISO-8859-13       ISO-8859-13       
+lt_LT            ISO-8859-13       ISO-8859-13       ISO-8859-13       
+lv_LV            ISO-8859-13       ISO-8859-13       ISO-8859-13       
+mk_MK            ISO-8859-5        ISO-8859-5        ISO-8859-5        
+mr_IN            UTF-8             UTF-8             UTF-8             
+mt_MT            ISO-8859-3        ISO-8859-3        ISO-8859-3        
+nb_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+nl_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+nl_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+nl_NL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+nl_NL@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+nn_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+no_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+norwegian        ISO-8859-1        ISO-8859-1        ISO-8859-1        
+nynorsk          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pl_PL            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+polish           ISO-8859-2        ISO-8859-2        ISO-8859-2        
+portuguese       ISO-8859-1        ISO-8859-1        ISO-8859-1        
+POSIX            ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    
+pt_BR            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pt_PT            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+pt_PT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+romanian         ISO-8859-2        ISO-8859-2        ISO-8859-2        
+ro_RO            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+ru_RU            ISO-8859-5        ISO-8859-5        ISO-8859-5        
+ru_RU.koi8r      KOI8-R            KOI8-R            KOI8-R            
+russian          ISO-8859-5        ISO-8859-5        ISO-8859-5        
+ru_UA            KOI8-U            KOI8-U            KOI8-U            
+sk_SK            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovak           ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovene          ISO-8859-2        ISO-8859-2        ISO-8859-2        
+slovenian        ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sl_SI            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+spanish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sq_AL            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sr_YU            ISO-8859-2        ISO-8859-2        ISO-8859-2        
+sr_YU@cyrillic   ISO-8859-5        ISO-8859-5        ISO-8859-5        
+sv_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+sv_FI@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       
+sv_SE            ISO-8859-1        ISO-8859-1        ISO-8859-1        
+swedish          ISO-8859-1        ISO-8859-1        ISO-8859-1        
+th_TH            TIS-620           TIS-620           TIS-620           
+tr_TR            ISO-8859-9        ISO-8859-9        ISO-8859-9        
+turkish          ISO-8859-9        ISO-8859-9        ISO-8859-9        
+uk_UA            KOI8-U            KOI8-U            KOI8-U            
+vi_VN            UTF-8             UTF-8             UTF-8             
+zh_CN            GB2312            GB2312            GB2312            
+zh_CN.gb18030    GB18030           GB18030           GB18030           
+zh_HK            BIG5HKSCS         BIG5HKSCS         BIG5HKSCS         
+zh_TW            BIG5              BIG5              BIG5              
+zh_TW.euctw      EUC-TW            EUC-TW            EUC-TW            
diff --git a/jni/iconv/libcharset/tools/glibc-2.2-XF86-3.3.6 b/jni/iconv/libcharset/tools/glibc-2.2-XF86-3.3.6
new file mode 100644
index 0000000..96fc675
--- /dev/null
+++ b/jni/iconv/libcharset/tools/glibc-2.2-XF86-3.3.6
@@ -0,0 +1,187 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset()  X11 encoding     
+
+af_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+ar_AE            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_BH            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_DZ            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_EG            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_IQ            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_JO            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_KW            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_LB            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_LY            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_MA            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_OM            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_QA            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_SA            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_SD            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_SY            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_TN            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_YE            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+be_BY            CP1251            CP1251            CP1251            <error>          
+bg_BG            CP1251            CP1251            CP1251            ISO8859-5        
+bokmal           ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+bokm�l           ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+C                ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+ca_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+ca_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+catalan          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+croatian         ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+cs_CZ            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+czech            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+da_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+danish           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+dansk            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+de_AT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+de_AT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+de_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+de_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+de_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+de_DE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+de_DE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+de_DE.utf8       UTF-8             UTF-8             UTF-8             <error>          
+de_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+de_LU@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+deutsch          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+dutch            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+eesti            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+el_GR            ISO-8859-7        ISO-8859-7        ISO-8859-7        ISO8859-7        
+en_AU            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_BW            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+en_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+en_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_IE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+en_NZ            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+en_ZW            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_AR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_BO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_CL            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_CO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_CR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_DO            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_EC            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+es_GT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_HN            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_MX            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_NI            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_PA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_PE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_PR            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_PY            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_SV            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+estonian         ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_UY            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_VE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+et_EE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-4        
+eu_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+eu_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+fa_IR            UTF-8             UTF-8             UTF-8             <error>          
+fi_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fi_FI@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+finnish          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fo_FO            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fran�ais         ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fr_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fr_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+fr_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fr_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+french           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fr_FR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fr_FR@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+fr_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fr_LU@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+ga_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+ga_IE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+galego           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+galician         ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+german           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+gl_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+gl_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+greek            ISO-8859-7        ISO-8859-7        ISO-8859-7        <error>          
+gv_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+hebrew           ISO-8859-8        ISO-8859-8        ISO-8859-8        <error>          
+he_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        <error>          
+hi_IN            UTF-8             UTF-8             UTF-8             <error>          
+hr_HR            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+hrvatski         ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+hu_HU            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+hungarian        ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+icelandic        ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+id_ID            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+is_IS            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+italian          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+it_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+it_IT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+it_IT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+iw_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        ISO8859-8        
+ja_JP            EUC-JP            EUC-JP            EUC-JP            ja.euc           
+ja_JP.eucjp      EUC-JP            EUC-JP            EUC-JP            <error>          
+ja_JP.ujis       EUC-JP            EUC-JP            EUC-JP            ja.euc           
+japanese         EUC-JP            EUC-JP            EUC-JP            ja.sjis          
+japanese.euc     EUC-JP            EUC-JP            EUC-JP            ja.euc           
+japanese.sjis    ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+kl_GL            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+ko_KR            EUC-KR            EUC-KR            EUC-KR            ko.euc           
+ko_KR.euckr      EUC-KR            EUC-KR            EUC-KR            <error>          
+ko_KR.utf8       UTF-8             UTF-8             UTF-8             <error>          
+korean           EUC-KR            EUC-KR            EUC-KR            ko.euc           
+korean.euc       EUC-KR            EUC-KR            EUC-KR            <error>          
+kw_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+lithuanian       ISO-8859-13       ISO-8859-13       ISO-8859-13       <error>          
+lt_LT            ISO-8859-13       ISO-8859-13       ISO-8859-13       <error>          
+lv_LV            ISO-8859-13       ISO-8859-13       ISO-8859-13       <error>          
+mk_MK            ISO-8859-5        ISO-8859-5        ISO-8859-5        ISO8859-5        
+mr_IN            UTF-8             UTF-8             UTF-8             <error>          
+mt_MT            ISO-8859-3        ISO-8859-3        ISO-8859-3        <error>          
+nb_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+nl_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+nl_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+nl_NL            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+nl_NL@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+nn_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+no_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+norwegian        ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+nynorsk          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+pl_PL            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+polish           ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+portuguese       ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+POSIX            ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+pt_BR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+pt_PT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+pt_PT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+romanian         ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+ro_RO            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+ru_RU            ISO-8859-5        ISO-8859-5        ISO-8859-5        ISO8859-5        
+ru_RU.koi8r      KOI8-R            KOI8-R            KOI8-R            <error>          
+russian          ISO-8859-5        ISO-8859-5        ISO-8859-5        ISO8859-5        
+ru_UA            KOI8-U            KOI8-U            KOI8-U            <error>          
+sk_SK            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+slovak           ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+slovene          ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+slovenian        ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+sl_SI            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+spanish          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+sq_AL            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+sr_YU            ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+sr_YU@cyrillic   ISO-8859-5        ISO-8859-5        ISO-8859-5        <error>          
+sv_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+sv_FI@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+sv_SE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+swedish          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+th_TH            TIS-620           TIS-620           TIS-620           <error>          
+tr_TR            ISO-8859-9        ISO-8859-9        ISO-8859-9        ISO8859-9        
+turkish          ISO-8859-9        ISO-8859-9        ISO-8859-9        <error>          
+uk_UA            KOI8-U            KOI8-U            KOI8-U            <error>          
+vi_VN            UTF-8             UTF-8             UTF-8             <error>          
+zh_CN            GB2312            GB2312            GB2312            zh.euc           
+zh_CN.gb18030    GB18030           GB18030           GB18030           <error>          
+zh_HK            BIG5HKSCS         BIG5HKSCS         BIG5HKSCS         <error>          
+zh_TW            BIG5              BIG5              BIG5              zh_TW.euc        
+zh_TW.euctw      EUC-TW            EUC-TW            EUC-TW            <error>          
diff --git a/jni/iconv/libcharset/tools/glibc-2.2-XF86-4.0.1f b/jni/iconv/libcharset/tools/glibc-2.2-XF86-4.0.1f
new file mode 100644
index 0000000..c8a85ad
--- /dev/null
+++ b/jni/iconv/libcharset/tools/glibc-2.2-XF86-4.0.1f
@@ -0,0 +1,187 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset()  X11 encoding     
+
+af_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+ar_AE            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_BH            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_DZ            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_EG            ISO-8859-6        ISO-8859-6        ISO-8859-6        ISO8859-6        
+ar_IQ            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_JO            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_KW            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_LB            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_LY            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_MA            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_OM            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_QA            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_SA            ISO-8859-6        ISO-8859-6        ISO-8859-6        ISO8859-6        
+ar_SD            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_SY            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_TN            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+ar_YE            ISO-8859-6        ISO-8859-6        ISO-8859-6        <error>          
+be_BY            CP1251            CP1251            CP1251            MICROSOFT-CP1251 
+bg_BG            CP1251            CP1251            CP1251            MICROSOFT-CP1251 
+bokmal           ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+bokm�l           ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+C                ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+ca_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+ca_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+catalan          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+croatian         ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+cs_CZ            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+czech            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+da_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+danish           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+dansk            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+de_AT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+de_AT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+de_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+de_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+de_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+de_DE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+de_DE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+de_DE.utf8       UTF-8             UTF-8             UTF-8             <error>          
+de_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+de_LU@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+deutsch          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+dutch            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+eesti            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+el_GR            ISO-8859-7        ISO-8859-7        ISO-8859-7        ISO8859-7        
+en_AU            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_BW            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+en_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_DK            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+en_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_IE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+en_NZ            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+en_ZA            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+en_ZW            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_AR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_BO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_CL            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_CO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_CR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_DO            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_EC            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+es_GT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_HN            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_MX            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_NI            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_PA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_PE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_PR            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_PY            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_SV            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+estonian         ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_US            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+es_UY            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+es_VE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+et_EE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-15       
+eu_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+eu_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+fa_IR            UTF-8             UTF-8             UTF-8             ISIRI-3342       
+fi_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-15       
+fi_FI@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+finnish          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fo_FO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fran�ais         ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fr_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fr_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+fr_CA            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fr_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+french           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fr_FR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+fr_FR@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+fr_LU            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+fr_LU@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+ga_IE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+ga_IE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+galego           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+galician         ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+german           ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+gl_ES            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+gl_ES@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+greek            ISO-8859-7        ISO-8859-7        ISO-8859-7        <error>          
+gv_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+hebrew           ISO-8859-8        ISO-8859-8        ISO-8859-8        <error>          
+he_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        ISO8859-8        
+hi_IN            UTF-8             UTF-8             UTF-8             ISCII-DEV        
+hr_HR            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+hrvatski         ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+hu_HU            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+hungarian        ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+icelandic        ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+id_ID            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+is_IS            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+italian          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+it_CH            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+it_IT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+it_IT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+iw_IL            ISO-8859-8        ISO-8859-8        ISO-8859-8        ISO8859-8        
+ja_JP            EUC-JP            EUC-JP            EUC-JP            ja.euc           
+ja_JP.eucjp      EUC-JP            EUC-JP            EUC-JP            ja.euc           
+ja_JP.ujis       EUC-JP            EUC-JP            EUC-JP            ja.euc           
+japanese         EUC-JP            EUC-JP            EUC-JP            ja.sjis          
+japanese.euc     EUC-JP            EUC-JP            EUC-JP            ja.euc           
+japanese.sjis    ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+kl_GL            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+ko_KR            EUC-KR            EUC-KR            EUC-KR            ko.euc           
+ko_KR.euckr      EUC-KR            EUC-KR            EUC-KR            ko.euc           
+ko_KR.utf8       UTF-8             UTF-8             UTF-8             UTF-8            
+korean           EUC-KR            EUC-KR            EUC-KR            ko.euc           
+korean.euc       EUC-KR            EUC-KR            EUC-KR            <error>          
+kw_GB            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+lithuanian       ISO-8859-13       ISO-8859-13       ISO-8859-13       <error>          
+lt_LT            ISO-8859-13       ISO-8859-13       ISO-8859-13       ISO8859-13       
+lv_LV            ISO-8859-13       ISO-8859-13       ISO-8859-13       ISO8859-13       
+mk_MK            ISO-8859-5        ISO-8859-5        ISO-8859-5        ISO8859-5        
+mr_IN            UTF-8             UTF-8             UTF-8             <error>          
+mt_MT            ISO-8859-3        ISO-8859-3        ISO-8859-3        <error>          
+nb_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+nl_BE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+nl_BE@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+nl_NL            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+nl_NL@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+nn_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+no_NO            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+norwegian        ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+nynorsk          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+pl_PL            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+polish           ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+portuguese       ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+POSIX            ANSI_X3.4-1968    ANSI_X3.4-1968    ANSI_X3.4-1968    STRING           
+pt_BR            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+pt_PT            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+pt_PT@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+romanian         ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+ro_RO            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+ru_RU            ISO-8859-5        ISO-8859-5        ISO-8859-5        KOI8-R           
+ru_RU.koi8r      KOI8-R            KOI8-R            KOI8-R            KOI8-R           
+russian          ISO-8859-5        ISO-8859-5        ISO-8859-5        ISO8859-5        
+ru_UA            KOI8-U            KOI8-U            KOI8-U            KOI8-U           
+sk_SK            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+slovak           ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+slovene          ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+slovenian        ISO-8859-2        ISO-8859-2        ISO-8859-2        <error>          
+sl_SI            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+spanish          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+sq_AL            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-2        
+sr_YU            ISO-8859-2        ISO-8859-2        ISO-8859-2        ISO8859-2        
+sr_YU@cyrillic   ISO-8859-5        ISO-8859-5        ISO-8859-5        <error>          
+sv_FI            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+sv_FI@euro       ISO-8859-15       ISO-8859-15       ISO-8859-15       <error>          
+sv_SE            ISO-8859-1        ISO-8859-1        ISO-8859-1        ISO8859-1        
+swedish          ISO-8859-1        ISO-8859-1        ISO-8859-1        <error>          
+th_TH            TIS-620           TIS-620           TIS-620           <error>          
+tr_TR            ISO-8859-9        ISO-8859-9        ISO-8859-9        ISO8859-9        
+turkish          ISO-8859-9        ISO-8859-9        ISO-8859-9        <error>          
+uk_UA            KOI8-U            KOI8-U            KOI8-U            KOI8-U           
+vi_VN            UTF-8             UTF-8             UTF-8             TCVN-5712        
+zh_CN            GB2312            GB2312            GB2312            zh.euc           
+zh_CN.gb18030    GB18030           GB18030           GB18030           <error>          
+zh_HK            BIG5HKSCS         BIG5HKSCS         BIG5HKSCS         <error>          
+zh_TW            BIG5              BIG5              BIG5              zh_TW.Big5       
+zh_TW.euctw      EUC-TW            EUC-TW            EUC-TW            <error>          
diff --git a/jni/iconv/libcharset/tools/hpux-10.01 b/jni/iconv/libcharset/tools/hpux-10.01
new file mode 100644
index 0000000..8e2b6c1
--- /dev/null
+++ b/jni/iconv/libcharset/tools/hpux-10.01
@@ -0,0 +1,56 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                ""                roman8            HP-ROMAN8         
+C.iso88591       "iso88591.cm"     iso88591          ISO-8859-1        
+POSIX            ""                roman8            HP-ROMAN8         
+ar_DZ.arabic8    "arabic8.cm"      arabic8           HP-ARABIC8        
+ar_SA.arabic8    "arabic8.cm"      arabic8           HP-ARABIC8        
+ar_SA.iso88596   "iso88596.cm"     iso88596          ISO-8859-6        
+bg_BG.iso88595   "iso88595.cm"     iso88595          ISO-8859-5        
+cs_CZ.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+da_DK.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+da_DK.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+de_DE.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+de_DE.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+el_GR.greek8     "./data/greek8.cm" greek8            HP-GREEK8         
+el_GR.iso88597   "./data/iso88597.cm" iso88597          ISO-8859-7        
+en_GB.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+en_GB.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+en_US.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+en_US.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+es_ES.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+es_ES.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fi_FI.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fi_FI.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fr_CA.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fr_CA.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fr_FR.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fr_FR.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+hr_HR.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+hu_HU.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+is_IS.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+is_IS.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+it_IT.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+it_IT.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+iw_IL.hebrew8    "hebrew8.cm"      hebrew8           HP-HEBREW8        
+iw_IL.iso88598   "iso88598.cm"     iso88598          ISO-8859-8        
+nl_NL.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+nl_NL.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+no_NO.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+no_NO.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+pl_PL.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+pt_PT.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+pt_PT.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+ro_RO.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+ru_RU.iso88595   "iso88595.cm"     iso88595          ISO-8859-5        
+sk_SK.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+sl_SI.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+sv_SE.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+sv_SE.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+th_TH.tis620     "tis620.cm"       tis620            TIS-620           
+tr_TR.iso88599   "iso88599.cm"     iso88599          ISO-8859-9        
+tr_TR.turkish8   "turkish8.cm"     turkish8          HP-TURKISH8       
+zh_CN.hp15CN     "./data/hp15CN.cm" hp15CN            EUC-CN            
+zh_TW.eucTW      "./data/eucTW.cm" eucTW             EUC-TW            
diff --git a/jni/iconv/libcharset/tools/hpux-10.20 b/jni/iconv/libcharset/tools/hpux-10.20
new file mode 100644
index 0000000..c91060c
--- /dev/null
+++ b/jni/iconv/libcharset/tools/hpux-10.20
@@ -0,0 +1,68 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                ""                roman8            HP-ROMAN8         
+C.iso88591       "iso88591.cm"     iso88591          ISO-8859-1        
+C.iso885915      "iso885915.cm"    iso885915         ISO-8859-15       
+C.utf8           "utf8.cm"         utf8              UTF-8             
+POSIX            ""                roman8            HP-ROMAN8         
+ar_DZ.arabic8    "arabic8.cm"      arabic8           HP-ARABIC8        
+ar_SA.arabic8    "arabic8.cm"      arabic8           HP-ARABIC8        
+ar_SA.iso88596   "iso88596.cm"     iso88596          ISO-8859-6        
+bg_BG.iso88595   "iso88595.cm"     iso88595          ISO-8859-5        
+cs_CZ.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+da_DK.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+da_DK.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+da_DK.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+de_DE.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+de_DE.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+de_DE.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+el_GR.greek8     "greek8.cm"       greek8            HP-GREEK8         
+el_GR.iso88597   "iso88597.cm"     iso88597          ISO-8859-7        
+en_GB.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+en_GB.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+en_GB.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+en_US.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+en_US.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+es_ES.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+es_ES.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+es_ES.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fi_FI.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fi_FI.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+fi_FI.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fr_CA.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fr_CA.iso885915  "iso885915.cm"    iso885915         ISO-8859-15       
+fr_CA.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fr_FR.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fr_FR.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+fr_FR.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+hr_HR.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+hu_HU.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+is_IS.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+is_IS.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+is_IS.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+it_IT.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+it_IT.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+it_IT.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+iw_IL.hebrew8    "hebrew8.cm"      hebrew8           HP-HEBREW8        
+iw_IL.iso88598   "iso88598.cm"     iso88598          ISO-8859-8        
+nl_NL.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+nl_NL.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+nl_NL.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+no_NO.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+no_NO.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+no_NO.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+pl_PL.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+pt_PT.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+pt_PT.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+pt_PT.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+ro_RO.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+ru_RU.iso88595   "iso88595.cm"     iso88595          ISO-8859-5        
+sk_SK.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+sl_SI.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+sv_SE.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+sv_SE.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+sv_SE.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+th_TH.tis620     "tis620.cm"       tis620            TIS-620           
+tr_TR.iso88599   "iso88599.cm"     iso88599          ISO-8859-9        
+tr_TR.turkish8   "turkish8.cm"     turkish8          HP-TURKISH8       
+univ.utf8        "utf8.cm"         utf8              UTF-8             
diff --git a/jni/iconv/libcharset/tools/hpux-11.00 b/jni/iconv/libcharset/tools/hpux-11.00
new file mode 100644
index 0000000..7168829
--- /dev/null
+++ b/jni/iconv/libcharset/tools/hpux-11.00
@@ -0,0 +1,78 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                ""                roman8            HP-ROMAN8         
+C.iso88591       "iso88591.cm"     iso88591          ISO-8859-1        
+C.iso885915      "iso885915.cm"    iso885915         ISO-8859-15       
+C.utf8           "utf8.cm"         utf8              UTF-8             
+POSIX            ""                roman8            HP-ROMAN8         
+ar_DZ.arabic8    "arabic8.cm"      arabic8           HP-ARABIC8        
+ar_SA.arabic8    "arabic8.cm"      arabic8           HP-ARABIC8        
+ar_SA.iso88596   "iso88596.cm"     iso88596          ISO-8859-6        
+bg_BG.iso88595   "iso88595.cm"     iso88595          ISO-8859-5        
+cs_CZ.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+da_DK.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+da_DK.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+da_DK.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+de_DE.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+de_DE.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+de_DE.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+el_GR.greek8     "greek8.cm"       greek8            HP-GREEK8         
+el_GR.iso88597   "iso88597.cm"     iso88597          ISO-8859-7        
+en_GB.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+en_GB.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+en_GB.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+en_US.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+en_US.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+es_ES.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+es_ES.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+es_ES.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fi_FI.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fi_FI.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+fi_FI.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fr_CA.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fr_CA.iso885915  "iso885915.cm"    iso885915         ISO-8859-15       
+fr_CA.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+fr_FR.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+fr_FR.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+fr_FR.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+hr_HR.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+hu_HU.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+is_IS.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+is_IS.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+is_IS.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+it_IT.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+it_IT.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+it_IT.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+iw_IL.hebrew8    "hebrew8.cm"      hebrew8           HP-HEBREW8        
+iw_IL.iso88598   "iso88598.cm"     iso88598          ISO-8859-8        
+ja_JP.SJIS       "SJIS.cm"         SJIS              SJIS              
+ja_JP.eucJP      "eucJP.cm"        eucJP             EUC-JP            
+ja_JP.kana8      "kana8.cm"        kana8             HP-KANA8          
+ko_KR.eucKR      "eucKR.cm"        eucKR             EUC-KR            
+nl_NL.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+nl_NL.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+nl_NL.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+no_NO.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+no_NO.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+no_NO.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+pl_PL.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+pt_PT.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+pt_PT.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+pt_PT.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+ro_RO.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+ru_RU.iso88595   "iso88595.cm"     iso88595          ISO-8859-5        
+sk_SK.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+sl_SI.iso88592   "iso88592.cm"     iso88592          ISO-8859-2        
+sv_SE.iso88591   "iso88591.cm"     iso88591          ISO-8859-1        
+sv_SE.iso885915@euro  "iso885915.cm"    iso885915         ISO-8859-15       
+sv_SE.roman8     "roman8.cm"       roman8            HP-ROMAN8         
+th_TH.tis620     "tis620.cm"       tis620            TIS-620           
+tr_TR.iso88599   "iso88599.cm"     iso88599          ISO-8859-9        
+tr_TR.turkish8   "turkish8.cm"     turkish8          HP-TURKISH8       
+univ.utf8        "utf8.cm"         utf8              UTF-8             
+zh_CN.hp15CN     "hp15CN.cm"       hp15CN            EUC-CN            
+zh_TW.big5       "big5.cm"         big5              BIG5              
+zh_TW.ccdc       "ccdc.cm"         ccdc              ccdc              bug
+zh_TW.eucTW      "eucTW.cm"        eucTW             EUC-TW            
diff --git a/jni/iconv/libcharset/tools/irix-6.5 b/jni/iconv/libcharset/tools/irix-6.5
new file mode 100644
index 0000000..853ec3e
--- /dev/null
+++ b/jni/iconv/libcharset/tools/irix-6.5
@@ -0,0 +1,42 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                ISO8859-1         ISO8859-1         ISO-8859-1        
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+charmap          ISO8859-1         ISO8859-1         ISO-8859-1        
+cs               ISO8859-2         ISO8859-2         ISO-8859-2        
+da               ISO8859-1         ISO8859-1         ISO-8859-1        
+de               ISO8859-1         ISO8859-1         ISO-8859-1        
+de_AT            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+el               ISO8859-7         ISO8859-7         ISO-8859-7        
+en               ISO8859-1         ISO8859-1         ISO-8859-1        
+en_AU            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_FR            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+es               ISO8859-1         ISO8859-1         ISO-8859-1        
+es_AR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_MX            ISO8859-1         ISO8859-1         ISO-8859-1        
+fi               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+hu               ISO8859-2         ISO8859-2         ISO-8859-2        
+is               ISO8859-1         ISO8859-1         ISO-8859-1        
+it               ISO8859-1         ISO8859-1         ISO-8859-1        
+it_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+ja_JP.EUC        eucJP             eucJP             EUC-JP            
+ko_KR.euc        eucKR             eucKR             EUC-KR            
+nl               ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+no               ISO8859-1         ISO8859-1         ISO-8859-1        
+pl               ISO8859-2         ISO8859-2         ISO-8859-2        
+pt               ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+ru               ISO8859-5         ISO8859-5         ISO-8859-5        
+sk               ISO8859-2         ISO8859-2         ISO-8859-2        
+sv               ISO8859-1         ISO8859-1         ISO-8859-1        
+tr               ISO8859-9         ISO8859-9         ISO-8859-9        
+zh_CN.ugb        eucCN             eucCN             EUC-CN            
+zh_TW.ucns       eucTW             eucTW             EUC-TW            
diff --git a/jni/iconv/libcharset/tools/locale_charmap b/jni/iconv/libcharset/tools/locale_charmap
new file mode 100755
index 0000000..a9a8318
--- /dev/null
+++ b/jni/iconv/libcharset/tools/locale_charmap
@@ -0,0 +1,4 @@
+#! /bin/sh
+# Prints the system dependent name for the current locale's charmap.
+
+locale charmap
diff --git a/jni/iconv/libcharset/tools/locale_charset.c b/jni/iconv/libcharset/tools/locale_charset.c
new file mode 100644
index 0000000..f6b4a4f
--- /dev/null
+++ b/jni/iconv/libcharset/tools/locale_charset.c
@@ -0,0 +1,13 @@
+/* Prints the portable name for the current locale's charset. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include "localcharset.h"
+
+int main ()
+{
+  setlocale(LC_ALL, "");
+  printf("%s\n", locale_charset());
+  exit(0);
+}
diff --git a/jni/iconv/libcharset/tools/locale_codeset.c b/jni/iconv/libcharset/tools/locale_codeset.c
new file mode 100644
index 0000000..a9c209d
--- /dev/null
+++ b/jni/iconv/libcharset/tools/locale_codeset.c
@@ -0,0 +1,15 @@
+/* Prints the system dependent name for the current locale's codeset. */
+
+#define _XOPEN_SOURCE 500  /* Needed on AIX 3.2.5 */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <langinfo.h>
+
+int main ()
+{
+  setlocale(LC_ALL, "");
+  printf("%s\n", nl_langinfo(CODESET));
+  exit(0);
+}
diff --git a/jni/iconv/libcharset/tools/locale_monthnames.c b/jni/iconv/libcharset/tools/locale_monthnames.c
new file mode 100644
index 0000000..f109587
--- /dev/null
+++ b/jni/iconv/libcharset/tools/locale_monthnames.c
@@ -0,0 +1,26 @@
+/* Prints the system dependent names for the 12 months in the current locale. */
+
+#define _XOPEN_SOURCE 500  /* Needed on AIX 3.2.5 */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <langinfo.h>
+
+int main ()
+{
+  setlocale(LC_ALL, "");
+  printf("%s\n", nl_langinfo(MON_1));
+  printf("%s\n", nl_langinfo(MON_2));
+  printf("%s\n", nl_langinfo(MON_3));
+  printf("%s\n", nl_langinfo(MON_4));
+  printf("%s\n", nl_langinfo(MON_5));
+  printf("%s\n", nl_langinfo(MON_6));
+  printf("%s\n", nl_langinfo(MON_7));
+  printf("%s\n", nl_langinfo(MON_8));
+  printf("%s\n", nl_langinfo(MON_9));
+  printf("%s\n", nl_langinfo(MON_10));
+  printf("%s\n", nl_langinfo(MON_11));
+  printf("%s\n", nl_langinfo(MON_12));
+  exit(0);
+}
diff --git a/jni/iconv/libcharset/tools/locale_x11encoding.c b/jni/iconv/libcharset/tools/locale_x11encoding.c
new file mode 100644
index 0000000..f323cd2
--- /dev/null
+++ b/jni/iconv/libcharset/tools/locale_x11encoding.c
@@ -0,0 +1,40 @@
+/* Prints the locale's encoding via libX11. */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <locale.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+int main (int argc, char* argv[])
+{
+  Display* display;
+  XTextProperty textprop;
+  char* input;
+
+  if (argc != 1)
+    exit(1);
+
+  setlocale(LC_CTYPE,"");
+
+  display = XOpenDisplay(NULL);
+  if (display == NULL) {
+    fprintf(stderr,"cannot open display\n");
+    exit(1);
+  }
+
+  input = "";
+  if (XmbTextListToTextProperty(display, &input, 1, XTextStyle, &textprop) != Success) {
+    fprintf(stderr,"XmbTextListToTextProperty failed\n");
+    exit(1);
+  }
+  assert(textprop.format == 8);
+  assert(textprop.nitems == 0);
+
+  printf("%s\n", XGetAtomName(display, textprop.encoding));
+
+  XCloseDisplay(display);
+
+  exit(0);
+}
diff --git a/jni/iconv/libcharset/tools/netbsd-3.0 b/jni/iconv/libcharset/tools/netbsd-3.0
new file mode 100644
index 0000000..9e2f6a9
--- /dev/null
+++ b/jni/iconv/libcharset/tools/netbsd-3.0
@@ -0,0 +1,109 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                646               646               ASCII             
+POSIX            646               646               ASCII             
+bg_BG.CP1251     CP1251            CP1251            CP1251            
+ca               646               646               ASCII             
+ca_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+cs               646               646               ASCII             
+cs_CZ.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+da               646               646               ASCII             
+da_DK.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+de               646               646               ASCII             
+de_AT            646               646               ASCII             
+de_AT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_AT.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_DE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+el               646               646               ASCII             
+el_GR.ISO8859-7  ISO8859-7         ISO8859-7         ISO-8859-7        
+en_AU.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_AU.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_CA.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_GB.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_US.UTF-8      UTF-8             UTF-8             UTF-8             
+eo               646               646               ASCII             
+es               646               646               ASCII             
+es_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+et               646               646               ASCII             
+fi_FI.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr               646               646               ASCII             
+fr_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+gl               646               646               ASCII             
+he               646               646               ASCII             
+hr               646               646               ASCII             
+hr_HR.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+hy_AM.ARMSCII-8  ARMSCII-8         ARMSCII-8         ARMSCII-8         bug
+id               646               646               ASCII             
+is_IS.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+it               646               646               ASCII             
+it_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_CH.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+it_IT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+ja               646               646               ASCII             
+ja_JP.ISO2022-JP  ISO2022-JP        ISO2022-JP        ISO2022-JP        bug
+ja_JP.ISO2022-JP2  ISO2022-JP2       ISO2022-JP2       ISO2022-JP2       bug
+ja_JP.SJIS       SJIS              SJIS              SHIFT_JIS         
+ja_JP.ct         CTEXT             CTEXT             CTEXT             bug
+ja_JP.eucJP      eucJP             eucJP             EUC-JP            
+ko               646               646               ASCII             
+ko_KR.eucKR      eucKR             eucKR             EUC-KR            
+locale.alias     646               646               ASCII             
+lt_LT.ISO8859-13  ISO8859-13        ISO8859-13        ISO-8859-13       
+lt_LT.ISO8859-4  ISO8859-4         ISO8859-4         ISO-8859-4        
+nb               646               646               ASCII             
+nl               646               646               ASCII             
+nl_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_NL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+no               646               646               ASCII             
+no@nynorsk       646               646               ASCII             
+no_NO.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+pl               646               646               ASCII             
+pl_PL.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+pt               646               646               ASCII             
+pt_BR            646               646               ASCII             
+pt_PT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+ro               646               646               ASCII             
+ru               646               646               ASCII             
+ru_RU.CP866      CP866             CP866             CP866             
+ru_RU.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU.KOI8-R     KOI8-R            KOI8-R            KOI8-R            
+sk               646               646               ASCII             
+sk_SK.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sl               646               646               ASCII             
+sl_SI.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sv               646               646               ASCII             
+sv_SE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+tr               646               646               ASCII             
+uk_UA.KOI8-U     KOI8-U            KOI8-U            KOI8-U            
+zh_CN            646               646               ASCII             
+zh_CN.GB18030    GB18030           GB18030           GB18030           
+zh_CN.eucCN      eucCN             eucCN             GB2312            
+zh_TW            646               646               ASCII             
+zh_TW.Big5       BIG5              BIG5              BIG5              
+zh_TW.eucTW      eucTW             eucTW             EUC-TW            
diff --git a/jni/iconv/libcharset/tools/openbsd-4.1 b/jni/iconv/libcharset/tools/openbsd-4.1
new file mode 100644
index 0000000..4775594
--- /dev/null
+++ b/jni/iconv/libcharset/tools/openbsd-4.1
@@ -0,0 +1,64 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                <error>           646               646               
+bg_BG.CP1251     <error>           CP1251            CP1251            
+ca_ES.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+cs_CZ.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+da_DK.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+de_AT.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+de_AT.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+de_CH.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+de_DE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+el_GR.ISO8859-7  <error>           ISO8859-7         ISO-8859-7        
+en_AU.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_AU.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_CA.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_CA.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_GB.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+en_US.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+en_US.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+es_ES.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fi_FI.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_BE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_CA.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_CH.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+fr_FR.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+hr_HR.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+hy_AM.ARMSCII-8  <error>           ARMSCII-8         ARMSCII-8         bug
+is_IS.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+it_CH.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+it_CH.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+it_IT.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+lt_LT.ISO8859-13  <error>           ISO8859-13        ISO-8859-13       
+lt_LT.ISO8859-4  <error>           ISO8859-4         ISO-8859-4        
+nl_BE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+nl_NL.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+no_NO.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+pl_PL.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+pt_PT.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+ru_RU.CP866      <error>           CP866             CP866             
+ru_RU.ISO8859-5  <error>           ISO8859-5         ISO-8859-5        
+ru_RU.KOI8-R     <error>           KOI8-R            KOI8-R            
+sk_SK.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+sl_SI.ISO8859-2  <error>           ISO8859-2         ISO-8859-2        
+sv_SE.ISO8859-1  <error>           ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-15  <error>           ISO8859-15        ISO-8859-15       
+uk_UA.KOI8-U     <error>           KOI8-U            KOI8-U            
diff --git a/jni/iconv/libcharset/tools/osf1-4.0a b/jni/iconv/libcharset/tools/osf1-4.0a
new file mode 100644
index 0000000..c437a3b
--- /dev/null
+++ b/jni/iconv/libcharset/tools/osf1-4.0a
@@ -0,0 +1,23 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+el_GR.ISO8859-7  ISO8859-7         ISO8859-7         ISO-8859-7        
+en_GB.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+tr_TR.ISO8859-9  ISO8859-9         ISO8859-9         ISO-8859-9        
diff --git a/jni/iconv/libcharset/tools/osf1-4.0d b/jni/iconv/libcharset/tools/osf1-4.0d
new file mode 100644
index 0000000..5628c03
--- /dev/null
+++ b/jni/iconv/libcharset/tools/osf1-4.0d
@@ -0,0 +1,24 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+el_GR.ISO8859-7  ISO8859-7         ISO8859-7         ISO-8859-7        
+en_GB.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.cp850      cp850             cp850             CP850             
+es_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+tr_TR.ISO8859-9  ISO8859-9         ISO8859-9         ISO-8859-9        
diff --git a/jni/iconv/libcharset/tools/osf1-5.1 b/jni/iconv/libcharset/tools/osf1-5.1
new file mode 100644
index 0000000..9ac7edc
--- /dev/null
+++ b/jni/iconv/libcharset/tools/osf1-5.1
@@ -0,0 +1,161 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+POSIX            ISO8859-1         ISO8859-1         ISO-8859-1        
+ca_ES            ISO8859-1         ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+ca_ES.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+ca_ES.UTF-8      UTF-8             UTF-8             UTF-8             
+cs_CZ            ISO8859-2         ISO8859-2         ISO-8859-2        
+cs_CZ.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+cs_CZ.ISO8859-2@ucs4  ISO8859-2         ISO8859-2         ISO-8859-2        
+cs_CZ@ucs4       ISO8859-2         ISO8859-2         ISO-8859-2        
+da_DK.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+da_DK.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+da_DK.UTF-8      UTF-8             UTF-8             UTF-8             
+de_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_CH.UTF-8      UTF-8             UTF-8             UTF-8             
+de_DE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+de_DE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_DE.UTF-8      UTF-8             UTF-8             UTF-8             
+el_GR.ISO8859-7  ISO8859-7         ISO8859-7         ISO-8859-7        
+el_GR.ISO8859-7@ucs4  ISO8859-7         ISO8859-7         ISO-8859-7        
+en_EU.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+en_GB.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_GB.UTF-8      UTF-8             UTF-8             UTF-8             
+en_US.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_US.UTF-8      UTF-8             UTF-8             UTF-8             
+en_US.UTF-8@euro  UTF-8             UTF-8             UTF-8             
+en_US.cp850      cp850             cp850             CP850             
+es_ES.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+es_ES.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+es_ES.UTF-8      UTF-8             UTF-8             UTF-8             
+fi_FI.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fi_FI.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fi_FI.UTF-8      UTF-8             UTF-8             UTF-8             
+fr_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_BE.UTF-8      UTF-8             UTF-8             UTF-8             
+fr_CA.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CA.UTF-8      UTF-8             UTF-8             UTF-8             
+fr_CH.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CH.UTF-8      UTF-8             UTF-8             UTF-8             
+fr_FR.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_FR.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_FR.UTF-8      UTF-8             UTF-8             UTF-8             
+he_IL            ISO8859-8         ISO8859-8         ISO-8859-8        
+he_IL.ISO8859-8  ISO8859-8         ISO8859-8         ISO-8859-8        
+he_IL.ISO8859-8@ucs4  ISO8859-8         ISO8859-8         ISO-8859-8        
+he_IL@ucs4       ISO8859-8         ISO8859-8         ISO-8859-8        
+hu_HU            ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU.ISO8859-2@ucs4  ISO8859-2         ISO8859-2         ISO-8859-2        
+hu_HU@ucs4       ISO8859-2         ISO8859-2         ISO-8859-2        
+is_IS.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+is_IS.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+it_IT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+it_IT.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+it_IT.UTF-8      UTF-8             UTF-8             UTF-8             
+iw_IL            ISO8859-8         ISO8859-8         ISO-8859-8        
+iw_IL.ISO8859-8  ISO8859-8         ISO8859-8         ISO-8859-8        
+iw_IL.ISO8859-8@ucs4  ISO8859-8         ISO8859-8         ISO-8859-8        
+iw_IL@ucs4       ISO8859-8         ISO8859-8         ISO-8859-8        
+ja_JP            eucJP             eucJP             EUC-JP            
+ja_JP.SJIS       SJIS              SJIS              SJIS              
+ja_JP.SJIS@ucs4  SJIS              SJIS              SJIS              
+ja_JP.UTF-8      UTF-8             UTF-8             UTF-8             
+ja_JP.deckanji   deckanji          deckanji          DEC-KANJI         
+ja_JP.deckanji@ucs4  deckanji          deckanji          DEC-KANJI         
+ja_JP.eucJP      eucJP             eucJP             EUC-JP            
+ja_JP.sdeckanji  sdeckanji         sdeckanji         EUC-JP            
+ko_KR            deckorean         deckorean         EUC-KR            
+ko_KR.KSC5601    KSC5601           KSC5601           CP949             
+ko_KR.UTF-8      UTF-8             UTF-8             UTF-8             
+ko_KR.deckorean  deckorean         deckorean         EUC-KR            
+ko_KR.deckorean@ucs4  deckorean         deckorean         EUC-KR            
+ko_KR.eucKR      eucKR             eucKR             EUC-KR            
+ko_KR@ucs4       deckorean         deckorean         EUC-KR            
+lt_LT            ISO8859-4         ISO8859-4         ISO-8859-4        
+lt_LT.ISO8859-4  ISO8859-4         ISO8859-4         ISO-8859-4        
+nl_BE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_BE.UTF-8      UTF-8             UTF-8             UTF-8             
+nl_NL.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_NL.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_NL.UTF-8      UTF-8             UTF-8             UTF-8             
+no_NO.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NO.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+no_NO.UTF-8      UTF-8             UTF-8             UTF-8             
+pl_PL            ISO8859-2         ISO8859-2         ISO-8859-2        
+pl_PL.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+pl_PL.ISO8859-2@ucs4  ISO8859-2         ISO8859-2         ISO-8859-2        
+pl_PL@ucs4       ISO8859-2         ISO8859-2         ISO-8859-2        
+pt_PT.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_PT.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+pt_PT.UTF-8      UTF-8             UTF-8             UTF-8             
+ru_RU            ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU.ISO8859-5  ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU.ISO8859-5@ucs4  ISO8859-5         ISO8859-5         ISO-8859-5        
+ru_RU@ucs4       ISO8859-5         ISO8859-5         ISO-8859-5        
+sk_SK            ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK.ISO8859-2@ucs4  ISO8859-2         ISO8859-2         ISO-8859-2        
+sk_SK@ucs4       ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI            ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI.ISO8859-2  ISO8859-2         ISO8859-2         ISO-8859-2        
+sv_SE.ISO8859-1  ISO8859-1         ISO8859-1         ISO-8859-1        
+sv_SE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+sv_SE.UTF-8      UTF-8             UTF-8             UTF-8             
+th_TH            TACTIS            TACTIS            TIS-620           
+th_TH.TACTIS     TACTIS            TACTIS            TIS-620           
+tr_TR.ISO8859-9  ISO8859-9         ISO8859-9         ISO-8859-9        
+tr_TR.ISO8859-9@ucs4  ISO8859-9         ISO8859-9         ISO-8859-9        
+universal.UTF-8  UTF-8             UTF-8             UTF-8             
+universal.utf8@ucs4  UTF-8             UTF-8             UTF-8             
+zh_CN            dechanzi          dechanzi          GB2312            
+zh_CN.GBK        GBK               GBK               GBK               
+zh_CN.UTF-8      UTF-8             UTF-8             UTF-8             
+zh_CN.dechanzi   dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@pinyin  dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@pinyin@ucs4  dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@radical  dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@radical@ucs4  dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@stroke  dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@stroke@ucs4  dechanzi          dechanzi          GB2312            
+zh_CN.dechanzi@ucs4  dechanzi          dechanzi          GB2312            
+zh_CN@ucs4       dechanzi          dechanzi          GB2312            
+zh_HK.UTF-8      UTF-8             UTF-8             UTF-8             
+zh_HK.big5       big5              big5              BIG5              
+zh_HK.dechanyu   dechanyu          dechanyu          DEC-HANYU         
+zh_HK.dechanyu@ucs4  dechanyu          dechanyu          DEC-HANYU         
+zh_HK.dechanzi   dechanzi          dechanzi          GB2312            
+zh_HK.dechanzi@ucs4  dechanzi          dechanzi          GB2312            
+zh_HK.eucTW      eucTW             eucTW             EUC-TW            
+zh_HK.eucTW@ucs4  eucTW             eucTW             EUC-TW            
+zh_TW            eucTW             eucTW             EUC-TW            
+zh_TW.UTF-8      UTF-8             UTF-8             UTF-8             
+zh_TW.big5       big5              big5              BIG5              
+zh_TW.big5@chuyin  big5              big5              BIG5              
+zh_TW.big5@radical  big5              big5              BIG5              
+zh_TW.big5@stroke  big5              big5              BIG5              
+zh_TW.dechanyu   dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@chuyin  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@chuyin@ucs4  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@radical  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@radical@ucs4  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@stroke  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@stroke@ucs4  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.dechanyu@ucs4  dechanyu          dechanyu          DEC-HANYU         
+zh_TW.eucTW      eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@chuyin  eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@chuyin@ucs4  eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@radical  eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@radical@ucs4  eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@stroke  eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@stroke@ucs4  eucTW             eucTW             EUC-TW            
+zh_TW.eucTW@ucs4  eucTW             eucTW             EUC-TW            
+zh_TW@ucs4       dechanyu          dechanyu          DEC-HANYU         
diff --git a/jni/iconv/libcharset/tools/solaris-2.4 b/jni/iconv/libcharset/tools/solaris-2.4
new file mode 100644
index 0000000..d2f35e5
--- /dev/null
+++ b/jni/iconv/libcharset/tools/solaris-2.4
@@ -0,0 +1,11 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                <error>                                               bug
+POSIX            <error>                                               bug
+de               <error>                                               bug
+en_US            <error>                                               bug
+es               <error>                                               bug
+fr               <error>                                               bug
+iso_8859_1       <error>                                               bug
+it               <error>                                               bug
+sv               <error>                                               bug
diff --git a/jni/iconv/libcharset/tools/solaris-2.5.1 b/jni/iconv/libcharset/tools/solaris-2.5.1
new file mode 100644
index 0000000..1cd6099
--- /dev/null
+++ b/jni/iconv/libcharset/tools/solaris-2.5.1
@@ -0,0 +1,53 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                                                                      bug
+POSIX                                                                  bug
+at                                                                     bug
+cz                                                                     bug
+da               ISO8859-1         ISO8859-1         ISO-8859-1        
+de               ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+el                                                                     bug
+en_AU            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_IE            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_NZ            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_UK            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+es               ISO8859-1         ISO8859-1         ISO-8859-1        
+es_AR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_BO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CL            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_EC            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_GT            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_MX            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_NI            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PA            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PE            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_SV            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_UY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_VE            ISO8859-1         ISO8859-1         ISO-8859-1        
+et                                                                     bug
+fr               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+hu                                                                     bug
+il                                                                     bug
+iso_8859_1                                                             bug
+it               ISO8859-1         ISO8859-1         ISO-8859-1        
+lt                                                                     bug
+lv                                                                     bug
+nl               ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+no               ISO8859-1         ISO8859-1         ISO-8859-1        
+pl                                                                     bug
+pt               ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+ru                                                                     bug
+su               ISO8859-1         ISO8859-1         ISO-8859-1        
+sv               ISO8859-1         ISO8859-1         ISO-8859-1        
+tr                                                                     bug
diff --git a/jni/iconv/libcharset/tools/solaris-2.6 b/jni/iconv/libcharset/tools/solaris-2.6
new file mode 100644
index 0000000..604591f
--- /dev/null
+++ b/jni/iconv/libcharset/tools/solaris-2.6
@@ -0,0 +1,53 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                                                                      bug
+POSIX                                                                  bug
+cz               ISO8859-2         ISO8859-2         ISO-8859-2        
+da               ISO8859-1         ISO8859-1         ISO-8859-1        
+de               ISO8859-1         ISO8859-1         ISO-8859-1        
+de_AT            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+el               ISO8859-7         ISO8859-7         ISO-8859-7        
+en_AU            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_IE            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_NZ            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_UK            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.UTF-8      UTF-8             UTF-8             UTF-8             
+es               ISO8859-1         ISO8859-1         ISO-8859-1        
+es_AR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_BO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CL            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_EC            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_GT            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_MX            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_NI            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PA            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PE            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_SV            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_UY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_VE            ISO8859-1         ISO8859-1         ISO-8859-1        
+et               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+hu               ISO8859-2         ISO8859-2         ISO-8859-2        
+iso_8859_1                                                             bug
+it               ISO8859-1         ISO8859-1         ISO-8859-1        
+lt               ISO8859-4         ISO8859-4         ISO-8859-4        
+lv               ISO8859-4         ISO8859-4         ISO-8859-4        
+nl               ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+no               ISO8859-1         ISO8859-1         ISO-8859-1        
+pl               ISO8859-2         ISO8859-2         ISO-8859-2        
+pt               ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+ru               ISO8859-5         ISO8859-5         ISO-8859-5        
+su               ISO8859-1         ISO8859-1         ISO-8859-1        
+sv               ISO8859-1         ISO8859-1         ISO-8859-1        
+tr               ISO8859-9         ISO8859-9         ISO-8859-9        
diff --git a/jni/iconv/libcharset/tools/solaris-2.6-cjk b/jni/iconv/libcharset/tools/solaris-2.6-cjk
new file mode 100644
index 0000000..7625f09
--- /dev/null
+++ b/jni/iconv/libcharset/tools/solaris-2.6-cjk
@@ -0,0 +1,64 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                                                                      bug
+POSIX                                                                  bug
+chinese          gb2312            gb2312            EUC-CN            
+cz               ISO8859-2         ISO8859-2         ISO-8859-2        
+da               ISO8859-1         ISO8859-1         ISO-8859-1        
+de               ISO8859-1         ISO8859-1         ISO-8859-1        
+de_AT            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+el               ISO8859-7         ISO8859-7         ISO-8859-7        
+en_AU            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_IE            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_NZ            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_UK            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.UTF-8      UTF-8             UTF-8             UTF-8             
+es               ISO8859-1         ISO8859-1         ISO-8859-1        
+es_AR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_BO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CL            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_EC            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_GT            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_MX            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_NI            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PA            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PE            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_SV            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_UY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_VE            ISO8859-1         ISO8859-1         ISO-8859-1        
+et               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+hu               ISO8859-2         ISO8859-2         ISO-8859-2        
+iso_8859_1                                                             bug
+it               ISO8859-1         ISO8859-1         ISO-8859-1        
+ja               eucJP             eucJP             EUC-JP            
+ja_JP.PCK        PCK               PCK               SJIS              
+japanese         eucJP             eucJP             EUC-JP            
+ko               5601              5601              EUC-KR            
+ko.UTF-8         UTF-8             UTF-8             UTF-8             
+korean           5601              5601              EUC-KR            
+lt               ISO8859-4         ISO8859-4         ISO-8859-4        
+lv               ISO8859-4         ISO8859-4         ISO-8859-4        
+nl               ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+no               ISO8859-1         ISO8859-1         ISO-8859-1        
+pl               ISO8859-2         ISO8859-2         ISO-8859-2        
+pt               ISO8859-1         ISO8859-1         ISO-8859-1        
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+ru               ISO8859-5         ISO8859-5         ISO-8859-5        
+su               ISO8859-1         ISO8859-1         ISO-8859-1        
+sv               ISO8859-1         ISO8859-1         ISO-8859-1        
+tchinese         cns11643          cns11643          EUC-TW            
+tr               ISO8859-9         ISO8859-9         ISO-8859-9        
+zh               gb2312            gb2312            EUC-CN            
+zh_TW            cns11643          cns11643          EUC-TW            
+zh_TW.BIG5       BIG5              BIG5              BIG5              
diff --git a/jni/iconv/libcharset/tools/solaris-2.7 b/jni/iconv/libcharset/tools/solaris-2.7
new file mode 100644
index 0000000..c9bb59d
--- /dev/null
+++ b/jni/iconv/libcharset/tools/solaris-2.7
@@ -0,0 +1,109 @@
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                646               646               ASCII             
+POSIX            646               646               ASCII             
+ar               ISO8859-6         ISO8859-6         ISO-8859-6        
+bg_BG            ISO8859-5         ISO8859-5         ISO-8859-5        
+cz               ISO8859-2         ISO8859-2         ISO-8859-2        
+da               ISO8859-1         ISO8859-1         ISO-8859-1        
+da.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+da.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+de               ISO8859-1         ISO8859-1         ISO-8859-1        
+de.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+de.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+de.UTF-8         UTF-8             UTF-8             UTF-8             
+de.UTF-8@euro    UTF-8             UTF-8             UTF-8             
+de_AT            ISO8859-1         ISO8859-1         ISO-8859-1        
+de_AT.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_AT.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+de_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+el               ISO8859-7         ISO8859-7         ISO-8859-7        
+el.sun_eu_greek  sun_eu_greek      sun_eu_greek      sun_eu_greek      bug
+el.sun_eu_greek@euro  sun_eu_greek      sun_eu_greek      sun_eu_greek      bug
+en_AU            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_GB            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_GB.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_GB.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_IE            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_IE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_IE.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+en_NZ            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US            ISO8859-1         ISO8859-1         ISO-8859-1        
+en_US.UTF-8      UTF-8             UTF-8             UTF-8             
+es               ISO8859-1         ISO8859-1         ISO-8859-1        
+es.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+es.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+es.UTF-8         UTF-8             UTF-8             UTF-8             
+es.UTF-8@euro    UTF-8             UTF-8             UTF-8             
+es_AR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_BO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CL            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CO            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_CR            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_EC            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_GT            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_MX            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_NI            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PA            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PE            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_PY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_SV            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_UY            ISO8859-1         ISO8859-1         ISO-8859-1        
+es_VE            ISO8859-1         ISO8859-1         ISO-8859-1        
+et               ISO8859-1         ISO8859-1         ISO-8859-1        
+fi               ISO8859-1         ISO8859-1         ISO-8859-1        
+fi.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fi.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr               ISO8859-1         ISO8859-1         ISO-8859-1        
+fr.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+fr.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr.UTF-8         UTF-8             UTF-8             UTF-8             
+fr.UTF-8@euro    UTF-8             UTF-8             UTF-8             
+fr_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_BE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_BE.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+fr_CA            ISO8859-1         ISO8859-1         ISO-8859-1        
+fr_CH            ISO8859-1         ISO8859-1         ISO-8859-1        
+he               ISO8859-8         ISO8859-8         ISO-8859-8        
+he_IL            646               646               ASCII             
+hr_HR            ISO8859-2         ISO8859-2         ISO-8859-2        
+hu               ISO8859-2         ISO8859-2         ISO-8859-2        
+iso_8859_1       646               646               ASCII             
+it               ISO8859-1         ISO8859-1         ISO-8859-1        
+it.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+it.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+it.UTF-8         UTF-8             UTF-8             UTF-8             
+it.UTF-8@euro    UTF-8             UTF-8             UTF-8             
+lt               ISO8859-4         ISO8859-4         ISO-8859-4        
+lv               ISO8859-4         ISO8859-4         ISO-8859-4        
+mk_MK            ISO8859-5         ISO8859-5         ISO-8859-5        
+nl               ISO8859-1         ISO8859-1         ISO-8859-1        
+nl.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+nl.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_BE            ISO8859-1         ISO8859-1         ISO-8859-1        
+nl_BE.ISO8859-15  ISO8859-15        ISO8859-15        ISO-8859-15       
+nl_BE.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+no               ISO8859-1         ISO8859-1         ISO-8859-1        
+no_NY            ISO8859-1         ISO8859-1         ISO-8859-1        
+nr               ISO8859-2         ISO8859-2         ISO-8859-2        
+pl               ISO8859-2         ISO8859-2         ISO-8859-2        
+pt               ISO8859-1         ISO8859-1         ISO-8859-1        
+pt.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+pt.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+pt_BR            ISO8859-1         ISO8859-1         ISO-8859-1        
+ro_RO            ISO8859-2         ISO8859-2         ISO-8859-2        
+ru               ISO8859-5         ISO8859-5         ISO-8859-5        
+ru.koi8-r        koi8-r            koi8-r            KOI8-R            
+sk_SK            ISO8859-2         ISO8859-2         ISO-8859-2        
+sl_SI            ISO8859-2         ISO8859-2         ISO-8859-2        
+sq_AL            ISO8859-2         ISO8859-2         ISO-8859-2        
+sr_SP            ISO8859-5         ISO8859-5         ISO-8859-5        
+sv               ISO8859-1         ISO8859-1         ISO-8859-1        
+sv.ISO8859-15    ISO8859-15        ISO8859-15        ISO-8859-15       
+sv.ISO8859-15@euro  ISO8859-15        ISO8859-15        ISO-8859-15       
+sv.UTF-8         UTF-8             UTF-8             UTF-8             
+sv.UTF-8@euro    UTF-8             UTF-8             UTF-8             
+th               TIS620.2533       TIS620.2533       TIS-620           
+th_TH            TIS620.2533       TIS620.2533       TIS-620           
+tr               ISO8859-9         ISO8859-9         ISO-8859-9        
diff --git a/jni/iconv/libcharset/tools/sunos-4.1.4 b/jni/iconv/libcharset/tools/sunos-4.1.4
new file mode 100644
index 0000000..e3a7c90
--- /dev/null
+++ b/jni/iconv/libcharset/tools/sunos-4.1.4
@@ -0,0 +1,5 @@
+locale_charset.c:
+../../lib/localcharset.c:
+locale name    locale charmap   nl_langinfo(CODESET) locale_charset() 
+
+C                <error>           <error>           <error>           bug
diff --git a/jni/iconv/libcharset/tools/win32 b/jni/iconv/libcharset/tools/win32
new file mode 100644
index 0000000..8ee3554
--- /dev/null
+++ b/jni/iconv/libcharset/tools/win32
@@ -0,0 +1,16 @@
+Documentation mentions:
+CP874
+CP932
+CP936
+CP949
+CP950
+CP1200 - Unicode - UCS-2 or UTF-8 ?
+CP1250
+CP1251
+CP1252
+CP1253
+CP1254
+CP1255
+CP1256
+CP1257
+CP1361
-- 
cgit v1.2.3-70-g09d2