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. 
 

11 files changed, 1163 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d7be3968d..5b07322a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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. 
+ 
 1998-12-15  H.J. Lu  <hjl@gnu.org>
 
 	* sysdeps/posix/tempname.c (__path_search): Fix the maximum
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>
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 93bc0b723a..47b17f5b6d 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-16  Ulrich Drepper  <drepper@cygnus.com>
+
+	* charmaps/IBM866: New file.
+	* charmaps/MAC-UK: New file.
+
 1998-12-13  Ulrich Drepper  <drepper@cygnus.com>
 
 	* charmaps/ISO-8859-13: Correct alias name (LATIN8 -> LATIN7).
diff --git a/localedata/charmaps/IBM866 b/localedata/charmaps/IBM866
new file mode 100644
index 0000000000..04d01055b9
--- /dev/null
+++ b/localedata/charmaps/IBM866
@@ -0,0 +1,365 @@
+<code_set_name> IBM866
+<comment_char> %
+<escape_char> /
+% automatically generated from the charDB
+
+% alias CP866
+% alias 866  
+CHARMAP
+<NU>                   /x00     <U0000> NULL
+<NUL>                  /x00     <U0000> NULL
+<SH>                   /x01     <U0001> START OF HEADING
+<SOH>                  /x01     <U0001> START OF HEADING
+<STX>                  /x02     <U0002> START OF TEXT
+<SX>                   /x02     <U0002> START OF TEXT
+<ETX>                  /x03     <U0003> END OF TEXT
+<EX>                   /x03     <U0003> END OF TEXT
+<EOT>                  /x04     <U0004> END OF TRANSMISSION
+<ET>                   /x04     <U0004> END OF TRANSMISSION
+<ENQ>                  /x05     <U0005> ENQUIRY
+<EQ>                   /x05     <U0005> ENQUIRY
+<ACK>                  /x06     <U0006> ACKNOWLEDGE
+<AK>                   /x06     <U0006> ACKNOWLEDGE
+<BEL>                  /x07     <U0007> BELL
+<BL>                   /x07     <U0007> BELL
+<alert>                /x07     <U0007> BELL
+<BS>                   /x08     <U0008> BACKSPACE
+<backspace>            /x08     <U0008> BACKSPACE
+<HT>                   /x09     <U0009> HORIZONTAL TABULATION
+<tab>                  /x09     <U0009> HORIZONTAL TABULATION
+<LF>                   /x0A     <U000A> LINE FEED
+<newline>              /x0A     <U000A> LINE FEED
+<VT>                   /x0B     <U000B> VERTICAL TABULATION
+<vertical-tab>         /x0B     <U000B> VERTICAL TABULATION
+<FF>                   /x0C     <U000C> FORM FEED
+<form-feed>            /x0C     <U000C> FORM FEED
+<CR>                   /x0D     <U000D> CARRIAGE RETURN
+<carriage-return>      /x0D     <U000D> CARRIAGE RETURN
+<SO>                   /x0E     <U000E> SHIFT OUT
+<SI>                   /x0F     <U000F> SHIFT IN
+<DL>                   /x10     <U0010> DATA LINK ESCAPE
+<DLE>                  /x10     <U0010> DATA LINK ESCAPE
+<D1>                   /x11     <U0011> DEVICE CONTROL ONE
+<DC1>                  /x11     <U0011> DEVICE CONTROL ONE
+<D2>                   /x12     <U0012> DEVICE CONTROL TWO
+<DC2>                  /x12     <U0012> DEVICE CONTROL TWO
+<D3>                   /x13     <U0013> DEVICE CONTROL THREE
+<DC3>                  /x13     <U0013> DEVICE CONTROL THREE
+<D4>                   /x14     <U0014> DEVICE CONTROL FOUR
+<DC4>                  /x14     <U0014> DEVICE CONTROL FOUR
+<NAK>                  /x15     <U0015> NEGATIVE ACKNOWLEDGE
+<NK>                   /x15     <U0015> NEGATIVE ACKNOWLEDGE
+<SY>                   /x16     <U0016> SYNCHRONOUS IDLE
+<SYN>                  /x16     <U0016> SYNCHRONOUS IDLE
+<EB>                   /x17     <U0017> END OF TRANSMISSION BLOCK
+<ETB>                  /x17     <U0017> END OF TRANSMISSION BLOCK
+<CAN>                  /x18     <U0018> CANCEL
+<CN>                   /x18     <U0018> CANCEL
+<EM>                   /x19     <U0019> END OF MEDIUM
+<SB>                   /x1A     <U001A> SUBSTITUTE
+<SUB>                  /x1A     <U001A> SUBSTITUTE
+<EC>                   /x1B     <U001B> ESCAPE
+<ESC>                  /x1B     <U001B> ESCAPE
+<FS>                   /x1C     <U001C> FILE SEPARATOR
+<IS4>                  /x1C     <U001C> FILE SEPARATOR
+<GS>                   /x1D     <U001D> GROUP SEPARATOR
+<IS3>                  /x1D     <U001D> GROUP SEPARATOR
+<intro>                /x1D     <U001D> GROUP SEPARATOR
+<IS2>                  /x1E     <U001E> RECORD SEPARATOR
+<RS>                   /x1E     <U001E> RECORD SEPARATOR
+<IS1>                  /x1F     <U001F> UNIT SEPARATOR
+<US>                   /x1F     <U001F> UNIT SEPARATOR
+<space>                /x20     <U0020> SPACE
+<SP>                   /x20     <U0020> SPACE
+<!>                    /x21     <U0021> EXCLAMATION MARK
+<exclamation-mark>     /x21     <U0021> EXCLAMATION MARK
+<">                    /x22     <U0022> QUOTATION MARK
+<quotation-mark>       /x22     <U0022> QUOTATION MARK
+<Nb>                   /x23     <U0023> NUMBER SIGN
+<number-sign>          /x23     <U0023> NUMBER SIGN
+<H->                   /x23     <U0023> NUMBER SIGN
+<!S>                   /x24     <U0024> DOLLAR SIGN
+<DO>                   /x24     <U0024> DOLLAR SIGN
+<dollar-sign>          /x24     <U0024> DOLLAR SIGN
+<%>                    /x25     <U0025> PERCENT SIGN
+<percent-sign>         /x25     <U0025> PERCENT SIGN
+<percent-sign/>>       /x25     <U0025> PERCENT SIGN
+<&>                    /x26     <U0026> AMPERSAND
+<ampersand>            /x26     <U0026> AMPERSAND
+<'>                    /x27     <U0027> APOSTROPHE
+<apostrophe>           /x27     <U0027> APOSTROPHE
+<(>                    /x28     <U0028> LEFT PARENTHESIS
+<left-parenthesis>     /x28     <U0028> LEFT PARENTHESIS
+<)>                    /x29     <U0029> RIGHT PARENTHESIS
+<right-parenthesis>    /x29     <U0029> RIGHT PARENTHESIS
+<*>                    /x2A     <U002A> ASTERISK
+<asterisk>             /x2A     <U002A> ASTERISK
+<+>                    /x2B     <U002B> PLUS SIGN
+<plus-sign>            /x2B     <U002B> PLUS SIGN
+<,>                    /x2C     <U002C> COMMA
+<comma>                /x2C     <U002C> COMMA
+<->                    /x2D     <U002D> HYPHEN-MINUS
+<hyphen>               /x2D     <U002D> HYPHEN-MINUS
+<hyphen-minus>         /x2D     <U002D> HYPHEN-MINUS
+<.>                    /x2E     <U002E> FULL STOP
+<full-stop>            /x2E     <U002E> FULL STOP
+<period>               /x2E     <U002E> FULL STOP
+<//>                   /x2F     <U002F> SOLIDUS
+<slash>                /x2F     <U002F> SOLIDUS
+<solidus>              /x2F     <U002F> SOLIDUS
+<0>                    /x30     <U0030> DIGIT ZERO
+<zero>                 /x30     <U0030> DIGIT ZERO
+<1>                    /x31     <U0031> DIGIT ONE
+<one>                  /x31     <U0031> DIGIT ONE
+<2>                    /x32     <U0032> DIGIT TWO
+<two>                  /x32     <U0032> DIGIT TWO
+<3>                    /x33     <U0033> DIGIT THREE
+<three>                /x33     <U0033> DIGIT THREE
+<4>                    /x34     <U0034> DIGIT FOUR
+<four>                 /x34     <U0034> DIGIT FOUR
+<5>                    /x35     <U0035> DIGIT FIVE
+<five>                 /x35     <U0035> DIGIT FIVE
+<6>                    /x36     <U0036> DIGIT SIX
+<six>                  /x36     <U0036> DIGIT SIX
+<7>                    /x37     <U0037> DIGIT SEVEN
+<seven>                /x37     <U0037> DIGIT SEVEN
+<8>                    /x38     <U0038> DIGIT EIGHT
+<eight>                /x38     <U0038> DIGIT EIGHT
+<9>                    /x39     <U0039> DIGIT NINE
+<nine>                 /x39     <U0039> DIGIT NINE
+<:>                    /x3A     <U003A> COLON
+<colon>                /x3A     <U003A> COLON
+<;>                    /x3B     <U003B> SEMICOLON
+<semicolon>            /x3B     <U003B> SEMICOLON
+<<>                    /x3C     <U003C> LESS-THAN SIGN
+<less-than-sign>       /x3C     <U003C> LESS-THAN SIGN
+<=>                    /x3D     <U003D> EQUALS SIGN
+<equals-sign>          /x3D     <U003D> EQUALS SIGN
+</>>                   /x3E     <U003E> GREATER-THAN SIGN
+<greater-than-sign>    /x3E     <U003E> GREATER-THAN SIGN
+<?>                    /x3F     <U003F> QUESTION MARK
+<question-mark>        /x3F     <U003F> QUESTION MARK
+<At>                   /x40     <U0040> COMMERCIAL AT
+<commercial-at>        /x40     <U0040> COMMERCIAL AT
+<@>                    /x40     <U0040> COMMERCIAL AT
+<Oa>                   /x40     <U0040> COMMERCIAL AT
+<A>                    /x41     <U0041> LATIN CAPITAL LETTER A
+<B>                    /x42     <U0042> LATIN CAPITAL LETTER B
+<C>                    /x43     <U0043> LATIN CAPITAL LETTER C
+<D>                    /x44     <U0044> LATIN CAPITAL LETTER D
+<E>                    /x45     <U0045> LATIN CAPITAL LETTER E
+<F>                    /x46     <U0046> LATIN CAPITAL LETTER F
+<G>                    /x47     <U0047> LATIN CAPITAL LETTER G
+<H>                    /x48     <U0048> LATIN CAPITAL LETTER H
+<I>                    /x49     <U0049> LATIN CAPITAL LETTER I
+<J>                    /x4A     <U004A> LATIN CAPITAL LETTER J
+<K>                    /x4B     <U004B> LATIN CAPITAL LETTER K
+<L>                    /x4C     <U004C> LATIN CAPITAL LETTER L
+<M>                    /x4D     <U004D> LATIN CAPITAL LETTER M
+<N>                    /x4E     <U004E> LATIN CAPITAL LETTER N
+<O>                    /x4F     <U004F> LATIN CAPITAL LETTER O
+<P>                    /x50     <U0050> LATIN CAPITAL LETTER P
+<Q>                    /x51     <U0051> LATIN CAPITAL LETTER Q
+<R>                    /x52     <U0052> LATIN CAPITAL LETTER R
+<S>                    /x53     <U0053> LATIN CAPITAL LETTER S
+<T>                    /x54     <U0054> LATIN CAPITAL LETTER T
+<U>                    /x55     <U0055> LATIN CAPITAL LETTER U
+<V>                    /x56     <U0056> LATIN CAPITAL LETTER V
+<W>                    /x57     <U0057> LATIN CAPITAL LETTER W
+<X>                    /x58     <U0058> LATIN CAPITAL LETTER X
+<Y>                    /x59     <U0059> LATIN CAPITAL LETTER Y
+<Z>                    /x5A     <U005A> LATIN CAPITAL LETTER Z
+<<(>                   /x5B     <U005B> LEFT SQUARE BRACKET
+<left-square-bracket>  /x5B     <U005B> LEFT SQUARE BRACKET
+<////>                 /x5C     <U005C> REVERSE SOLIDUS
+<backslash>            /x5C     <U005C> REVERSE SOLIDUS
+<reverse-solidus>      /x5C     <U005C> REVERSE SOLIDUS
+<)/>>                  /x5D     <U005D> RIGHT SQUARE BRACKET
+<right-square-bracket> /x5D     <U005D> RIGHT SQUARE BRACKET
+<'/>>                  /x5E     <U005E> CIRCUMFLEX ACCENT
+<circumflex>           /x5E     <U005E> CIRCUMFLEX ACCENT
+<circumflex-accent>    /x5E     <U005E> CIRCUMFLEX ACCENT
+<_>                    /x5F     <U005F> LOW LINE
+<low-line>             /x5F     <U005F> LOW LINE
+<underscore>           /x5F     <U005F> LOW LINE
+<'!>                   /x60     <U0060> GRAVE ACCENT
+<grave-accent>         /x60     <U0060> GRAVE ACCENT
+<a>                    /x61     <U0061> LATIN SMALL LETTER A
+<b>                    /x62     <U0062> LATIN SMALL LETTER B
+<c>                    /x63     <U0063> LATIN SMALL LETTER C
+<d>                    /x64     <U0064> LATIN SMALL LETTER D
+<e>                    /x65     <U0065> LATIN SMALL LETTER E
+<f>                    /x66     <U0066> LATIN SMALL LETTER F
+<g>                    /x67     <U0067> LATIN SMALL LETTER G
+<h>                    /x68     <U0068> LATIN SMALL LETTER H
+<i>                    /x69     <U0069> LATIN SMALL LETTER I
+<j>                    /x6A     <U006A> LATIN SMALL LETTER J
+<k>                    /x6B     <U006B> LATIN SMALL LETTER K
+<l>                    /x6C     <U006C> LATIN SMALL LETTER L
+<m>                    /x6D     <U006D> LATIN SMALL LETTER M
+<n>                    /x6E     <U006E> LATIN SMALL LETTER N
+<o>                    /x6F     <U006F> LATIN SMALL LETTER O
+<p>                    /x70     <U0070> LATIN SMALL LETTER P
+<q>                    /x71     <U0071> LATIN SMALL LETTER Q
+<r>                    /x72     <U0072> LATIN SMALL LETTER R
+<s>                    /x73     <U0073> LATIN SMALL LETTER S
+<t>                    /x74     <U0074> LATIN SMALL LETTER T
+<u>                    /x75     <U0075> LATIN SMALL LETTER U
+<v>                    /x76     <U0076> LATIN SMALL LETTER V
+<w>                    /x77     <U0077> LATIN SMALL LETTER W
+<x>                    /x78     <U0078> LATIN SMALL LETTER X
+<y>                    /x79     <U0079> LATIN SMALL LETTER Y
+<z>                    /x7A     <U007A> LATIN SMALL LETTER Z
+<(!>                   /x7B     <U007B> LEFT CURLY BRACKET
+<left-brace>           /x7B     <U007B> LEFT CURLY BRACKET
+<left-curly-bracket>   /x7B     <U007B> LEFT CURLY BRACKET
+<!!>                   /x7C     <U007C> VERTICAL LINE
+<vertical-line>        /x7C     <U007C> VERTICAL LINE
+<!)>                   /x7D     <U007D> RIGHT CURLY BRACKET
+<right-brace>          /x7D     <U007D> RIGHT CURLY BRACKET
+<right-curly-bracket>  /x7D     <U007D> RIGHT CURLY BRACKET
+<'?>                   /x7E     <U007E> TILDE
+<tilde>                /x7E     <U007E> TILDE
+<DEL>                  /x7F     <U007F> DELETE
+<DT>                   /x7F     <U007F> DELETE
+<A=>                   /x80     <U0410> CYRILLIC CAPITAL LETTER A
+<B=>                   /x81     <U0411> CYRILLIC CAPITAL LETTER BE
+<V=>                   /x82     <U0412> CYRILLIC CAPITAL LETTER VE
+<G=>                   /x83     <U0413> CYRILLIC CAPITAL LETTER GHE
+<D=>                   /x84     <U0414> CYRILLIC CAPITAL LETTER DE
+<E=>                   /x85     <U0415> CYRILLIC CAPITAL LETTER IE
+<Z%>                   /x86     <U0416> CYRILLIC CAPITAL LETTER ZHE
+<Z=>                   /x87     <U0417> CYRILLIC CAPITAL LETTER ZE
+<I=>                   /x88     <U0418> CYRILLIC CAPITAL LETTER I
+<J=>                   /x89     <U0419> CYRILLIC CAPITAL LETTER SHORT I
+<K=>                   /x8A     <U041A> CYRILLIC CAPITAL LETTER KA
+<L=>                   /x8B     <U041B> CYRILLIC CAPITAL LETTER EL
+<M=>                   /x8C     <U041C> CYRILLIC CAPITAL LETTER EM
+<N=>                   /x8D     <U041D> CYRILLIC CAPITAL LETTER EN
+<O=>                   /x8E     <U041E> CYRILLIC CAPITAL LETTER O
+<P=>                   /x8F     <U041F> CYRILLIC CAPITAL LETTER PE
+<R=>                   /x90     <U0420> CYRILLIC CAPITAL LETTER ER
+<S=>                   /x91     <U0421> CYRILLIC CAPITAL LETTER ES
+<T=>                   /x92     <U0422> CYRILLIC CAPITAL LETTER TE
+<U=>                   /x93     <U0423> CYRILLIC CAPITAL LETTER U
+<F=>                   /x94     <U0424> CYRILLIC CAPITAL LETTER EF
+<H=>                   /x95     <U0425> CYRILLIC CAPITAL LETTER HA
+<C=>                   /x96     <U0426> CYRILLIC CAPITAL LETTER TSE
+<C%>                   /x97     <U0427> CYRILLIC CAPITAL LETTER CHE
+<S%>                   /x98     <U0428> CYRILLIC CAPITAL LETTER SHA
+<Sc>                   /x99     <U0429> CYRILLIC CAPITAL LETTER SHCHA
+<=">                   /x9A     <U042A> CYRILLIC CAPITAL LETTER HARD SIGN
+<Y=>                   /x9B     <U042B> CYRILLIC CAPITAL LETTER YERU
+<%">                   /x9C     <U042C> CYRILLIC CAPITAL LETTER SOFT SIGN
+<JE>                   /x9D     <U042D> CYRILLIC CAPITAL LETTER E
+<JU>                   /x9E     <U042E> CYRILLIC CAPITAL LETTER YU
+<JA>                   /x9F     <U042F> CYRILLIC CAPITAL LETTER YA
+<a=>                   /xA0     <U0430> CYRILLIC SMALL LETTER A
+<b=>                   /xA1     <U0431> CYRILLIC SMALL LETTER BE
+<v=>                   /xA2     <U0432> CYRILLIC SMALL LETTER VE
+<g=>                   /xA3     <U0433> CYRILLIC SMALL LETTER GHE
+<d=>                   /xA4     <U0434> CYRILLIC SMALL LETTER DE
+<e=>                   /xA5     <U0435> CYRILLIC SMALL LETTER IE
+<z%>                   /xA6     <U0436> CYRILLIC SMALL LETTER ZHE
+<z=>                   /xA7     <U0437> CYRILLIC SMALL LETTER ZE
+<i=>                   /xA8     <U0438> CYRILLIC SMALL LETTER I
+<j=>                   /xA9     <U0439> CYRILLIC SMALL LETTER SHORT I
+<k=>                   /xAA     <U043A> CYRILLIC SMALL LETTER KA
+<l=>                   /xAB     <U043B> CYRILLIC SMALL LETTER EL
+<m=>                   /xAC     <U043C> CYRILLIC SMALL LETTER EM
+<n=>                   /xAD     <U043D> CYRILLIC SMALL LETTER EN
+<o=>                   /xAE     <U043E> CYRILLIC SMALL LETTER O
+<p=>                   /xAF     <U043F> CYRILLIC SMALL LETTER PE
+<.S>                   /xB0     <U2591> LIGHT SHADE
+<:S>                   /xB1     <U2592> MEDIUM SHADE
+<?S>                   /xB2     <U2593> DARK SHADE
+<vv>                   /xB3     <U2502> BOX DRAWINGS LIGHT VERTICAL
+<_!>                   /xB3     <U2502> BOX DRAWINGS LIGHT VERTICAL
+<vl>                   /xB4     <U2524> BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<_!<>                  /xB4     <U2524> BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<vL>                   /xB5     <U2561> BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+<Vl>                   /xB6     <U2562> BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+<Dl>                   /xB7     <U2556> BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+<dL>                   /xB8     <U2555> BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+<VL>                   /xB9     <U2563> BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+<VV>                   /xBA     <U2551> BOX DRAWINGS DOUBLE VERTICAL
+<LD>                   /xBB     <U2557> BOX DRAWINGS DOUBLE DOWN AND LEFT
+<UL>                   /xBC     <U255D> BOX DRAWINGS DOUBLE UP AND LEFT
+<Ul>                   /xBD     <U255C> BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+<uL>                   /xBE     <U255B> BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+<dl>                   /xBF     <U2510> BOX DRAWINGS LIGHT DOWN AND LEFT
+<_V<w>                 /xBF     <U2510> BOX DRAWINGS LIGHT DOWN AND LEFT
+<ur>                   /xC0     <U2514> BOX DRAWINGS LIGHT UP AND RIGHT
+<_A/>>                 /xC0     <U2514> BOX DRAWINGS LIGHT UP AND RIGHT
+<uh>                   /xC1     <U2534> BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<_-A>                  /xC1     <U2534> BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<dh>                   /xC2     <U252C> BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<_V->                  /xC2     <U252C> BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<vr>                   /xC3     <U251C> BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<_!/>>                 /xC3     <U251C> BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<hh>                   /xC4     <U2500> BOX DRAWINGS LIGHT HORIZONTAL
+<_->                   /xC4     <U2500> BOX DRAWINGS LIGHT HORIZONTAL
+<vh>                   /xC5     <U253C> BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<_!->                  /xC5     <U253C> BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<vR>                   /xC6     <U255E> BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+<Vr>                   /xC7     <U255F> BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+<UR>                   /xC8     <U255A> BOX DRAWINGS DOUBLE UP AND RIGHT
+<DR>                   /xC9     <U2554> BOX DRAWINGS DOUBLE DOWN AND RIGHT
+<UH>                   /xCA     <U2569> BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+<DH>                   /xCB     <U2566> BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+<VR>                   /xCC     <U2560> BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+<HH>                   /xCD     <U2550> BOX DRAWINGS DOUBLE HORIZONTAL
+<VH>                   /xCE     <U256C> BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+<uH>                   /xCF     <U2567> BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+<Uh>                   /xD0     <U2568> BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+<dH>                   /xD1     <U2564> BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+<Dh>                   /xD2     <U2565> BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+<Ur>                   /xD3     <U2559> BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+<uR>                   /xD4     <U2558> BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+<dR>                   /xD5     <U2552> BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+<Dr>                   /xD6     <U2553> BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+<Vh>                   /xD7     <U256B> BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+<vH>                   /xD8     <U256A> BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+<ul>                   /xD9     <U2518> BOX DRAWINGS LIGHT UP AND LEFT
+<_A<>                  /xD9     <U2518> BOX DRAWINGS LIGHT UP AND LEFT
+<dr>                   /xDA     <U250C> BOX DRAWINGS LIGHT DOWN AND RIGHT
+<_V/>>                 /xDA     <U250C> BOX DRAWINGS LIGHT DOWN AND RIGHT
+<FB>                   /xDB     <U2588> FULL BLOCK
+<LB>                   /xDC     <U2584> LOWER HALF BLOCK
+<lB>                   /xDD     <U258C> LEFT HALF BLOCK
+<RB>                   /xDE     <U2590> RIGHT HALF BLOCK
+<TB>                   /xDF     <U2580> UPPER HALF BLOCK
+<r=>                   /xE0     <U0440> CYRILLIC SMALL LETTER ER
+<s=>                   /xE1     <U0441> CYRILLIC SMALL LETTER ES
+<t=>                   /xE2     <U0442> CYRILLIC SMALL LETTER TE
+<u=>                   /xE3     <U0443> CYRILLIC SMALL LETTER U
+<f=>                   /xE4     <U0444> CYRILLIC SMALL LETTER EF
+<h=>                   /xE5     <U0445> CYRILLIC SMALL LETTER HA
+<c=>                   /xE6     <U0446> CYRILLIC SMALL LETTER TSE
+<c%>                   /xE7     <U0447> CYRILLIC SMALL LETTER CHE
+<s%>                   /xE8     <U0448> CYRILLIC SMALL LETTER SHA
+<sc>                   /xE9     <U0449> CYRILLIC SMALL LETTER SHCHA
+<='>                   /xEA     <U044A> CYRILLIC SMALL LETTER HARD SIGN
+<y=>                   /xEB     <U044B> CYRILLIC SMALL LETTER YERU
+<%'>                   /xEC     <U044C> CYRILLIC SMALL LETTER SOFT SIGN
+<je>                   /xED     <U044D> CYRILLIC SMALL LETTER E
+<ju>                   /xEE     <U044E> CYRILLIC SMALL LETTER YU
+<ja>                   /xEF     <U044F> CYRILLIC SMALL LETTER YA
+<IO>                   /xF0     <U0401> CYRILLIC CAPITAL LETTER IO
+<io>                   /xF1     <U0451> CYRILLIC SMALL LETTER IO
+<IE>                   /xF2     <U0404> CYRILLIC CAPITAL LETTER UKRAINIAN IE
+<ie>                   /xF3     <U0454> CYRILLIC SMALL LETTER UKRAINIAN IE
+<YI>                   /xF4     <U0407> CYRILLIC CAPITAL LETTER YI
+<yi>                   /xF5     <U0457> CYRILLIC SMALL LETTER YI
+<V%>                   /xF6     <U040E> CYRILLIC CAPITAL LETTER SHORT U
+<v%>                   /xF7     <U045E> CYRILLIC SMALL LETTER SHORT U
+<DG>                   /xF8     <U00B0> DEGREE SIGN
+<Sb>                   /xF9     <U2219> BULLET OPERATOR
+<.M>                   /xFA     <U00B7> MIDDLE DOT
+<RT>                   /xFB     <U221A> SQUARE ROOT
+<N0>                   /xFC     <U2116> NUMERO SIGN
+<Cu>                   /xFD     <U00A4> CURRENCY SIGN
+<Xo>                   /xFD     <U00A4> CURRENCY SIGN
+<fS>                   /xFE     <U25A0> BLACK SQUARE
+<NS>                   /xFF     <U00A0> NO-BREAK SPACE
+END CHARMAP
diff --git a/localedata/charmaps/MAC-UK b/localedata/charmaps/MAC-UK
new file mode 100644
index 0000000000..f994b7b029
--- /dev/null
+++ b/localedata/charmaps/MAC-UK
@@ -0,0 +1,355 @@
+<code_set_name> MAC-UK
+<comment_char> %
+<escape_char> /
+% automatically generated from the charDB
+
+CHARMAP
+<NU>                   /x00     <U0000> NULL
+<NUL>                  /x00     <U0000> NULL
+<SH>                   /x01     <U0001> START OF HEADING
+<SOH>                  /x01     <U0001> START OF HEADING
+<STX>                  /x02     <U0002> START OF TEXT
+<SX>                   /x02     <U0002> START OF TEXT
+<ETX>                  /x03     <U0003> END OF TEXT
+<EX>                   /x03     <U0003> END OF TEXT
+<EOT>                  /x04     <U0004> END OF TRANSMISSION
+<ET>                   /x04     <U0004> END OF TRANSMISSION
+<ENQ>                  /x05     <U0005> ENQUIRY
+<EQ>                   /x05     <U0005> ENQUIRY
+<ACK>                  /x06     <U0006> ACKNOWLEDGE
+<AK>                   /x06     <U0006> ACKNOWLEDGE
+<BEL>                  /x07     <U0007> BELL
+<BL>                   /x07     <U0007> BELL
+<alert>                /x07     <U0007> BELL
+<BS>                   /x08     <U0008> BACKSPACE
+<backspace>            /x08     <U0008> BACKSPACE
+<HT>                   /x09     <U0009> HORIZONTAL TABULATION
+<tab>                  /x09     <U0009> HORIZONTAL TABULATION
+<LF>                   /x0A     <U000A> LINE FEED
+<newline>              /x0A     <U000A> LINE FEED
+<VT>                   /x0B     <U000B> VERTICAL TABULATION
+<vertical-tab>         /x0B     <U000B> VERTICAL TABULATION
+<FF>                   /x0C     <U000C> FORM FEED
+<form-feed>            /x0C     <U000C> FORM FEED
+<CR>                   /x0D     <U000D> CARRIAGE RETURN
+<carriage-return>      /x0D     <U000D> CARRIAGE RETURN
+<SO>                   /x0E     <U000E> SHIFT OUT
+<SI>                   /x0F     <U000F> SHIFT IN
+<DL>                   /x10     <U0010> DATA LINK ESCAPE
+<DLE>                  /x10     <U0010> DATA LINK ESCAPE
+<D1>                   /x11     <U0011> DEVICE CONTROL ONE
+<DC1>                  /x11     <U0011> DEVICE CONTROL ONE
+<D2>                   /x12     <U0012> DEVICE CONTROL TWO
+<DC2>                  /x12     <U0012> DEVICE CONTROL TWO
+<D3>                   /x13     <U0013> DEVICE CONTROL THREE
+<DC3>                  /x13     <U0013> DEVICE CONTROL THREE
+<D4>                   /x14     <U0014> DEVICE CONTROL FOUR
+<DC4>                  /x14     <U0014> DEVICE CONTROL FOUR
+<NAK>                  /x15     <U0015> NEGATIVE ACKNOWLEDGE
+<NK>                   /x15     <U0015> NEGATIVE ACKNOWLEDGE
+<SY>                   /x16     <U0016> SYNCHRONOUS IDLE
+<SYN>                  /x16     <U0016> SYNCHRONOUS IDLE
+<EB>                   /x17     <U0017> END OF TRANSMISSION BLOCK
+<ETB>                  /x17     <U0017> END OF TRANSMISSION BLOCK
+<CAN>                  /x18     <U0018> CANCEL
+<CN>                   /x18     <U0018> CANCEL
+<EM>                   /x19     <U0019> END OF MEDIUM
+<SB>                   /x1A     <U001A> SUBSTITUTE
+<SUB>                  /x1A     <U001A> SUBSTITUTE
+<EC>                   /x1B     <U001B> ESCAPE
+<ESC>                  /x1B     <U001B> ESCAPE
+<FS>                   /x1C     <U001C> FILE SEPARATOR
+<IS4>                  /x1C     <U001C> FILE SEPARATOR
+<GS>                   /x1D     <U001D> GROUP SEPARATOR
+<IS3>                  /x1D     <U001D> GROUP SEPARATOR
+<intro>                /x1D     <U001D> GROUP SEPARATOR
+<IS2>                  /x1E     <U001E> RECORD SEPARATOR
+<RS>                   /x1E     <U001E> RECORD SEPARATOR
+<IS1>                  /x1F     <U001F> UNIT SEPARATOR
+<US>                   /x1F     <U001F> UNIT SEPARATOR
+<space>                /x20     <U0020> SPACE
+<SP>                   /x20     <U0020> SPACE
+<!>                    /x21     <U0021> EXCLAMATION MARK
+<exclamation-mark>     /x21     <U0021> EXCLAMATION MARK
+<">                    /x22     <U0022> QUOTATION MARK
+<quotation-mark>       /x22     <U0022> QUOTATION MARK
+<Nb>                   /x23     <U0023> NUMBER SIGN
+<number-sign>          /x23     <U0023> NUMBER SIGN
+<H->                   /x23     <U0023> NUMBER SIGN
+<!S>                   /x24     <U0024> DOLLAR SIGN
+<DO>                   /x24     <U0024> DOLLAR SIGN
+<dollar-sign>          /x24     <U0024> DOLLAR SIGN
+<%>                    /x25     <U0025> PERCENT SIGN
+<percent-sign>         /x25     <U0025> PERCENT SIGN
+<percent-sign/>>       /x25     <U0025> PERCENT SIGN
+<&>                    /x26     <U0026> AMPERSAND
+<ampersand>            /x26     <U0026> AMPERSAND
+<'>                    /x27     <U0027> APOSTROPHE
+<apostrophe>           /x27     <U0027> APOSTROPHE
+<(>                    /x28     <U0028> LEFT PARENTHESIS
+<left-parenthesis>     /x28     <U0028> LEFT PARENTHESIS
+<)>                    /x29     <U0029> RIGHT PARENTHESIS
+<right-parenthesis>    /x29     <U0029> RIGHT PARENTHESIS
+<*>                    /x2A     <U002A> ASTERISK
+<asterisk>             /x2A     <U002A> ASTERISK
+<+>                    /x2B     <U002B> PLUS SIGN
+<plus-sign>            /x2B     <U002B> PLUS SIGN
+<,>                    /x2C     <U002C> COMMA
+<comma>                /x2C     <U002C> COMMA
+<->                    /x2D     <U002D> HYPHEN-MINUS
+<hyphen>               /x2D     <U002D> HYPHEN-MINUS
+<hyphen-minus>         /x2D     <U002D> HYPHEN-MINUS
+<.>                    /x2E     <U002E> FULL STOP
+<full-stop>            /x2E     <U002E> FULL STOP
+<period>               /x2E     <U002E> FULL STOP
+<//>                   /x2F     <U002F> SOLIDUS
+<slash>                /x2F     <U002F> SOLIDUS
+<solidus>              /x2F     <U002F> SOLIDUS
+<0>                    /x30     <U0030> DIGIT ZERO
+<zero>                 /x30     <U0030> DIGIT ZERO
+<1>                    /x31     <U0031> DIGIT ONE
+<one>                  /x31     <U0031> DIGIT ONE
+<2>                    /x32     <U0032> DIGIT TWO
+<two>                  /x32     <U0032> DIGIT TWO
+<3>                    /x33     <U0033> DIGIT THREE
+<three>                /x33     <U0033> DIGIT THREE
+<4>                    /x34     <U0034> DIGIT FOUR
+<four>                 /x34     <U0034> DIGIT FOUR
+<5>                    /x35     <U0035> DIGIT FIVE
+<five>                 /x35     <U0035> DIGIT FIVE
+<6>                    /x36     <U0036> DIGIT SIX
+<six>                  /x36     <U0036> DIGIT SIX
+<7>                    /x37     <U0037> DIGIT SEVEN
+<seven>                /x37     <U0037> DIGIT SEVEN
+<8>                    /x38     <U0038> DIGIT EIGHT
+<eight>                /x38     <U0038> DIGIT EIGHT
+<9>                    /x39     <U0039> DIGIT NINE
+<nine>                 /x39     <U0039> DIGIT NINE
+<:>                    /x3A     <U003A> COLON
+<colon>                /x3A     <U003A> COLON
+<;>                    /x3B     <U003B> SEMICOLON
+<semicolon>            /x3B     <U003B> SEMICOLON
+<<>                    /x3C     <U003C> LESS-THAN SIGN
+<less-than-sign>       /x3C     <U003C> LESS-THAN SIGN
+<=>                    /x3D     <U003D> EQUALS SIGN
+<equals-sign>          /x3D     <U003D> EQUALS SIGN
+</>>                   /x3E     <U003E> GREATER-THAN SIGN
+<greater-than-sign>    /x3E     <U003E> GREATER-THAN SIGN
+<?>                    /x3F     <U003F> QUESTION MARK
+<question-mark>        /x3F     <U003F> QUESTION MARK
+<At>                   /x40     <U0040> COMMERCIAL AT
+<commercial-at>        /x40     <U0040> COMMERCIAL AT
+<@>                    /x40     <U0040> COMMERCIAL AT
+<Oa>                   /x40     <U0040> COMMERCIAL AT
+<A>                    /x41     <U0041> LATIN CAPITAL LETTER A
+<B>                    /x42     <U0042> LATIN CAPITAL LETTER B
+<C>                    /x43     <U0043> LATIN CAPITAL LETTER C
+<D>                    /x44     <U0044> LATIN CAPITAL LETTER D
+<E>                    /x45     <U0045> LATIN CAPITAL LETTER E
+<F>                    /x46     <U0046> LATIN CAPITAL LETTER F
+<G>                    /x47     <U0047> LATIN CAPITAL LETTER G
+<H>                    /x48     <U0048> LATIN CAPITAL LETTER H
+<I>                    /x49     <U0049> LATIN CAPITAL LETTER I
+<J>                    /x4A     <U004A> LATIN CAPITAL LETTER J
+<K>                    /x4B     <U004B> LATIN CAPITAL LETTER K
+<L>                    /x4C     <U004C> LATIN CAPITAL LETTER L
+<M>                    /x4D     <U004D> LATIN CAPITAL LETTER M
+<N>                    /x4E     <U004E> LATIN CAPITAL LETTER N
+<O>                    /x4F     <U004F> LATIN CAPITAL LETTER O
+<P>                    /x50     <U0050> LATIN CAPITAL LETTER P
+<Q>                    /x51     <U0051> LATIN CAPITAL LETTER Q
+<R>                    /x52     <U0052> LATIN CAPITAL LETTER R
+<S>                    /x53     <U0053> LATIN CAPITAL LETTER S
+<T>                    /x54     <U0054> LATIN CAPITAL LETTER T
+<U>                    /x55     <U0055> LATIN CAPITAL LETTER U
+<V>                    /x56     <U0056> LATIN CAPITAL LETTER V
+<W>                    /x57     <U0057> LATIN CAPITAL LETTER W
+<X>                    /x58     <U0058> LATIN CAPITAL LETTER X
+<Y>                    /x59     <U0059> LATIN CAPITAL LETTER Y
+<Z>                    /x5A     <U005A> LATIN CAPITAL LETTER Z
+<<(>                   /x5B     <U005B> LEFT SQUARE BRACKET
+<left-square-bracket>  /x5B     <U005B> LEFT SQUARE BRACKET
+<////>                 /x5C     <U005C> REVERSE SOLIDUS
+<backslash>            /x5C     <U005C> REVERSE SOLIDUS
+<reverse-solidus>      /x5C     <U005C> REVERSE SOLIDUS
+<)/>>                  /x5D     <U005D> RIGHT SQUARE BRACKET
+<right-square-bracket> /x5D     <U005D> RIGHT SQUARE BRACKET
+<'/>>                  /x5E     <U005E> CIRCUMFLEX ACCENT
+<circumflex>           /x5E     <U005E> CIRCUMFLEX ACCENT
+<circumflex-accent>    /x5E     <U005E> CIRCUMFLEX ACCENT
+<_>                    /x5F     <U005F> LOW LINE
+<low-line>             /x5F     <U005F> LOW LINE
+<underscore>           /x5F     <U005F> LOW LINE
+<'!>                   /x60     <U0060> GRAVE ACCENT
+<grave-accent>         /x60     <U0060> GRAVE ACCENT
+<a>                    /x61     <U0061> LATIN SMALL LETTER A
+<b>                    /x62     <U0062> LATIN SMALL LETTER B
+<c>                    /x63     <U0063> LATIN SMALL LETTER C
+<d>                    /x64     <U0064> LATIN SMALL LETTER D
+<e>                    /x65     <U0065> LATIN SMALL LETTER E
+<f>                    /x66     <U0066> LATIN SMALL LETTER F
+<g>                    /x67     <U0067> LATIN SMALL LETTER G
+<h>                    /x68     <U0068> LATIN SMALL LETTER H
+<i>                    /x69     <U0069> LATIN SMALL LETTER I
+<j>                    /x6A     <U006A> LATIN SMALL LETTER J
+<k>                    /x6B     <U006B> LATIN SMALL LETTER K
+<l>                    /x6C     <U006C> LATIN SMALL LETTER L
+<m>                    /x6D     <U006D> LATIN SMALL LETTER M
+<n>                    /x6E     <U006E> LATIN SMALL LETTER N
+<o>                    /x6F     <U006F> LATIN SMALL LETTER O
+<p>                    /x70     <U0070> LATIN SMALL LETTER P
+<q>                    /x71     <U0071> LATIN SMALL LETTER Q
+<r>                    /x72     <U0072> LATIN SMALL LETTER R
+<s>                    /x73     <U0073> LATIN SMALL LETTER S
+<t>                    /x74     <U0074> LATIN SMALL LETTER T
+<u>                    /x75     <U0075> LATIN SMALL LETTER U
+<v>                    /x76     <U0076> LATIN SMALL LETTER V
+<w>                    /x77     <U0077> LATIN SMALL LETTER W
+<x>                    /x78     <U0078> LATIN SMALL LETTER X
+<y>                    /x79     <U0079> LATIN SMALL LETTER Y
+<z>                    /x7A     <U007A> LATIN SMALL LETTER Z
+<(!>                   /x7B     <U007B> LEFT CURLY BRACKET
+<left-brace>           /x7B     <U007B> LEFT CURLY BRACKET
+<left-curly-bracket>   /x7B     <U007B> LEFT CURLY BRACKET
+<!!>                   /x7C     <U007C> VERTICAL LINE
+<vertical-line>        /x7C     <U007C> VERTICAL LINE
+<!)>                   /x7D     <U007D> RIGHT CURLY BRACKET
+<right-brace>          /x7D     <U007D> RIGHT CURLY BRACKET
+<right-curly-bracket>  /x7D     <U007D> RIGHT CURLY BRACKET
+<'?>                   /x7E     <U007E> TILDE
+<tilde>                /x7E     <U007E> TILDE
+<DEL>                  /x7F     <U007F> DELETE
+<DT>                   /x7F     <U007F> DELETE
+<A=>                   /x80     <U0410> CYRILLIC CAPITAL LETTER A
+<B=>                   /x81     <U0411> CYRILLIC CAPITAL LETTER BE
+<V=>                   /x82     <U0412> CYRILLIC CAPITAL LETTER VE
+<G=>                   /x83     <U0413> CYRILLIC CAPITAL LETTER GHE
+<D=>                   /x84     <U0414> CYRILLIC CAPITAL LETTER DE
+<E=>                   /x85     <U0415> CYRILLIC CAPITAL LETTER IE
+<Z%>                   /x86     <U0416> CYRILLIC CAPITAL LETTER ZHE
+<Z=>                   /x87     <U0417> CYRILLIC CAPITAL LETTER ZE
+<I=>                   /x88     <U0418> CYRILLIC CAPITAL LETTER I
+<J=>                   /x89     <U0419> CYRILLIC CAPITAL LETTER SHORT I
+<K=>                   /x8A     <U041A> CYRILLIC CAPITAL LETTER KA
+<L=>                   /x8B     <U041B> CYRILLIC CAPITAL LETTER EL
+<M=>                   /x8C     <U041C> CYRILLIC CAPITAL LETTER EM
+<N=>                   /x8D     <U041D> CYRILLIC CAPITAL LETTER EN
+<O=>                   /x8E     <U041E> CYRILLIC CAPITAL LETTER O
+<P=>                   /x8F     <U041F> CYRILLIC CAPITAL LETTER PE
+<R=>                   /x90     <U0420> CYRILLIC CAPITAL LETTER ER
+<S=>                   /x91     <U0421> CYRILLIC CAPITAL LETTER ES
+<T=>                   /x92     <U0422> CYRILLIC CAPITAL LETTER TE
+<U=>                   /x93     <U0423> CYRILLIC CAPITAL LETTER U
+<F=>                   /x94     <U0424> CYRILLIC CAPITAL LETTER EF
+<H=>                   /x95     <U0425> CYRILLIC CAPITAL LETTER HA
+<C=>                   /x96     <U0426> CYRILLIC CAPITAL LETTER TSE
+<C%>                   /x97     <U0427> CYRILLIC CAPITAL LETTER CHE
+<S%>                   /x98     <U0428> CYRILLIC CAPITAL LETTER SHA
+<Sc>                   /x99     <U0429> CYRILLIC CAPITAL LETTER SHCHA
+<=">                   /x9A     <U042A> CYRILLIC CAPITAL LETTER HARD SIGN
+<Y=>                   /x9B     <U042B> CYRILLIC CAPITAL LETTER YERU
+<%">                   /x9C     <U042C> CYRILLIC CAPITAL LETTER SOFT SIGN
+<JE>                   /x9D     <U042D> CYRILLIC CAPITAL LETTER E
+<JU>                   /x9E     <U042E> CYRILLIC CAPITAL LETTER YU
+<JA>                   /x9F     <U042F> CYRILLIC CAPITAL LETTER YA
+<//->                  /xA0     <U2020> DAGGER
+<DG>                   /xA1     <U00B0> DEGREE SIGN
+<G3>                   /xA2     <U0490> CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+<L->                   /xA3     <U00A3> POUND SIGN
+<Pd>                   /xA3     <U00A3> POUND SIGN
+<SE>                   /xA4     <U00A7> SECTION SIGN
+<sb>                   /xA5     <U2022> BULLET
+<PI>                   /xA6     <U00B6> PILCROW SIGN
+<9I>                   /xA6     <U00B6> PILCROW SIGN
+<II>                   /xA7     <U0406> CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+<Rg>                   /xA8     <U00AE> REGISTERED SIGN
+<Co>                   /xA9     <U00A9> COPYRIGHT SIGN
+<TM>                   /xAA     <U2122> TRADE MARK SIGN
+<D%>                   /xAB     <U0402> CYRILLIC CAPITAL LETTER DJE
+<d%>                   /xAC     <U0452> CYRILLIC SMALL LETTER DJE
+<!=>                   /xAD     <U2260> NOT EQUAL TO
+<G%>                   /xAE     <U0403> CYRILLIC CAPITAL LETTER GJE
+<g%>                   /xAF     <U0453> CYRILLIC SMALL LETTER GJE
+<00>                   /xB0     <U221E> INFINITY
+<+->                   /xB1     <U00B1> PLUS-MINUS SIGN
+<=<>                   /xB2     <U2264> LESS-THAN OR EQUAL TO
+</>=>                  /xB3     <U2265> GREATER-THAN OR EQUAL TO
+<ii>                   /xB4     <U0456> CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+<My>                   /xB5     <U00B5> MICRO SIGN
+<g3>                   /xB6     <U0491> CYRILLIC SMALL LETTER GHE WITH UPTURN
+<J%>                   /xB7     <U0408> CYRILLIC CAPITAL LETTER JE
+<IE>                   /xB8     <U0404> CYRILLIC CAPITAL LETTER UKRAINIAN IE
+<ie>                   /xB9     <U0454> CYRILLIC SMALL LETTER UKRAINIAN IE
+<YI>                   /xBA     <U0407> CYRILLIC CAPITAL LETTER YI
+<yi>                   /xBB     <U0457> CYRILLIC SMALL LETTER YI
+<LJ>                   /xBC     <U0409> CYRILLIC CAPITAL LETTER LJE
+<lj>                   /xBD     <U0459> CYRILLIC SMALL LETTER LJE
+<NJ>                   /xBE     <U040A> CYRILLIC CAPITAL LETTER NJE
+<nj>                   /xBF     <U045A> CYRILLIC SMALL LETTER NJE
+<j%>                   /xC0     <U0458> CYRILLIC SMALL LETTER JE
+<DS>                   /xC1     <U0405> CYRILLIC CAPITAL LETTER DZE
+<NO>                   /xC2     <U00AC> NOT SIGN
+<7!>                   /xC2     <U00AC> NOT SIGN
+<RT>                   /xC3     <U221A> SQUARE ROOT
+<f2>                   /xC4     <U0192> LATIN SMALL LETTER F WITH HOOK
+<?2>                   /xC5     <U2248> ALMOST EQUAL TO
+<DE>                   /xC6     <U2206> INCREMENT
+<<<>                   /xC7     <U00AB> LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+</>/>>                 /xC8     <U00BB> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<.3>                   /xC9     <U2026> HORIZONTAL ELLIPSIS
+<NS>                   /xCA     <U00A0> NO-BREAK SPACE
+<Ts>                   /xCB     <U040B> CYRILLIC CAPITAL LETTER TSHE
+<ts>                   /xCC     <U045B> CYRILLIC SMALL LETTER TSHE
+<KJ>                   /xCD     <U040C> CYRILLIC CAPITAL LETTER KJE
+<kj>                   /xCE     <U045C> CYRILLIC SMALL LETTER KJE
+<ds>                   /xCF     <U0455> CYRILLIC SMALL LETTER DZE
+<-N>                   /xD0     <U2013> EN DASH
+<-M>                   /xD1     <U2014> EM DASH
+<"6>                   /xD2     <U201C> LEFT DOUBLE QUOTATION MARK
+<"9>                   /xD3     <U201D> RIGHT DOUBLE QUOTATION MARK
+<'6>                   /xD4     <U2018> LEFT SINGLE QUOTATION MARK
+<'9>                   /xD5     <U2019> RIGHT SINGLE QUOTATION MARK
+<-:>                   /xD6     <U00F7> DIVISION SIGN
+<:9>                   /xD7     <U201E> DOUBLE LOW-9 QUOTATION MARK
+<V%>                   /xD8     <U040E> CYRILLIC CAPITAL LETTER SHORT U
+<v%>                   /xD9     <U045E> CYRILLIC SMALL LETTER SHORT U
+<DZ>                   /xDA     <U040F> CYRILLIC CAPITAL LETTER DZHE
+<dz>                   /xDB     <U045F> CYRILLIC SMALL LETTER DZHE
+<N0>                   /xDC     <U2116> NUMERO SIGN
+<IO>                   /xDD     <U0401> CYRILLIC CAPITAL LETTER IO
+<io>                   /xDE     <U0451> CYRILLIC SMALL LETTER IO
+<ja>                   /xDF     <U044F> CYRILLIC SMALL LETTER YA
+<a=>                   /xE0     <U0430> CYRILLIC SMALL LETTER A
+<b=>                   /xE1     <U0431> CYRILLIC SMALL LETTER BE
+<v=>                   /xE2     <U0432> CYRILLIC SMALL LETTER VE
+<g=>                   /xE3     <U0433> CYRILLIC SMALL LETTER GHE
+<d=>                   /xE4     <U0434> CYRILLIC SMALL LETTER DE
+<e=>                   /xE5     <U0435> CYRILLIC SMALL LETTER IE
+<z%>                   /xE6     <U0436> CYRILLIC SMALL LETTER ZHE
+<z=>                   /xE7     <U0437> CYRILLIC SMALL LETTER ZE
+<i=>                   /xE8     <U0438> CYRILLIC SMALL LETTER I
+<j=>                   /xE9     <U0439> CYRILLIC SMALL LETTER SHORT I
+<k=>                   /xEA     <U043A> CYRILLIC SMALL LETTER KA
+<l=>                   /xEB     <U043B> CYRILLIC SMALL LETTER EL
+<m=>                   /xEC     <U043C> CYRILLIC SMALL LETTER EM
+<n=>                   /xED     <U043D> CYRILLIC SMALL LETTER EN
+<o=>                   /xEE     <U043E> CYRILLIC SMALL LETTER O
+<p=>                   /xEF     <U043F> CYRILLIC SMALL LETTER PE
+<r=>                   /xF0     <U0440> CYRILLIC SMALL LETTER ER
+<s=>                   /xF1     <U0441> CYRILLIC SMALL LETTER ES
+<t=>                   /xF2     <U0442> CYRILLIC SMALL LETTER TE
+<u=>                   /xF3     <U0443> CYRILLIC SMALL LETTER U
+<f=>                   /xF4     <U0444> CYRILLIC SMALL LETTER EF
+<h=>                   /xF5     <U0445> CYRILLIC SMALL LETTER HA
+<c=>                   /xF6     <U0446> CYRILLIC SMALL LETTER TSE
+<c%>                   /xF7     <U0447> CYRILLIC SMALL LETTER CHE
+<s%>                   /xF8     <U0448> CYRILLIC SMALL LETTER SHA
+<sc>                   /xF9     <U0449> CYRILLIC SMALL LETTER SHCHA
+<='>                   /xFA     <U044A> CYRILLIC SMALL LETTER HARD SIGN
+<y=>                   /xFB     <U044B> CYRILLIC SMALL LETTER YERU
+<%'>                   /xFC     <U044C> CYRILLIC SMALL LETTER SOFT SIGN
+<je>                   /xFD     <U044D> CYRILLIC SMALL LETTER E
+<ju>                   /xFE     <U044E> CYRILLIC SMALL LETTER YU
+<Cu>                   /xFF     <U00A4> CURRENCY SIGN
+<Xo>                   /xFF     <U00A4> CURRENCY SIGN
+END CHARMAP
diff --git a/sysdeps/gnu/bits/ipc.h b/sysdeps/gnu/bits/ipc.h
index 908647c1e4..c4e37358e8 100644
--- a/sysdeps/gnu/bits/ipc.h
+++ b/sysdeps/gnu/bits/ipc.h
@@ -48,25 +48,3 @@ struct ipc_perm
     unsigned short int mode;		/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
   };
-
-
-__BEGIN_DECLS
-
-/* The actual system call: all functions are multiplexed by this.  */
-extern int __ipc __P ((int __call, int __first, int __second, int __third,
-		       void *__ptr));
-
-__END_DECLS
-
-/* The codes for the functions to use the multiplexer `__ipc'.  */
-#define IPCOP_semop	 1
-#define IPCOP_semget	 2
-#define IPCOP_semctl	 3
-#define IPCOP_msgsnd	11
-#define IPCOP_msgrcv	12
-#define IPCOP_msgget	13
-#define IPCOP_msgctl	14
-#define IPCOP_shmat	21
-#define IPCOP_shmdt	22
-#define IPCOP_shmget	23
-#define IPCOP_shmctl	24