Update.

1998-12-16  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/ibm866.c: New file.
	* iconvdata/cp1258.c: New file.
	* iconvdata/cp1258.h: New file.
	* iconvdata/mac-uk.c: New file.
	* iconvdata/gconv-modules: Add rules for new modules.
	* iconvdata/Makefile: Likewise.

	* sysdeps/gnu/bits/ipc.h: Move libc internal bits to...
	* include/bits/ipc.h: ..here.  New file.

1998-12-16  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
 
	* sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Don't change 
	read-only struct termios_p* but change k_termios member directly. 
 

6 files changed, 421 insertions, 4 deletions

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 8b3ddc1b05..0271a41e07 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -37,12 +37,13 @@ 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						 \
 	   IBM918 IBM1004 IBM1026 CP1250 CP1251 CP1252 CP1253 CP1254	 \
 	   CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1 BALTIC	 \
 	   ASMO_449 ANSI_X3.110 CSN_369103 CWI DEC-MCS ECMA-CYRILLIC	 \
 	   GOST_19768-74 GREEK-CCITT GREEK7 GREEK7-OLD INIS INIS-8	 \
 	   INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT	 \
-	   ISO_5428 ISO_10367-BOX MAC-IS NATS-DANO NATS-SEFI
+	   ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -117,6 +118,7 @@ IBM862-routines := ibm862
 IBM863-routines := ibm863
 IBM864-routines := ibm864
 IBM865-routines := ibm865
+IBM866-routines := ibm866
 IBM868-routines := ibm868
 IBM869-routines := ibm869
 IBM870-routines := ibm870
@@ -142,6 +144,7 @@ CP1254-routines := cp1254
 CP1255-routines := cp1255
 CP1256-routines := cp1256
 CP1257-routines := cp1257
+CP1258-routines := cp1258
 EUC-KR-routines := euckr
 JOHAB-routines := johab
 UHC-routines := uhc
@@ -174,6 +177,7 @@ ISO_5427-EXT-routines := iso_5427-ext
 ISO_5428-routines := iso_5428
 ISO_10367-BOX-routines := iso_10367-box
 MAC-IS-routines := mac-is
+MAC-UK-routines := mac-uk
 NATS-DANO-routines := nats-dano
 NATS-SEFI-routines := nats-dano
 libJIS-routines := jis0201 jis0208 jis0212
@@ -228,13 +232,14 @@ distribute := 8bit-generic.c 8bit-gap.c gap.awk gaptab.awk gconv-modules    \
 	      ibm865.c ibm868.c ibm869.c ibm870.c ibm871.c ibm875.c	    \
 	      ibm880.c ibm891.c ibm903.c ibm904.c ibm905.c ibm918.c	    \
 	      ibm1004.c ibm1026.c ibm1047.c cp1250.c cp1251.c cp1252.c	    \
+	      ibm866.c cp1258.c cp1258.h				    \
 	      cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp874.c cp874.h  \
 	      cp737.c cp737.h cp775.c cp775.h iso-2022-jp.c iso-2022-kr.c   \
 	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh macintosh.c	    \
 	      iec_p27-1.c baltic.c asmo_449.c ansi_x3.110.c csn_369103.c    \
 	      cwi.c dec-mcs.c ecma-cyrillic.c gost_19768-74.c greek-ccitt.c \
 	      greek7.c greek7-old.c inis.c inis-8.c inis-cyrillic.c	    \
-	      iso6937-2.c iso_2033.c iso_5427.c iso_5427-ext.c		    \
+	      iso6937-2.c iso_2033.c iso_5427.c iso_5427-ext.c mac-uk.c	    \
 	      iso_5428.c iso_10367-box.c mac-is.c nats-dano.c nats-sefi.c
 
 # We build the transformation modules only when we build shared libs.
@@ -299,7 +304,7 @@ awk-generated-headers  := koi8-r.h latin-greek.h latin-greek-1.h	 \
 			  ibm862.h ibm863.h ibm864.h ibm865.h ibm868.h	 \
 			  ibm869.h ibm875.h ibm880.h ibm918.h ibm1004.h	 \
 			  ibm1026.h cp1250.h cp1251.h cp1252.h cp1253.h	 \
-			  cp1254.h cp1255.h cp1256.h cp1257.h		 \
+			  cp1254.h cp1255.h cp1256.h cp1257.h ibm866.h	 \
 			  iso8859-5.h iso8859-7.h iso8859-8.h		 \
 			  iso8859-10.h iso8859-7jp.h macintosh.h	 \
 			  iec_p27-1.h baltic.h asmo_449.h csn_369103.h	 \
@@ -308,7 +313,7 @@ awk-generated-headers  := koi8-r.h latin-greek.h latin-greek-1.h	 \
 			  inis-8.h inis-cyrillic.h iso_2033.h iso_5427.h \
 			  iso_5427-ext.h iso_5428.h iso_10367-box.h	 \
 			  mac-is.h nats-dano.h nats-sefi.h iso8859-13.h  \
-			  iso8859-14.h iso8859-15.h
+			  iso8859-14.h iso8859-15.h mac-uk.h
 
 generated = $(sed-generated-headers) $(sed-generated-headers:%.h=%.stmp) \
 	    $(awk-generated-headers) $(awk-generated-headers:%.h=%.stmp) \
@@ -480,6 +485,8 @@ $(objpfx)ibm864.stmp: ../localedata/charmaps/IBM864 gen-8bit-gap.sh
 	$(generate-8bit-gap-table)
 $(objpfx)ibm865.stmp: ../localedata/charmaps/IBM865 gen-8bit-gap.sh
 	$(generate-8bit-gap-table)
+$(objpfx)ibm866.stmp: ../localedata/charmaps/IBM866 gen-8bit-gap.sh
+	$(generate-8bit-gap-table)
 $(objpfx)ibm868.stmp: ../localedata/charmaps/IBM868 gen-8bit-gap.sh
 	$(generate-8bit-gap-table)
 $(objpfx)ibm869.stmp: ../localedata/charmaps/IBM869 gen-8bit-gap.sh
@@ -558,6 +565,8 @@ $(objpfx)iso_10367-box.stmp: ../localedata/charmaps/ISO_10367-BOX \
 	$(generate-8bit-gap-table)
 $(objpfx)mac-is.stmp: ../localedata/charmaps/MAC-IS gen-8bit-gap.sh
 	$(generate-8bit-gap-table)
+$(objpfx)mac-uk.stmp: ../localedata/charmaps/MAC-UK gen-8bit-gap.sh
+	$(generate-8bit-gap-table)
 $(objpfx)nats-dano.stmp: ../localedata/charmaps/NATS-DANO gen-8bit-gap.sh
 	$(generate-8bit-gap-table)
 $(objpfx)nats-sefi.stmp: ../localedata/charmaps/NATS-SEFI gen-8bit-gap.sh
diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c
new file mode 100644
index 0000000000..31fe4d32ef
--- /dev/null
+++ b/iconvdata/cp1258.c
@@ -0,0 +1,29 @@
+/* Conversion from and to CP1258.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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 <cp1258.h>
+
+#define CHARSET_NAME	"CP1258//"
+#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/cp1258.h b/iconvdata/cp1258.h
new file mode 100644
index 0000000000..42de6a452a
--- /dev/null
+++ b/iconvdata/cp1258.h
@@ -0,0 +1,306 @@
+static const uint32_t to_ucs4[256] = {
+  [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,
+  [0x82] = 0x201A,
+  [0x83] = 0x0192,
+  [0x84] = 0x201E,
+  [0x85] = 0x2026,
+  [0x86] = 0x2020,
+  [0x87] = 0x2021,
+  [0x88] = 0x02C6,
+  [0x89] = 0x2030,
+  [0x8B] = 0x2039,
+  [0x8C] = 0x0152,
+  [0x91] = 0x2018,
+  [0x92] = 0x2019,
+  [0x93] = 0x201C,
+  [0x94] = 0x201D,
+  [0x95] = 0x2022,
+  [0x96] = 0x2013,
+  [0x97] = 0x2014,
+  [0x98] = 0x02DC,
+  [0x99] = 0x2122,
+  [0x9B] = 0x203A,
+  [0x9C] = 0x0153,
+  [0x9F] = 0x0178,
+  [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] = 0x0102,
+  [0xC4] = 0x00C4,
+  [0xC5] = 0x00C5,
+  [0xC6] = 0x00C6,
+  [0xC7] = 0x00C7,
+  [0xC8] = 0x00C8,
+  [0xC9] = 0x00C9,
+  [0xCA] = 0x00CA,
+  [0xCB] = 0x00CB,
+  [0xCC] = 0x0340,
+  [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] = 0x0341,
+  [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: 0x007f, idx:     0 },
+  { start: 0x00a0, end: 0x0103, idx:   -32 },
+  { start: 0x0110, end: 0x0111, idx:   -44 },
+  { start: 0x0152, end: 0x0153, idx:  -108 },
+  { start: 0x0178, end: 0x0178, idx:  -144 },
+  { start: 0x0192, end: 0x0192, idx:  -169 },
+  { start: 0x01a0, end: 0x01a1, idx:  -182 },
+  { start: 0x01af, end: 0x01b0, idx:  -195 },
+  { start: 0x02c6, end: 0x02c6, idx:  -472 },
+  { start: 0x02dc, end: 0x02dc, idx:  -493 },
+  { start: 0x0303, end: 0x0309, idx:  -531 },
+  { start: 0x0323, end: 0x0323, idx:  -556 },
+  { start: 0x0340, end: 0x0341, idx:  -584 },
+  { start: 0x2013, end: 0x2026, idx: -7961 },
+  { start: 0x2030, end: 0x2030, idx: -7970 },
+  { start: 0x2039, end: 0x203a, idx: -7978 },
+  { start: 0x20ab, end: 0x20ab, idx: -8090 },
+  { start: 0x2122, end: 0x2122, idx: -8208 },
+  { 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',
+  '\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', '\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', '\x8c', '\x9c',
+  '\x9f', '\x83', '\xd5', '\xf5', '\xdd', '\xfd', '\x88', '\x98',
+  '\xde', '\x00', '\x00', '\x00', '\x00', '\x00', '\xd2', '\xf2',
+  '\xcc', '\xec', '\x96', '\x97', '\x00', '\x00', '\x00', '\x91',
+  '\x92', '\x82', '\x00', '\x93', '\x94', '\x84', '\x00', '\x86',
+  '\x87', '\x95', '\x00', '\x00', '\x00', '\x85', '\x89', '\x8b',
+  '\x9b', '\xfe', '\x99',
+};
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 2658f3cd99..f8f252d726 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -643,6 +643,12 @@ module	IBM865//		INTERNAL		IBM865		1
 module	INTERNAL		IBM865//		IBM865		1
 
 #	from			to			module		cost
+alias	CP866//			IBM866//
+alias	866//			IBM866//
+module	IBM866//		INTERNAL		IBM866		1
+module	INTERNAL		IBM866//		IBM866		1
+
+#	from			to			module		cost
 alias	CP868//			IBM868//
 alias	CP-AR//			IBM868//
 alias	OSF10020364//		IBM868//
@@ -822,6 +828,11 @@ module	CP1257//		INTERNAL		CP1257		1
 module	INTERNAL		CP1257//		CP1257		1
 
 #	from			to			module		cost
+module	CP1258//		INTERNAL		CP1258		1
+module	INTERNAL		CP1258//		CP1258		1
+
+#	from			to			module		cost
+alias	874//			CP874//
 module	CP874//			INTERNAL		CP874		1
 module	INTERNAL		CP874//			CP874		1
 
@@ -968,6 +979,10 @@ module	MAC-IS//		INTERNAL		MAC-IS		1
 module	INTERNAL		MAC-IS//		MAC-IS		1
 
 #	from			to			module		cost
+module	MAC-UK//		INTERNAL		MAC-UK		1
+module	INTERNAL		MAC-UK//		MAC-UK		1
+
+#	from			to			module		cost
 alias	ISO-IR-9-1//		NATS-DANO//
 module	NATS-DANO//		INTERNAL		NATS-DANO	1
 module	INTERNAL		NATS-DANO//		NATS-DANO	1
diff --git a/iconvdata/ibm866.c b/iconvdata/ibm866.c
new file mode 100644
index 0000000000..9f4d82a9b6
--- /dev/null
+++ b/iconvdata/ibm866.c
@@ -0,0 +1,29 @@
+/* Conversion from and to IBM866.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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 <ibm866.h>
+
+#define CHARSET_NAME	"IBM866//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/mac-uk.c b/iconvdata/mac-uk.c
new file mode 100644
index 0000000000..75c21f3edc
--- /dev/null
+++ b/iconvdata/mac-uk.c
@@ -0,0 +1,29 @@
+/* Conversion from and to MAC-UK.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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 <mac-uk.h>
+
+#define CHARSET_NAME	"MAC-UK//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>