Update.

2000-11-28  Masahide Washizawa  <washi@jp.ibm.com>

	* iconvdata/Makefile (modules): Add IBM922, IBM1124, and IBM1129.
	(distribute): Add ibm922.c, ibm1124.c, ibm1129.c, ibm922.h, ibm1124.h,
	and ibm1129.h.
	* iconvdata/gconv-modules: Add entries for IBM922, IBM1124, and
	IBM1129.
	* iconvdata/ibm922.c: New file.
	* iconvdata/ibm922.h: New file.
	* iconvdata/ibm1124.c: New file.
	* iconvdata/ibm1124.h: New file.
	* iconvdata/ibm1129.c: New file.
	* iconvdata/ibm1129.h: New file.
	* iconvdata/testdata/IBM922: New file.
	* iconvdata/testdata/IBM922..UTF8: New file.
	* iconvdata/testdata/IBM1124: New file.
	* iconvdata/testdata/IBM1124..UTF8: New file.
	* iconvdata/testdata/IBM1129: New file.
	* iconvdata/testdata/IBM1129..UTF8: New file.

14 files changed, 679 insertions, 1 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index e0afa32021..63247d7422 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -37,7 +37,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424	 \
 	   IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861	 \
 	   IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880	 \
-	   IBM866 CP1258						 \
+	   IBM866 CP1258 IBM922 IBM1124 IBM1129 			 \
 	   IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046		 \
 	   IBM918 IBM1004 IBM1026 CP1250 CP1251 CP1252 CP1253 CP1254	 \
 	   CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1		 \
@@ -121,6 +121,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      ibm891.c ibm903.c ibm904.c ibm905.c ibm918.c ibm1004.c	    \
 	      ibm856.c ibm930.c ibm933.c ibm935.c ibm937.c ibm939.c ibm1046.c \
 	      ibm856.h ibm930.h ibm933.h ibm935.h ibm937.h ibm939.h ibm1046.h \
+	      ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h     \
 	      ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c	    \
 	      inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c	    \
 	      iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 021dd78448..550fe0a3ad 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -826,6 +826,13 @@ module	IBM918//		INTERNAL		IBM918		1
 module	INTERNAL		IBM918//		IBM918		1
 
 #	from			to			module		cost
+alias	IBM-922//		IBM922//
+alias	CP922//			IBM922//
+alias	CSIBM922//		IBM922//
+module	IBM922//		INTERNAL		IBM922		1
+module	INTERNAL		IBM922//		IBM922		1
+
+#	from			to			module		cost
 alias	IBM-930//		IBM930//
 alias	CP930//			IBM930//
 alias	EBCDIC-CP-AR2//		IBM930//
@@ -894,6 +901,20 @@ module	IBM1047//		INTERNAL		IBM1047		1
 module	INTERNAL		IBM1047//		IBM1047		1
 
 #	from			to			module		cost
+alias	IBM-1124//		IBM1124//
+alias	CP1124//		IBM1124//
+alias	CSIBM1124//		IBM1124//
+module	IBM1124//		INTERNAL		IBM1124		1
+module	INTERNAL		IBM1124//		IBM1124		1
+
+#	from			to			module		cost
+alias	IBM-1129//		IBM1129//
+alias	CP1129//		IBM1129//
+alias	CSIBM1129//		IBM1129//
+module	IBM1129//		INTERNAL		IBM1129		1
+module	INTERNAL		IBM1129//		IBM1129		1
+
+#	from			to			module		cost
 alias	EUCKR//			EUC-KR//
 alias	CSEUCKR//		EUC-KR//
 alias	OSF0004000a//		EUC-KR//
diff --git a/iconvdata/ibm1124.c b/iconvdata/ibm1124.c
new file mode 100644
index 0000000000..287de3088a
--- /dev/null
+++ b/iconvdata/ibm1124.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1124.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1124.h>
+
+#define CHARSET_NAME   "IBM1124//"
+#define HAS_HOLES  0   /* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1124.h b/iconvdata/ibm1124.h
new file mode 100644
index 0000000000..bf988f6701
--- /dev/null
+++ b/iconvdata/ibm1124.h
@@ -0,0 +1,147 @@
+/* Conversion from and to IBM1124.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x0080, [0x81] = 0x0081, [0x82] = 0x0082, [0x83] = 0x0083,
+  [0x84] = 0x0084, [0x85] = 0x0085, [0x86] = 0x0086, [0x87] = 0x0087,
+  [0x88] = 0x0088, [0x89] = 0x0089, [0x8a] = 0x008a, [0x8b] = 0x008b,
+  [0x8c] = 0x008c, [0x8d] = 0x008d, [0x8e] = 0x008e, [0x8f] = 0x008f,
+  [0x90] = 0x0090, [0x91] = 0x0091, [0x92] = 0x0092, [0x93] = 0x0093,
+  [0x94] = 0x0094, [0x95] = 0x0095, [0x96] = 0x0096, [0x97] = 0x0097,
+  [0x98] = 0x0098, [0x99] = 0x0099, [0x9a] = 0x009a, [0x9b] = 0x009b,
+  [0x9c] = 0x009c, [0x9d] = 0x009d, [0x9e] = 0x009e, [0x9f] = 0x009f,
+  [0xa0] = 0x00a0, [0xa1] = 0x0401, [0xa2] = 0x0402, [0xa3] = 0x0490,
+  [0xa4] = 0x0404, [0xa5] = 0x0405, [0xa6] = 0x0406, [0xa7] = 0x0407,
+  [0xa8] = 0x0408, [0xa9] = 0x0409, [0xaa] = 0x040a, [0xab] = 0x040b,
+  [0xac] = 0x040c, [0xad] = 0x00ad, [0xae] = 0x040e, [0xaf] = 0x040f,
+  [0xb0] = 0x0410, [0xb1] = 0x0411, [0xb2] = 0x0412, [0xb3] = 0x0413,
+  [0xb4] = 0x0414, [0xb5] = 0x0415, [0xb6] = 0x0416, [0xb7] = 0x0417,
+  [0xb8] = 0x0418, [0xb9] = 0x0419, [0xba] = 0x041a, [0xbb] = 0x041b,
+  [0xbc] = 0x041c, [0xbd] = 0x041d, [0xbe] = 0x041e, [0xbf] = 0x041f,
+  [0xc0] = 0x0420, [0xc1] = 0x0421, [0xc2] = 0x0422, [0xc3] = 0x0423,
+  [0xc4] = 0x0424, [0xc5] = 0x0425, [0xc6] = 0x0426, [0xc7] = 0x0427,
+  [0xc8] = 0x0428, [0xc9] = 0x0429, [0xca] = 0x042a, [0xcb] = 0x042b,
+  [0xcc] = 0x042c, [0xcd] = 0x042d, [0xce] = 0x042e, [0xcf] = 0x042f,
+  [0xd0] = 0x0430, [0xd1] = 0x0431, [0xd2] = 0x0432, [0xd3] = 0x0433,
+  [0xd4] = 0x0434, [0xd5] = 0x0435, [0xd6] = 0x0436, [0xd7] = 0x0437,
+  [0xd8] = 0x0438, [0xd9] = 0x0439, [0xda] = 0x043a, [0xdb] = 0x043b,
+  [0xdc] = 0x043c, [0xdd] = 0x043d, [0xde] = 0x043e, [0xdf] = 0x043f,
+  [0xe0] = 0x0440, [0xe1] = 0x0441, [0xe2] = 0x0442, [0xe3] = 0x0443,
+  [0xe4] = 0x0444, [0xe5] = 0x0445, [0xe6] = 0x0446, [0xe7] = 0x0447,
+  [0xe8] = 0x0448, [0xe9] = 0x0449, [0xea] = 0x044a, [0xeb] = 0x044b,
+  [0xec] = 0x044c, [0xed] = 0x044d, [0xee] = 0x044e, [0xef] = 0x044f,
+  [0xf0] = 0x2116, [0xf1] = 0x0451, [0xf2] = 0x0452, [0xf3] = 0x0491,
+  [0xf4] = 0x0454, [0xf5] = 0x0455, [0xf6] = 0x0456, [0xf7] = 0x0457,
+  [0xf8] = 0x0458, [0xf9] = 0x0459, [0xfa] = 0x045a, [0xfb] = 0x045b,
+  [0xfc] = 0x045c, [0xfd] = 0x00a7, [0xfe] = 0x045e, [0xff] = 0x045f,
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00a0, idx:     0 },
+  { start: 0x00a7, end: 0x00ad, idx:    -6 },
+  { start: 0x0401, end: 0x045f, idx:  -857 },
+  { start: 0x0490, end: 0x0491, idx:  -905 },
+  { start: 0x2116, end: 0x2116, idx: -8205 },
+  { start: 0xff01, end: 0xff5e, idx: -65015 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+  '\xa0', '\xfd', '\x00', '\x00', '\x00', '\x00', '\x00', '\xad',
+  '\xa1', '\xa2', '\x00', '\xa4', '\xa5', '\xa6', '\xa7', '\xa8',
+  '\xa9', '\xaa', '\xab', '\xac', '\x00', '\xae', '\xaf', '\xb0',
+  '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7', '\xb8',
+  '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf', '\xc0',
+  '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7', '\xc8',
+  '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf', '\xd0',
+  '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7', '\xd8',
+  '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf', '\xe0',
+  '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8',
+  '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef', '\x00',
+  '\xf1', '\xf2', '\x00', '\xf4', '\xf5', '\xf6', '\xf7', '\xf8',
+  '\xf9', '\xfa', '\xfb', '\xfc', '\x00', '\xfe', '\xff', '\xa3',
+  '\xf3', '\xf0', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26',
+  '\x27', '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e',
+  '\x2f', '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36',
+  '\x37', '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e',
+  '\x3f', '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46',
+  '\x47', '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e',
+  '\x4f', '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56',
+  '\x57', '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e',
+  '\x5f', '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66',
+  '\x67', '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e',
+  '\x6f', '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76',
+  '\x77', '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e',
+};
diff --git a/iconvdata/ibm1129.c b/iconvdata/ibm1129.c
new file mode 100644
index 0000000000..8148217a0f
--- /dev/null
+++ b/iconvdata/ibm1129.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM1129.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm1129.h>
+
+#define CHARSET_NAME   "IBM1129//"
+#define HAS_HOLES  0   /* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm1129.h b/iconvdata/ibm1129.h
new file mode 100644
index 0000000000..67512f31c2
--- /dev/null
+++ b/iconvdata/ibm1129.h
@@ -0,0 +1,153 @@
+/* Conversion from and to IBM1129.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x0080, [0x81] = 0x0081, [0x82] = 0x0082, [0x83] = 0x0083,
+  [0x84] = 0x0084, [0x85] = 0x0085, [0x86] = 0x0086, [0x87] = 0x0087,
+  [0x88] = 0x0088, [0x89] = 0x0089, [0x8a] = 0x008a, [0x8b] = 0x008b,
+  [0x8c] = 0x008c, [0x8d] = 0x008d, [0x8e] = 0x008e, [0x8f] = 0x008f,
+  [0x90] = 0x0090, [0x91] = 0x0091, [0x92] = 0x0092, [0x93] = 0x0093,
+  [0x94] = 0x0094, [0x95] = 0x0095, [0x96] = 0x0096, [0x97] = 0x0097,
+  [0x98] = 0x0098, [0x99] = 0x0099, [0x9a] = 0x009a, [0x9b] = 0x009b,
+  [0x9c] = 0x009c, [0x9d] = 0x009d, [0x9e] = 0x009e, [0x9f] = 0x009f,
+  [0xa0] = 0x00a0, [0xa1] = 0x00a1, [0xa2] = 0x00a2, [0xa3] = 0x00a3,
+  [0xa4] = 0x00a4, [0xa5] = 0x00a5, [0xa6] = 0x00a6, [0xa7] = 0x00a7,
+  [0xa8] = 0x0153, [0xa9] = 0x00a9, [0xaa] = 0x00aa, [0xab] = 0x00ab,
+  [0xac] = 0x00ac, [0xad] = 0x00ad, [0xae] = 0x00ae, [0xaf] = 0x00af,
+  [0xb0] = 0x00b0, [0xb1] = 0x00b1, [0xb2] = 0x00b2, [0xb3] = 0x00b3,
+  [0xb4] = 0x0178, [0xb5] = 0x00b5, [0xb6] = 0x00b6, [0xb7] = 0x00b7,
+  [0xb8] = 0x0152, [0xb9] = 0x00b9, [0xba] = 0x00ba, [0xbb] = 0x00bb,
+  [0xbc] = 0x00bc, [0xbd] = 0x00bd, [0xbe] = 0x00be, [0xbf] = 0x00bf,
+  [0xc0] = 0x00c0, [0xc1] = 0x00c1, [0xc2] = 0x00c2, [0xc3] = 0x0102,
+  [0xc4] = 0x00c4, [0xc5] = 0x00c5, [0xc6] = 0x00c6, [0xc7] = 0x00c7,
+  [0xc8] = 0x00c8, [0xc9] = 0x00c9, [0xca] = 0x00ca, [0xcb] = 0x00cb,
+  [0xcc] = 0x0300, [0xcd] = 0x00cd, [0xce] = 0x00ce, [0xcf] = 0x00cf,
+  [0xd0] = 0x0110, [0xd1] = 0x00d1, [0xd2] = 0x0309, [0xd3] = 0x00d3,
+  [0xd4] = 0x00d4, [0xd5] = 0x01a0, [0xd6] = 0x00d6, [0xd7] = 0x00d7,
+  [0xd8] = 0x00d8, [0xd9] = 0x00d9, [0xda] = 0x00da, [0xdb] = 0x00db,
+  [0xdc] = 0x00dc, [0xdd] = 0x01af, [0xde] = 0x0303, [0xdf] = 0x00df,
+  [0xe0] = 0x00e0, [0xe1] = 0x00e1, [0xe2] = 0x00e2, [0xe3] = 0x0103,
+  [0xe4] = 0x00e4, [0xe5] = 0x00e5, [0xe6] = 0x00e6, [0xe7] = 0x00e7,
+  [0xe8] = 0x00e8, [0xe9] = 0x00e9, [0xea] = 0x00ea, [0xeb] = 0x00eb,
+  [0xec] = 0x0301, [0xed] = 0x00ed, [0xee] = 0x00ee, [0xef] = 0x00ef,
+  [0xf0] = 0x0111, [0xf1] = 0x00f1, [0xf2] = 0x0323, [0xf3] = 0x00f3,
+  [0xf4] = 0x00f4, [0xf5] = 0x01a1, [0xf6] = 0x00f6, [0xf7] = 0x00f7,
+  [0xf8] = 0x00f8, [0xf9] = 0x00f9, [0xfa] = 0x00fa, [0xfb] = 0x00fb,
+  [0xfc] = 0x00fc, [0xfd] = 0x01b0, [0xfe] = 0x20ab, [0xff] = 0x00ff,
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x0103, idx:     0 },
+  { start: 0x0110, end: 0x0111, idx:   -12 },
+  { start: 0x0152, end: 0x0153, idx:   -76 },
+  { start: 0x0178, end: 0x0178, idx:  -112 },
+  { start: 0x01a0, end: 0x01a1, idx:  -151 },
+  { start: 0x01af, end: 0x01b0, idx:  -164 },
+  { start: 0x0300, end: 0x0309, idx:  -499 },
+  { start: 0x0323, end: 0x0323, idx:  -524 },
+  { start: 0x20ab, end: 0x20ab, idx: -8083 },
+  { start: 0xff01, end: 0xff5e, idx: -65000 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+  '\x00', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+  '\xb0', '\xb1', '\xb2', '\xb3', '\x00', '\xb5', '\xb6', '\xb7',
+  '\x00', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+  '\xc0', '\xc1', '\xc2', '\x00', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xca', '\xcb', '\x00', '\xcd', '\xce', '\xcf',
+  '\x00', '\xd1', '\x00', '\xd3', '\xd4', '\x00', '\xd6', '\xd7',
+  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\x00', '\x00', '\xdf',
+  '\xe0', '\xe1', '\xe2', '\x00', '\xe4', '\xe5', '\xe6', '\xe7',
+  '\xe8', '\xe9', '\xea', '\xeb', '\x00', '\xed', '\xee', '\xef',
+  '\x00', '\xf1', '\x00', '\xf3', '\xf4', '\x00', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\x00', '\x00', '\xff',
+  '\x00', '\x00', '\xc3', '\xe3', '\xd0', '\xf0', '\xb8', '\xa8',
+  '\xb4', '\xd5', '\xf5', '\xdd', '\xfd', '\xcc', '\xec', '\x00',
+  '\xde', '\x00', '\x00', '\x00', '\x00', '\x00', '\xd2', '\xf2',
+  '\xfe', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e',
+};
diff --git a/iconvdata/ibm922.c b/iconvdata/ibm922.c
new file mode 100644
index 0000000000..fd5681a47a
--- /dev/null
+++ b/iconvdata/ibm922.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM922.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdint.h>
+
+/* Get the conversion table.  */
+#define TABLES <ibm922.h>
+
+#define CHARSET_NAME   "IBM922//"
+#define HAS_HOLES  0   /* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/ibm922.h b/iconvdata/ibm922.h
new file mode 100644
index 0000000000..3ed1004dad
--- /dev/null
+++ b/iconvdata/ibm922.h
@@ -0,0 +1,185 @@
+/* Tables for conversion from and to IBM922.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+static const uint32_t to_ucs4[256] =
+{
+  [0x00] = 0x0000, [0x01] = 0x0001, [0x02] = 0x0002, [0x03] = 0x0003,
+  [0x04] = 0x0004, [0x05] = 0x0005, [0x06] = 0x0006, [0x07] = 0x0007,
+  [0x08] = 0x0008, [0x09] = 0x0009, [0x0a] = 0x000a, [0x0b] = 0x000b,
+  [0x0c] = 0x000c, [0x0d] = 0x000d, [0x0e] = 0x000e, [0x0f] = 0x000f,
+  [0x10] = 0x0010, [0x11] = 0x0011, [0x12] = 0x0012, [0x13] = 0x0013,
+  [0x14] = 0x0014, [0x15] = 0x0015, [0x16] = 0x0016, [0x17] = 0x0017,
+  [0x18] = 0x0018, [0x19] = 0x0019, [0x1a] = 0x001a, [0x1b] = 0x001b,
+  [0x1c] = 0x001c, [0x1d] = 0x001d, [0x1e] = 0x001e, [0x1f] = 0x001f,
+  [0x20] = 0x0020, [0x21] = 0x0021, [0x22] = 0x0022, [0x23] = 0x0023,
+  [0x24] = 0x0024, [0x25] = 0x0025, [0x26] = 0x0026, [0x27] = 0x0027,
+  [0x28] = 0x0028, [0x29] = 0x0029, [0x2a] = 0x002a, [0x2b] = 0x002b,
+  [0x2c] = 0x002c, [0x2d] = 0x002d, [0x2e] = 0x002e, [0x2f] = 0x002f,
+  [0x30] = 0x0030, [0x31] = 0x0031, [0x32] = 0x0032, [0x33] = 0x0033,
+  [0x34] = 0x0034, [0x35] = 0x0035, [0x36] = 0x0036, [0x37] = 0x0037,
+  [0x38] = 0x0038, [0x39] = 0x0039, [0x3a] = 0x003a, [0x3b] = 0x003b,
+  [0x3c] = 0x003c, [0x3d] = 0x003d, [0x3e] = 0x003e, [0x3f] = 0x003f,
+  [0x40] = 0x0040, [0x41] = 0x0041, [0x42] = 0x0042, [0x43] = 0x0043,
+  [0x44] = 0x0044, [0x45] = 0x0045, [0x46] = 0x0046, [0x47] = 0x0047,
+  [0x48] = 0x0048, [0x49] = 0x0049, [0x4a] = 0x004a, [0x4b] = 0x004b,
+  [0x4c] = 0x004c, [0x4d] = 0x004d, [0x4e] = 0x004e, [0x4f] = 0x004f,
+  [0x50] = 0x0050, [0x51] = 0x0051, [0x52] = 0x0052, [0x53] = 0x0053,
+  [0x54] = 0x0054, [0x55] = 0x0055, [0x56] = 0x0056, [0x57] = 0x0057,
+  [0x58] = 0x0058, [0x59] = 0x0059, [0x5a] = 0x005a, [0x5b] = 0x005b,
+  [0x5c] = 0x005c, [0x5d] = 0x005d, [0x5e] = 0x005e, [0x5f] = 0x005f,
+  [0x60] = 0x0060, [0x61] = 0x0061, [0x62] = 0x0062, [0x63] = 0x0063,
+  [0x64] = 0x0064, [0x65] = 0x0065, [0x66] = 0x0066, [0x67] = 0x0067,
+  [0x68] = 0x0068, [0x69] = 0x0069, [0x6a] = 0x006a, [0x6b] = 0x006b,
+  [0x6c] = 0x006c, [0x6d] = 0x006d, [0x6e] = 0x006e, [0x6f] = 0x006f,
+  [0x70] = 0x0070, [0x71] = 0x0071, [0x72] = 0x0072, [0x73] = 0x0073,
+  [0x74] = 0x0074, [0x75] = 0x0075, [0x76] = 0x0076, [0x77] = 0x0077,
+  [0x78] = 0x0078, [0x79] = 0x0079, [0x7a] = 0x007a, [0x7b] = 0x007b,
+  [0x7c] = 0x007c, [0x7d] = 0x007d, [0x7e] = 0x007e, [0x7f] = 0x007f,
+  [0x80] = 0x0080, [0x81] = 0x0081, [0x82] = 0x0082, [0x83] = 0x0083,
+  [0x84] = 0x0084, [0x85] = 0x0085, [0x86] = 0x0086, [0x87] = 0x0087,
+  [0x88] = 0x0088, [0x89] = 0x0089, [0x8a] = 0x008a, [0x8b] = 0x008b,
+  [0x8c] = 0x008c, [0x8d] = 0x008d, [0x8e] = 0x008e, [0x8f] = 0x008f,
+  [0x90] = 0x0090, [0x91] = 0x0091, [0x92] = 0x0092, [0x93] = 0x0093,
+  [0x94] = 0x0094, [0x95] = 0x0095, [0x96] = 0x0096, [0x97] = 0x0097,
+  [0x98] = 0x0098, [0x99] = 0x0099, [0x9a] = 0x009a, [0x9b] = 0x009b,
+  [0x9c] = 0x009c, [0x9d] = 0x009d, [0x9e] = 0x009e, [0x9f] = 0x009f,
+  [0xa0] = 0x00a0, [0xa1] = 0x00a1, [0xa2] = 0x00a2, [0xa3] = 0x00a3,
+  [0xa4] = 0x00a4, [0xa5] = 0x00a5, [0xa6] = 0x00a6, [0xa7] = 0x00a7,
+  [0xa8] = 0x00a8, [0xa9] = 0x00a9, [0xaa] = 0x00aa, [0xab] = 0x00ab,
+  [0xac] = 0x00ac, [0xad] = 0x00ad, [0xae] = 0x00ae, [0xaf] = 0x00af,
+  [0xb0] = 0x00b0, [0xb1] = 0x00b1, [0xb2] = 0x00b2, [0xb3] = 0x00b3,
+  [0xb4] = 0x00b4, [0xb5] = 0x00b5, [0xb6] = 0x00b6, [0xb7] = 0x00b7,
+  [0xb8] = 0x00b8, [0xb9] = 0x00b9, [0xba] = 0x00ba, [0xbb] = 0x00bb,
+  [0xbc] = 0x00bc, [0xbd] = 0x00bd, [0xbe] = 0x00be, [0xbf] = 0x00bf,
+  [0xc0] = 0x00c0, [0xc1] = 0x00c1, [0xc2] = 0x00c2, [0xc3] = 0x00c3,
+  [0xc4] = 0x00c4, [0xc5] = 0x00c5, [0xc6] = 0x00c6, [0xc7] = 0x00c7,
+  [0xc8] = 0x00c8, [0xc9] = 0x00c9, [0xca] = 0x00ca, [0xcb] = 0x00cb,
+  [0xcc] = 0x00cc, [0xcd] = 0x00cd, [0xce] = 0x00ce, [0xcf] = 0x00cf,
+  [0xd0] = 0x0160, [0xd1] = 0x00d1, [0xd2] = 0x00d2, [0xd3] = 0x00d3,
+  [0xd4] = 0x00d4, [0xd5] = 0x00d5, [0xd6] = 0x00d6, [0xd7] = 0x00d7,
+  [0xd8] = 0x00d8, [0xd9] = 0x00d9, [0xda] = 0x00da, [0xdb] = 0x00db,
+  [0xdc] = 0x00dc, [0xdd] = 0x00dd, [0xde] = 0x017d, [0xdf] = 0x00df,
+  [0xe0] = 0x00e0, [0xe1] = 0x00e1, [0xe2] = 0x00e2, [0xe3] = 0x00e3,
+  [0xe4] = 0x00e4, [0xe5] = 0x00e5, [0xe6] = 0x00e6, [0xe7] = 0x00e7,
+  [0xe8] = 0x00e8, [0xe9] = 0x00e9, [0xea] = 0x00ea, [0xeb] = 0x00eb,
+  [0xec] = 0x00ec, [0xed] = 0x00ed, [0xee] = 0x00ee, [0xef] = 0x00ef,
+  [0xf0] = 0x0161, [0xf1] = 0x00f1, [0xf2] = 0x00f2, [0xf3] = 0x00f3,
+  [0xf4] = 0x00f4, [0xf5] = 0x00f5, [0xf6] = 0x00f6, [0xf7] = 0x00f7,
+  [0xf8] = 0x00f8, [0xf9] = 0x00f9, [0xfa] = 0x00fa, [0xfb] = 0x00fb,
+  [0xfc] = 0x00fc, [0xfd] = 0x00fd, [0xfe] = 0x017e, [0xff] = 0x00ff,
+};
+
+static const struct gap from_idx[] =
+{
+  { start: 0x0000, end: 0x00ff, idx:     0 },
+  { start: 0x0160, end: 0x0161, idx:   -96 },
+  { start: 0x017d, end: 0x017e, idx:  -123 },
+  { start: 0x2017, end: 0x2017, idx: -7955 },
+  { start: 0x2022, end: 0x2022, idx: -7965 },
+  { start: 0x203c, end: 0x203e, idx: -7990 },
+  { start: 0x2190, end: 0x2195, idx: -8327 },
+  { start: 0x21a8, end: 0x21a8, idx: -8345 },
+  { start: 0x221f, end: 0x221f, idx: -8463 },
+  { start: 0x2264, end: 0x2265, idx: -8531 },
+  { start: 0x2500, end: 0x2502, idx: -9197 },
+  { start: 0x250c, end: 0x251c, idx: -9206 },
+  { start: 0x2524, end: 0x2524, idx: -9213 },
+  { start: 0x252c, end: 0x252c, idx: -9220 },
+  { start: 0x2534, end: 0x2534, idx: -9227 },
+  { start: 0x253c, end: 0x253c, idx: -9234 },
+  { start: 0x2550, end: 0x256c, idx: -9253 },
+  { start: 0x2580, end: 0x2588, idx: -9272 },
+  { start: 0x2591, end: 0x2593, idx: -9280 },
+  { start: 0x25a0, end: 0x25a0, idx: -9292 },
+  { start: 0x25ac, end: 0x25b2, idx: -9303 },
+  { start: 0x25ba, end: 0x25bc, idx: -9310 },
+  { start: 0x25c4, end: 0x25c4, idx: -9317 },
+  { start: 0x25cb, end: 0x25cb, idx: -9323 },
+  { start: 0x25d8, end: 0x25d9, idx: -9335 },
+  { start: 0x263a, end: 0x2642, idx: -9431 },
+  { start: 0x2660, end: 0x266c, idx: -9460 },
+  { start: 0xff01, end: 0xff5e, idx: -64904 },
+  { start: 0xffe8, end: 0xffee, idx: -65041 },
+  { start: 0xffff, end: 0xffff, idx:     0 }
+};
+
+static const char from_ucs4[] =
+{
+  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
+  '\x00', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
+  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\x00', '\xdf',
+  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+  '\x00', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\x00', '\xff',
+  '\xd0', '\xf0', '\xde', '\xfe', '\x97', '\x07', '\x13', '\x00',
+  '\xaf', '\x1b', '\x18', '\x1a', '\x19', '\x1d', '\x12', '\x17',
+  '\x1c', '\x9f', '\x8e', '\x94', '\x00', '\x83', '\x86', '\x00',
+  '\x00', '\x00', '\x8f', '\x00', '\x00', '\x00', '\x90', '\x00',
+  '\x00', '\x00', '\x85', '\x00', '\x00', '\x00', '\x93', '\x84',
+  '\x92', '\x91', '\x95', '\x9d', '\x8a', '\x00', '\x00', '\x99',
+  '\x00', '\x00', '\x8b', '\x00', '\x00', '\x98', '\x00', '\x00',
+  '\x8c', '\x00', '\x00', '\x9c', '\x00', '\x00', '\x89', '\x00',
+  '\x00', '\x9b', '\x00', '\x00', '\x9a', '\x00', '\x00', '\x9e',
+  '\x8d', '\x00', '\x00', '\x00', '\x88', '\x00', '\x00', '\x00',
+  '\x87', '\x80', '\x81', '\x82', '\x96', '\x16', '\x00', '\x00',
+  '\x00', '\x00', '\x00', '\x1e', '\x10', '\x00', '\x1f', '\x11',
+  '\x09', '\x08', '\x0a', '\x01', '\x02', '\x0f', '\x00', '\x00',
+  '\x00', '\x0c', '\x00', '\x0b', '\x06', '\x00', '\x00', '\x05',
+  '\x00', '\x03', '\x04', '\x00', '\x00', '\x00', '\x0d', '\x00',
+  '\x0e', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x83',
+  '\x1b', '\x18', '\x1a', '\x19', '\x96', '\x09',
+};
diff --git a/iconvdata/testdata/IBM1124 b/iconvdata/testdata/IBM1124
new file mode 100644
index 0000000000..bc1ebcc283
--- /dev/null
+++ b/iconvdata/testdata/IBM1124
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . / 0 
+1 2 3 4 5 6 7 8 9 : ; < = > ? @ A 
+B C D E F G H I J K L M N O P Q R 
+S T U V W X Y Z [ \ ] ^ _ ` a b c 
+d e f g h i j k l m n o p q r s t 
+u v w x y z { | } ~  � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � 
diff --git a/iconvdata/testdata/IBM1124..UTF8 b/iconvdata/testdata/IBM1124..UTF8
new file mode 100644
index 0000000000..98eb609911
--- /dev/null
+++ b/iconvdata/testdata/IBM1124..UTF8
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . / 0 
+1 2 3 4 5 6 7 8 9 : ; < = > ? @ A 
+B C D E F G H I J K L M N O P Q R 
+S T U V W X Y Z [ \ ] ^ _ ` a b c 
+d e f g h i j k l m n o p q r s t 
+u v w x y z { | } ~  €  ‚ ƒ „ … 
+† ‡ ˆ ‰ Š ‹ Œ  Ž   ‘ ’ “ ” • – 
+— ˜ ™ š › œ  ž Ÿ   Ё Ђ Ґ Є Ѕ І Ї 
+Ј Љ Њ Ћ Ќ ­ Ў Џ А Б В Г Д Е Ж З И 
+Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ 
+Ъ Ы Ь Э Ю Я а б в г д е ж з и й к 
+л м н о п р с т у ф х ц ч ш щ ъ ы 
+ь э ю я № ё ђ ґ є ѕ і ї ј љ њ ћ ќ 
+§ ў џ 
diff --git a/iconvdata/testdata/IBM1129 b/iconvdata/testdata/IBM1129
new file mode 100644
index 0000000000..bc1ebcc283
--- /dev/null
+++ b/iconvdata/testdata/IBM1129
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . / 0 
+1 2 3 4 5 6 7 8 9 : ; < = > ? @ A 
+B C D E F G H I J K L M N O P Q R 
+S T U V W X Y Z [ \ ] ^ _ ` a b c 
+d e f g h i j k l m n o p q r s t 
+u v w x y z { | } ~  � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � 
diff --git a/iconvdata/testdata/IBM1129..UTF8 b/iconvdata/testdata/IBM1129..UTF8
new file mode 100644
index 0000000000..974c2ad481
--- /dev/null
+++ b/iconvdata/testdata/IBM1129..UTF8
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . / 0 
+1 2 3 4 5 6 7 8 9 : ; < = > ? @ A 
+B C D E F G H I J K L M N O P Q R 
+S T U V W X Y Z [ \ ] ^ _ ` a b c 
+d e f g h i j k l m n o p q r s t 
+u v w x y z { | } ~  €  ‚ ƒ „ … 
+† ‡ ˆ ‰ Š ‹ Œ  Ž   ‘ ’ “ ” • – 
+— ˜ ™ š › œ  ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § 
+œ © ª « ¬ ­ ® ¯ ° ± ² ³ Ÿ µ ¶ · Œ 
+¹ º » ¼ ½ ¾ ¿ À Á Â Ă Ä Å Æ Ç È É 
+Ê Ë ̀ Í Î Ï Đ Ñ ̉ Ó Ô Ơ Ö × Ø Ù Ú 
+Û Ü Ư ̃ ß à á â ă ä å æ ç è é ê ë 
+́ í î ï đ ñ ̣ ó ô ơ ö ÷ ø ù ú û ü 
+ư ₫ ÿ 
diff --git a/iconvdata/testdata/IBM922 b/iconvdata/testdata/IBM922
new file mode 100644
index 0000000000..bc1ebcc283
--- /dev/null
+++ b/iconvdata/testdata/IBM922
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . / 0 
+1 2 3 4 5 6 7 8 9 : ; < = > ? @ A 
+B C D E F G H I J K L M N O P Q R 
+S T U V W X Y Z [ \ ] ^ _ ` a b c 
+d e f g h i j k l m n o p q r s t 
+u v w x y z { | } ~  � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � � � � � � � � � � � � � � � 
+� � � 
diff --git a/iconvdata/testdata/IBM922..UTF8 b/iconvdata/testdata/IBM922..UTF8
new file mode 100644
index 0000000000..2cd5e8a764
--- /dev/null
+++ b/iconvdata/testdata/IBM922..UTF8
@@ -0,0 +1,14 @@
+  ! " # $ % & ' ( ) * + , - . / 0 
+1 2 3 4 5 6 7 8 9 : ; < = > ? @ A 
+B C D E F G H I J K L M N O P Q R 
+S T U V W X Y Z [ \ ] ^ _ ` a b c 
+d e f g h i j k l m n o p q r s t 
+u v w x y z { | } ~  €  ‚ ƒ „ … 
+† ‡ ˆ ‰ Š ‹ Œ  Ž   ‘ ’ “ ” • – 
+— ˜ ™ š › œ  ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § 
+¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ 
+¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É 
+Ê Ë Ì Í Î Ï Š Ñ Ò Ó Ô Õ Ö × Ø Ù Ú 
+Û Ü Ý Ž ß à á â ã ä å æ ç è é ê ë 
+ì í î ï š ñ ò ó ô õ ö ÷ ø ù ú û ü 
+ý ž ÿ