aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-31 23:14:10 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-31 23:14:10 +0000
commitb669ab02b7f37272df926eb18639896ffbdf8949 (patch)
tree85f3ca9057a6f3d60fce351f3e21238c2deeee41
parent5134584a32101dad1ed7691a25cf3309c2994e50 (diff)
downloadglibc-b669ab02b7f37272df926eb18639896ffbdf8949.tar
glibc-b669ab02b7f37272df926eb18639896ffbdf8949.tar.gz
glibc-b669ab02b7f37272df926eb18639896ffbdf8949.tar.bz2
glibc-b669ab02b7f37272df926eb18639896ffbdf8949.zip
Update.
2000-07-31 Andreas Jaeger <aj@suse.de> * inet/Versions: Remove getipnodebyaddr and friends from GLIBC_2.2. * resolv/netdb.h: Remove getipnodebyaddr and friends.
-rw-r--r--ChangeLog7
-rw-r--r--FAQ39
-rw-r--r--FAQ.in3
-rw-r--r--inet/Versions4
-rw-r--r--localedata/ChangeLog26
-rw-r--r--localedata/charmaps/BIG588
-rw-r--r--localedata/charmaps/CP737269
-rw-r--r--localedata/charmaps/CP775269
-rw-r--r--localedata/charmaps/GB231287
-rw-r--r--localedata/charmaps/GBK4
-rw-r--r--localedata/charmaps/KSX10014
-rw-r--r--localedata/charmaps/UTF-82
-rw-r--r--resolv/netdb.h25
13 files changed, 600 insertions, 227 deletions
diff --git a/ChangeLog b/ChangeLog
index c117eebed3..028cc34b0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-31 Andreas Jaeger <aj@suse.de>
+
+ * inet/Versions: Remove getipnodebyaddr and friends from
+ GLIBC_2.2.
+
+ * resolv/netdb.h: Remove getipnodebyaddr and friends.
+
2000-07-30 Bruno Haible <haible@clisp.cons.org>
* iconvdata/sjis.c (BODY for FROM_LOOP): Treat the case
diff --git a/FAQ b/FAQ
index ce2f69a8f6..93e7d1add4 100644
--- a/FAQ
+++ b/FAQ
@@ -58,6 +58,9 @@ please let me know.
2.5. When linking with the new libc I get unresolved symbols
`crypt' and `setkey'. Why aren't these functions in the
libc anymore?
+
+
+Removed. Does not apply anymore.
2.6. When I use GNU libc on my Linux system by linking against
the libc.so which comes with glibc all I get is a core dump.
2.7. Looking through the shared libc file I haven't found the
@@ -398,8 +401,8 @@ errors while linking before deciding there is a problem.
1.11. What are these `add-ons'?
{UD} To avoid complications with export rules or external source code some
-optional parts of the libc are distributed as separate packages (e.g., the
-crypt package, see question 2.5).
+optional parts of the libc are distributed as separate packages, e.g., the
+linuxthreads package.
To use these packages as part of GNU libc, just unpack the tarfiles in the
libc source directory and tell the configuration script about them using the
@@ -408,7 +411,7 @@ to find all the add-on packages in your source tree. This may not work. If
it doesn't, or if you want to select only a subset of the add-ons, give a
comma-separated list of the add-ons to enable:
- configure --enable-add-ons=crypt,linuxthreads
+ configure --enable-add-ons=linuxthreads
for example.
@@ -418,9 +421,13 @@ else. The existing makefiles do most of the work; only some few stub rules
must be written to get everything running.
Most add-ons are tightly coupled to a specific GNU libc version. Please
-check that the add-ons work with the GNU libc. For example the crypt and
-linuxthreads add-ons have the same numbering scheme as the libc and will in
-general only work with the corresponding libc.
+check that the add-ons work with the GNU libc. For example the linuxthreads
+add-on has the same numbering scheme as the libc and will in general only
+work with the corresponding libc.
+
+{AJ} With glibc 2.2 the crypt add-on and with glibc 2.1 the localedata
+add-on have been integrated into the normal glibc distribution, crypt and
+localedata are therefore not anymore add-ons.
1.12. My XXX kernel emulates a floating-point coprocessor for me.
@@ -667,20 +674,10 @@ question 3.8 for details.
`crypt' and `setkey'. Why aren't these functions in the
libc anymore?
-{UD} The US places restrictions on exporting cryptographic programs and
-source code. Until this law gets abolished we cannot ship the cryptographic
-functions together with glibc.
-The functions are available, as an add-on (see question 1.11). People in the US
-may get it from the same place they got GNU libc from. People outside the
-US should get the code from ftp.gwdg.de [134.76.11.100] in the directory
-pub/linux/glibc, or another archive site outside the USA. The README explains
-how to install the sources.
+Removed. Does not apply anymore.
+
-If you already have the crypt code on your system the reason for the failure
-is probably that you did not link with -lcrypt. The crypto functions are in
-a separate library to make it possible to export GNU libc binaries from the
-US.
2.6. When I use GNU libc on my Linux system by linking against
@@ -1305,9 +1302,6 @@ the one library cannot be read by functions from the other library. Sorry,
but this is what a major release is for. It's better to have a cut now than
having no means to support the new techniques later.
-{MK} There is however a (partial) solution for this problem. Please take a
-look at the file `login/README.utmpd'.
-
3.3. Where are the DST_* constants found in <sys/time.h> on many
systems?
@@ -1682,8 +1676,7 @@ latest 2.1.x release you can find. As of 98/11/26 the currently recommended
kernel for IPv6 is 2.1.129.
Also, as of the 2.1 release the IPv6 API provided by GNU libc is not
-100% complete. In particular the getipnodebyname and getipnodebyaddr
-functions are not implemented.
+100% complete.
4.3. When I set the timezone by setting the TZ environment variable
diff --git a/FAQ.in b/FAQ.in
index d010ef8e93..3b4e531ddd 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -1425,8 +1425,7 @@ latest 2.1.x release you can find. As of 98/11/26 the currently recommended
kernel for IPv6 is 2.1.129.
Also, as of the 2.1 release the IPv6 API provided by GNU libc is not
-100% complete. In particular the getipnodebyname and getipnodebyaddr
-functions are not implemented.
+100% complete.
??tzdb When I set the timezone by setting the TZ environment variable
to EST5EDT things go wrong since glibc computes the wrong time
diff --git a/inet/Versions b/inet/Versions
index 6a37851093..1b1baa5b35 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -63,10 +63,6 @@ libc {
getservbyname_r;
}
GLIBC_2.2 {
- # f*
- freehostent;
- # g*
- getipnodebyaddr;
# i*
iruserok_af;
# r*
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 353191b980..fa090d4c6a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,29 @@
+2000-07-31 Ulrich Drepper <drepper@redhat.com>
+
+ * charmaps/KSX1001: Add width information.
+ * charmaps/GB2312: Likewise.
+ * charmaps/GBK: Likewise.
+ Patches by GOTO Masanori <gotom@debian.or.jp>.
+
+2000-07-30 Bruno Haible <haible@clisp.cons.org>
+
+ * charmaps/CP737: New file.
+ * charmaps/CP775: New file.
+
+2000-07-30 Bruno Haible <haible@clisp.cons.org>
+
+ * charmaps/GB2312: Remove single-byte entries for /xa1../xa9 and
+ /xb0../xf7. Remove aliases.
+
+2000-07-30 Bruno Haible <haible@clisp.cons.org>
+
+ * charmaps/BIG5: Remove single-byte entries for /xa1../xc7 and
+ /xc9../xf9.
+
+2000-07-30 Bruno Haible <haible@clisp.cons.org>
+
+ * charmaps/UTF-8: Remove duplicate entries for U+4DB5 and U+4E00.
+
2000-07-29 Ulrich Drepper <drepper@redhat.com>
* tst-langinfo.c (main): Fix esacape sequence handling.
diff --git a/localedata/charmaps/BIG5 b/localedata/charmaps/BIG5
index e103d7ce34..a4d6c64361 100644
--- a/localedata/charmaps/BIG5
+++ b/localedata/charmaps/BIG5
@@ -179,95 +179,7 @@ CHARMAP
<U009E> /x9e PRIVACY MESSAGE (PM)
<U009F> /x9f APPLICATION PROGRAM COMMAND (APC)
<U00A0> /xa0 NO-BREAK SPACE
-<U00A1> /xa1 INVERTED EXCLAMATION MARK
-<U00A2> /xa2 CENT SIGN
-<U00A3> /xa3 POUND SIGN
-<U00A4> /xa4 CURRENCY SIGN
-<U00A5> /xa5 YEN SIGN
-<U00A6> /xa6 BROKEN BAR
-<U00A7> /xa7 SECTION SIGN
-<U00A8> /xa8 DIAERESIS
-<U00A9> /xa9 COPYRIGHT SIGN
-<U00AA> /xaa FEMININE ORDINAL INDICATOR
-<U00AB> /xab LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-<U00AC> /xac NOT SIGN
-<U00AD> /xad SOFT HYPHEN
-<U00AE> /xae REGISTERED SIGN
-<U00AF> /xaf MACRON
-<U00B0> /xb0 DEGREE SIGN
-<U00B1> /xb1 PLUS-MINUS SIGN
-<U00B2> /xb2 SUPERSCRIPT TWO
-<U00B3> /xb3 SUPERSCRIPT THREE
-<U00B4> /xb4 ACUTE ACCENT
-<U00B5> /xb5 MICRO SIGN
-<U00B6> /xb6 PILCROW SIGN
-<U00B7> /xb7 MIDDLE DOT
-<U00B8> /xb8 CEDILLA
-<U00B9> /xb9 SUPERSCRIPT ONE
-<U00BA> /xba MASCULINE ORDINAL INDICATOR
-<U00BB> /xbb RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-<U00BC> /xbc VULGAR FRACTION ONE QUARTER
-<U00BD> /xbd VULGAR FRACTION ONE HALF
-<U00BE> /xbe VULGAR FRACTION THREE QUARTERS
-<U00BF> /xbf INVERTED QUESTION MARK
-<U00C0> /xc0 LATIN CAPITAL LETTER A WITH GRAVE
-<U00C1> /xc1 LATIN CAPITAL LETTER A WITH ACUTE
-<U00C2> /xc2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-<U00C3> /xc3 LATIN CAPITAL LETTER A WITH TILDE
-<U00C4> /xc4 LATIN CAPITAL LETTER A WITH DIAERESIS
-<U00C5> /xc5 LATIN CAPITAL LETTER A WITH RING ABOVE
-<U00C6> /xc6 LATIN CAPITAL LETTER AE
-<U00C7> /xc7 LATIN CAPITAL LETTER C WITH CEDILLA
<U00C8> /xc8 LATIN CAPITAL LETTER E WITH GRAVE
-<U00C9> /xc9 LATIN CAPITAL LETTER E WITH ACUTE
-<U00CA> /xca LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-<U00CB> /xcb LATIN CAPITAL LETTER E WITH DIAERESIS
-<U00CC> /xcc LATIN CAPITAL LETTER I WITH GRAVE
-<U00CD> /xcd LATIN CAPITAL LETTER I WITH ACUTE
-<U00CE> /xce LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-<U00CF> /xcf LATIN CAPITAL LETTER I WITH DIAERESIS
-<U00D0> /xd0 LATIN CAPITAL LETTER ETH (Icelandic)
-<U00D1> /xd1 LATIN CAPITAL LETTER N WITH TILDE
-<U00D2> /xd2 LATIN CAPITAL LETTER O WITH GRAVE
-<U00D3> /xd3 LATIN CAPITAL LETTER O WITH ACUTE
-<U00D4> /xd4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-<U00D5> /xd5 LATIN CAPITAL LETTER O WITH TILDE
-<U00D6> /xd6 LATIN CAPITAL LETTER O WITH DIAERESIS
-<U00D7> /xd7 MULTIPLICATION SIGN
-<U00D8> /xd8 LATIN CAPITAL LETTER O WITH STROKE
-<U00D9> /xd9 LATIN CAPITAL LETTER U WITH GRAVE
-<U00DA> /xda LATIN CAPITAL LETTER U WITH ACUTE
-<U00DB> /xdb LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-<U00DC> /xdc LATIN CAPITAL LETTER U WITH DIAERESIS
-<U00DD> /xdd LATIN CAPITAL LETTER Y WITH ACUTE
-<U00DE> /xde LATIN CAPITAL LETTER THORN (Icelandic)
-<U00DF> /xdf LATIN SMALL LETTER SHARP S (German)
-<U00E0> /xe0 LATIN SMALL LETTER A WITH GRAVE
-<U00E1> /xe1 LATIN SMALL LETTER A WITH ACUTE
-<U00E2> /xe2 LATIN SMALL LETTER A WITH CIRCUMFLEX
-<U00E3> /xe3 LATIN SMALL LETTER A WITH TILDE
-<U00E4> /xe4 LATIN SMALL LETTER A WITH DIAERESIS
-<U00E5> /xe5 LATIN SMALL LETTER A WITH RING ABOVE
-<U00E6> /xe6 LATIN SMALL LETTER AE
-<U00E7> /xe7 LATIN SMALL LETTER C WITH CEDILLA
-<U00E8> /xe8 LATIN SMALL LETTER E WITH GRAVE
-<U00E9> /xe9 LATIN SMALL LETTER E WITH ACUTE
-<U00EA> /xea LATIN SMALL LETTER E WITH CIRCUMFLEX
-<U00EB> /xeb LATIN SMALL LETTER E WITH DIAERESIS
-<U00EC> /xec LATIN SMALL LETTER I WITH GRAVE
-<U00ED> /xed LATIN SMALL LETTER I WITH ACUTE
-<U00EE> /xee LATIN SMALL LETTER I WITH CIRCUMFLEX
-<U00EF> /xef LATIN SMALL LETTER I WITH DIAERESIS
-<U00F0> /xf0 LATIN SMALL LETTER ETH (Icelandic)
-<U00F1> /xf1 LATIN SMALL LETTER N WITH TILDE
-<U00F2> /xf2 LATIN SMALL LETTER O WITH GRAVE
-<U00F3> /xf3 LATIN SMALL LETTER O WITH ACUTE
-<U00F4> /xf4 LATIN SMALL LETTER O WITH CIRCUMFLEX
-<U00F5> /xf5 LATIN SMALL LETTER O WITH TILDE
-<U00F6> /xf6 LATIN SMALL LETTER O WITH DIAERESIS
-<U00F7> /xf7 DIVISION SIGN
-<U00F8> /xf8 LATIN SMALL LETTER O WITH STROKE
-<U00F9> /xf9 LATIN SMALL LETTER U WITH GRAVE
<U00FA> /xfa LATIN SMALL LETTER U WITH ACUTE
<U00FB> /xfb LATIN SMALL LETTER U WITH CIRCUMFLEX
<U00FC> /xfc LATIN SMALL LETTER U WITH DIAERESIS
diff --git a/localedata/charmaps/CP737 b/localedata/charmaps/CP737
new file mode 100644
index 0000000000..a59c93a9b2
--- /dev/null
+++ b/localedata/charmaps/CP737
@@ -0,0 +1,269 @@
+<code_set_name> CP737
+<comment_char> %
+<escape_char> /
+% version: 1.0
+% source: ftp://ftp.unicode.org/Public/Mappings/VENDORS/Microsoft/PC/CP737.TXT
+
+CHARMAP
+<U0000> /x00 NULL (NUL)
+<U0001> /x01 START OF HEADING (SOH)
+<U0002> /x02 START OF TEXT (STX)
+<U0003> /x03 END OF TEXT (ETX)
+<U0004> /x04 END OF TRANSMISSION (EOT)
+<U0005> /x05 ENQUIRY (ENQ)
+<U0006> /x06 ACKNOWLEDGE (ACK)
+<U0007> /x07 BELL (BEL)
+<U0008> /x08 BACKSPACE (BS)
+<U0009> /x09 CHARACTER TABULATION (HT)
+<U000A> /x0a LINE FEED (LF)
+<U000B> /x0b LINE TABULATION (VT)
+<U000C> /x0c FORM FEED (FF)
+<U000D> /x0d CARRIAGE RETURN (CR)
+<U000E> /x0e SHIFT OUT (SO)
+<U000F> /x0f SHIFT IN (SI)
+<U0010> /x10 DATALINK ESCAPE (DLE)
+<U0011> /x11 DEVICE CONTROL ONE (DC1)
+<U0012> /x12 DEVICE CONTROL TWO (DC2)
+<U0013> /x13 DEVICE CONTROL THREE (DC3)
+<U0014> /x14 DEVICE CONTROL FOUR (DC4)
+<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK)
+<U0016> /x16 SYNCHRONOUS IDLE (SYN)
+<U0017> /x17 END OF TRANSMISSION BLOCK (ETB)
+<U0018> /x18 CANCEL (CAN)
+<U0019> /x19 END OF MEDIUM (EM)
+<U001A> /x1a SUBSTITUTE (SUB)
+<U001B> /x1b ESCAPE (ESC)
+<U001C> /x1c FILE SEPARATOR (IS4)
+<U001D> /x1d GROUP SEPARATOR (IS3)
+<U001E> /x1e RECORD SEPARATOR (IS2)
+<U001F> /x1f UNIT SEPARATOR (IS1)
+<U0020> /x20 SPACE
+<U0021> /x21 EXCLAMATION MARK
+<U0022> /x22 QUOTATION MARK
+<U0023> /x23 NUMBER SIGN
+<U0024> /x24 DOLLAR SIGN
+<U0025> /x25 PERCENT SIGN
+<U0026> /x26 AMPERSAND
+<U0027> /x27 APOSTROPHE
+<U0028> /x28 LEFT PARENTHESIS
+<U0029> /x29 RIGHT PARENTHESIS
+<U002A> /x2a ASTERISK
+<U002B> /x2b PLUS SIGN
+<U002C> /x2c COMMA
+<U002D> /x2d HYPHEN-MINUS
+<U002E> /x2e FULL STOP
+<U002F> /x2f SOLIDUS
+<U0030> /x30 DIGIT ZERO
+<U0031> /x31 DIGIT ONE
+<U0032> /x32 DIGIT TWO
+<U0033> /x33 DIGIT THREE
+<U0034> /x34 DIGIT FOUR
+<U0035> /x35 DIGIT FIVE
+<U0036> /x36 DIGIT SIX
+<U0037> /x37 DIGIT SEVEN
+<U0038> /x38 DIGIT EIGHT
+<U0039> /x39 DIGIT NINE
+<U003A> /x3a COLON
+<U003B> /x3b SEMICOLON
+<U003C> /x3c LESS-THAN SIGN
+<U003D> /x3d EQUALS SIGN
+<U003E> /x3e GREATER-THAN SIGN
+<U003F> /x3f QUESTION MARK
+<U0040> /x40 COMMERCIAL AT
+<U0041> /x41 LATIN CAPITAL LETTER A
+<U0042> /x42 LATIN CAPITAL LETTER B
+<U0043> /x43 LATIN CAPITAL LETTER C
+<U0044> /x44 LATIN CAPITAL LETTER D
+<U0045> /x45 LATIN CAPITAL LETTER E
+<U0046> /x46 LATIN CAPITAL LETTER F
+<U0047> /x47 LATIN CAPITAL LETTER G
+<U0048> /x48 LATIN CAPITAL LETTER H
+<U0049> /x49 LATIN CAPITAL LETTER I
+<U004A> /x4a LATIN CAPITAL LETTER J
+<U004B> /x4b LATIN CAPITAL LETTER K
+<U004C> /x4c LATIN CAPITAL LETTER L
+<U004D> /x4d LATIN CAPITAL LETTER M
+<U004E> /x4e LATIN CAPITAL LETTER N
+<U004F> /x4f LATIN CAPITAL LETTER O
+<U0050> /x50 LATIN CAPITAL LETTER P
+<U0051> /x51 LATIN CAPITAL LETTER Q
+<U0052> /x52 LATIN CAPITAL LETTER R
+<U0053> /x53 LATIN CAPITAL LETTER S
+<U0054> /x54 LATIN CAPITAL LETTER T
+<U0055> /x55 LATIN CAPITAL LETTER U
+<U0056> /x56 LATIN CAPITAL LETTER V
+<U0057> /x57 LATIN CAPITAL LETTER W
+<U0058> /x58 LATIN CAPITAL LETTER X
+<U0059> /x59 LATIN CAPITAL LETTER Y
+<U005A> /x5a LATIN CAPITAL LETTER Z
+<U005B> /x5b LEFT SQUARE BRACKET
+<U005C> /x5c REVERSE SOLIDUS
+<U005D> /x5d RIGHT SQUARE BRACKET
+<U005E> /x5e CIRCUMFLEX ACCENT
+<U005F> /x5f LOW LINE
+<U0060> /x60 GRAVE ACCENT
+<U0061> /x61 LATIN SMALL LETTER A
+<U0062> /x62 LATIN SMALL LETTER B
+<U0063> /x63 LATIN SMALL LETTER C
+<U0064> /x64 LATIN SMALL LETTER D
+<U0065> /x65 LATIN SMALL LETTER E
+<U0066> /x66 LATIN SMALL LETTER F
+<U0067> /x67 LATIN SMALL LETTER G
+<U0068> /x68 LATIN SMALL LETTER H
+<U0069> /x69 LATIN SMALL LETTER I
+<U006A> /x6a LATIN SMALL LETTER J
+<U006B> /x6b LATIN SMALL LETTER K
+<U006C> /x6c LATIN SMALL LETTER L
+<U006D> /x6d LATIN SMALL LETTER M
+<U006E> /x6e LATIN SMALL LETTER N
+<U006F> /x6f LATIN SMALL LETTER O
+<U0070> /x70 LATIN SMALL LETTER P
+<U0071> /x71 LATIN SMALL LETTER Q
+<U0072> /x72 LATIN SMALL LETTER R
+<U0073> /x73 LATIN SMALL LETTER S
+<U0074> /x74 LATIN SMALL LETTER T
+<U0075> /x75 LATIN SMALL LETTER U
+<U0076> /x76 LATIN SMALL LETTER V
+<U0077> /x77 LATIN SMALL LETTER W
+<U0078> /x78 LATIN SMALL LETTER X
+<U0079> /x79 LATIN SMALL LETTER Y
+<U007A> /x7a LATIN SMALL LETTER Z
+<U007B> /x7b LEFT CURLY BRACKET
+<U007C> /x7c VERTICAL LINE
+<U007D> /x7d RIGHT CURLY BRACKET
+<U007E> /x7e TILDE
+<U007F> /x7f DELETE (DEL)
+<U0391> /x80 GREEK CAPITAL LETTER ALPHA
+<U0392> /x81 GREEK CAPITAL LETTER BETA
+<U0393> /x82 GREEK CAPITAL LETTER GAMMA
+<U0394> /x83 GREEK CAPITAL LETTER DELTA
+<U0395> /x84 GREEK CAPITAL LETTER EPSILON
+<U0396> /x85 GREEK CAPITAL LETTER ZETA
+<U0397> /x86 GREEK CAPITAL LETTER ETA
+<U0398> /x87 GREEK CAPITAL LETTER THETA
+<U0399> /x88 GREEK CAPITAL LETTER IOTA
+<U039A> /x89 GREEK CAPITAL LETTER KAPPA
+<U039B> /x8a GREEK CAPITAL LETTER LAMDA
+<U039C> /x8b GREEK CAPITAL LETTER MU
+<U039D> /x8c GREEK CAPITAL LETTER NU
+<U039E> /x8d GREEK CAPITAL LETTER XI
+<U039F> /x8e GREEK CAPITAL LETTER OMICRON
+<U03A0> /x8f GREEK CAPITAL LETTER PI
+<U03A1> /x90 GREEK CAPITAL LETTER RHO
+<U03A3> /x91 GREEK CAPITAL LETTER SIGMA
+<U03A4> /x92 GREEK CAPITAL LETTER TAU
+<U03A5> /x93 GREEK CAPITAL LETTER UPSILON
+<U03A6> /x94 GREEK CAPITAL LETTER PHI
+<U03A7> /x95 GREEK CAPITAL LETTER CHI
+<U03A8> /x96 GREEK CAPITAL LETTER PSI
+<U03A9> /x97 GREEK CAPITAL LETTER OMEGA
+<U03B1> /x98 GREEK SMALL LETTER ALPHA
+<U03B2> /x99 GREEK SMALL LETTER BETA
+<U03B3> /x9a GREEK SMALL LETTER GAMMA
+<U03B4> /x9b GREEK SMALL LETTER DELTA
+<U03B5> /x9c GREEK SMALL LETTER EPSILON
+<U03B6> /x9d GREEK SMALL LETTER ZETA
+<U03B7> /x9e GREEK SMALL LETTER ETA
+<U03B8> /x9f GREEK SMALL LETTER THETA
+<U03B9> /xa0 GREEK SMALL LETTER IOTA
+<U03BA> /xa1 GREEK SMALL LETTER KAPPA
+<U03BB> /xa2 GREEK SMALL LETTER LAMDA
+<U03BC> /xa3 GREEK SMALL LETTER MU
+<U03BD> /xa4 GREEK SMALL LETTER NU
+<U03BE> /xa5 GREEK SMALL LETTER XI
+<U03BF> /xa6 GREEK SMALL LETTER OMICRON
+<U03C0> /xa7 GREEK SMALL LETTER PI
+<U03C1> /xa8 GREEK SMALL LETTER RHO
+<U03C3> /xa9 GREEK SMALL LETTER SIGMA
+<U03C2> /xaa GREEK SMALL LETTER FINAL SIGMA
+<U03C4> /xab GREEK SMALL LETTER TAU
+<U03C5> /xac GREEK SMALL LETTER UPSILON
+<U03C6> /xad GREEK SMALL LETTER PHI
+<U03C7> /xae GREEK SMALL LETTER CHI
+<U03C8> /xaf GREEK SMALL LETTER PSI
+<U2591> /xb0 LIGHT SHADE
+<U2592> /xb1 MEDIUM SHADE
+<U2593> /xb2 DARK SHADE
+<U2502> /xb3 BOX DRAWINGS LIGHT VERTICAL
+<U2524> /xb4 BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<U2561> /xb5 BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+<U2562> /xb6 BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+<U2556> /xb7 BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+<U2555> /xb8 BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+<U2563> /xb9 BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+<U2551> /xba BOX DRAWINGS DOUBLE VERTICAL
+<U2557> /xbb BOX DRAWINGS DOUBLE DOWN AND LEFT
+<U255D> /xbc BOX DRAWINGS DOUBLE UP AND LEFT
+<U255C> /xbd BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+<U255B> /xbe BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+<U2510> /xbf BOX DRAWINGS LIGHT DOWN AND LEFT
+<U2514> /xc0 BOX DRAWINGS LIGHT UP AND RIGHT
+<U2534> /xc1 BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<U252C> /xc2 BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<U251C> /xc3 BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<U2500> /xc4 BOX DRAWINGS LIGHT HORIZONTAL
+<U253C> /xc5 BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<U255E> /xc6 BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+<U255F> /xc7 BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+<U255A> /xc8 BOX DRAWINGS DOUBLE UP AND RIGHT
+<U2554> /xc9 BOX DRAWINGS DOUBLE DOWN AND RIGHT
+<U2569> /xca BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+<U2566> /xcb BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+<U2560> /xcc BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+<U2550> /xcd BOX DRAWINGS DOUBLE HORIZONTAL
+<U256C> /xce BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+<U2567> /xcf BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+<U2568> /xd0 BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+<U2564> /xd1 BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+<U2565> /xd2 BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+<U2559> /xd3 BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+<U2558> /xd4 BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+<U2552> /xd5 BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+<U2553> /xd6 BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+<U256B> /xd7 BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+<U256A> /xd8 BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+<U2518> /xd9 BOX DRAWINGS LIGHT UP AND LEFT
+<U250C> /xda BOX DRAWINGS LIGHT DOWN AND RIGHT
+<U2588> /xdb FULL BLOCK
+<U2584> /xdc LOWER HALF BLOCK
+<U258C> /xdd LEFT HALF BLOCK
+<U2590> /xde RIGHT HALF BLOCK
+<U2580> /xdf UPPER HALF BLOCK
+<U03C9> /xe0 GREEK SMALL LETTER OMEGA
+<U03AC> /xe1 GREEK SMALL LETTER ALPHA WITH TONOS
+<U03AD> /xe2 GREEK SMALL LETTER EPSILON WITH TONOS
+<U03AE> /xe3 GREEK SMALL LETTER ETA WITH TONOS
+<U03CA> /xe4 GREEK SMALL LETTER IOTA WITH DIALYTIKA
+<U03AF> /xe5 GREEK SMALL LETTER IOTA WITH TONOS
+<U03CC> /xe6 GREEK SMALL LETTER OMICRON WITH TONOS
+<U03CD> /xe7 GREEK SMALL LETTER UPSILON WITH TONOS
+<U03CB> /xe8 GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+<U03CE> /xe9 GREEK SMALL LETTER OMEGA WITH TONOS
+<U0386> /xea GREEK CAPITAL LETTER ALPHA WITH TONOS
+<U0388> /xeb GREEK CAPITAL LETTER EPSILON WITH TONOS
+<U0389> /xec GREEK CAPITAL LETTER ETA WITH TONOS
+<U038A> /xed GREEK CAPITAL LETTER IOTA WITH TONOS
+<U038C> /xee GREEK CAPITAL LETTER OMICRON WITH TONOS
+<U038E> /xef GREEK CAPITAL LETTER UPSILON WITH TONOS
+<U038F> /xf0 GREEK CAPITAL LETTER OMEGA WITH TONOS
+<U00B1> /xf1 PLUS-MINUS SIGN
+<U2265> /xf2 GREATER-THAN OR EQUAL TO
+<U2264> /xf3 LESS-THAN OR EQUAL TO
+<U03AA> /xf4 GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+<U03AB> /xf5 GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+<U00F7> /xf6 DIVISION SIGN
+<U2248> /xf7 ALMOST EQUAL TO
+<U00B0> /xf8 DEGREE SIGN
+<U2219> /xf9 BULLET OPERATOR
+<U00B7> /xfa MIDDLE DOT
+<U221A> /xfb SQUARE ROOT
+<U207F> /xfc SUPERSCRIPT LATIN SMALL LETTER N
+<U00B2> /xfd SUPERSCRIPT TWO
+<U25A0> /xfe BLACK SQUARE
+<U00A0> /xff NO-BREAK SPACE
+END CHARMAP
+
+WIDTH
+<U0020>...<U007E> 1
+<U0080>...<U00FF> 1
+END WIDTH
diff --git a/localedata/charmaps/CP775 b/localedata/charmaps/CP775
new file mode 100644
index 0000000000..e34c26431b
--- /dev/null
+++ b/localedata/charmaps/CP775
@@ -0,0 +1,269 @@
+<code_set_name> CP775
+<comment_char> %
+<escape_char> /
+% version: 1.0
+% source: ftp://ftp.unicode.org/Public/Mappings/VENDORS/Microsoft/PC/CP775.TXT
+
+CHARMAP
+<U0000> /x00 NULL (NUL)
+<U0001> /x01 START OF HEADING (SOH)
+<U0002> /x02 START OF TEXT (STX)
+<U0003> /x03 END OF TEXT (ETX)
+<U0004> /x04 END OF TRANSMISSION (EOT)
+<U0005> /x05 ENQUIRY (ENQ)
+<U0006> /x06 ACKNOWLEDGE (ACK)
+<U0007> /x07 BELL (BEL)
+<U0008> /x08 BACKSPACE (BS)
+<U0009> /x09 CHARACTER TABULATION (HT)
+<U000A> /x0a LINE FEED (LF)
+<U000B> /x0b LINE TABULATION (VT)
+<U000C> /x0c FORM FEED (FF)
+<U000D> /x0d CARRIAGE RETURN (CR)
+<U000E> /x0e SHIFT OUT (SO)
+<U000F> /x0f SHIFT IN (SI)
+<U0010> /x10 DATALINK ESCAPE (DLE)
+<U0011> /x11 DEVICE CONTROL ONE (DC1)
+<U0012> /x12 DEVICE CONTROL TWO (DC2)
+<U0013> /x13 DEVICE CONTROL THREE (DC3)
+<U0014> /x14 DEVICE CONTROL FOUR (DC4)
+<U0015> /x15 NEGATIVE ACKNOWLEDGE (NAK)
+<U0016> /x16 SYNCHRONOUS IDLE (SYN)
+<U0017> /x17 END OF TRANSMISSION BLOCK (ETB)
+<U0018> /x18 CANCEL (CAN)
+<U0019> /x19 END OF MEDIUM (EM)
+<U001A> /x1a SUBSTITUTE (SUB)
+<U001B> /x1b ESCAPE (ESC)
+<U001C> /x1c FILE SEPARATOR (IS4)
+<U001D> /x1d GROUP SEPARATOR (IS3)
+<U001E> /x1e RECORD SEPARATOR (IS2)
+<U001F> /x1f UNIT SEPARATOR (IS1)
+<U0020> /x20 SPACE
+<U0021> /x21 EXCLAMATION MARK
+<U0022> /x22 QUOTATION MARK
+<U0023> /x23 NUMBER SIGN
+<U0024> /x24 DOLLAR SIGN
+<U0025> /x25 PERCENT SIGN
+<U0026> /x26 AMPERSAND
+<U0027> /x27 APOSTROPHE
+<U0028> /x28 LEFT PARENTHESIS
+<U0029> /x29 RIGHT PARENTHESIS
+<U002A> /x2a ASTERISK
+<U002B> /x2b PLUS SIGN
+<U002C> /x2c COMMA
+<U002D> /x2d HYPHEN-MINUS
+<U002E> /x2e FULL STOP
+<U002F> /x2f SOLIDUS
+<U0030> /x30 DIGIT ZERO
+<U0031> /x31 DIGIT ONE
+<U0032> /x32 DIGIT TWO
+<U0033> /x33 DIGIT THREE
+<U0034> /x34 DIGIT FOUR
+<U0035> /x35 DIGIT FIVE
+<U0036> /x36 DIGIT SIX
+<U0037> /x37 DIGIT SEVEN
+<U0038> /x38 DIGIT EIGHT
+<U0039> /x39 DIGIT NINE
+<U003A> /x3a COLON
+<U003B> /x3b SEMICOLON
+<U003C> /x3c LESS-THAN SIGN
+<U003D> /x3d EQUALS SIGN
+<U003E> /x3e GREATER-THAN SIGN
+<U003F> /x3f QUESTION MARK
+<U0040> /x40 COMMERCIAL AT
+<U0041> /x41 LATIN CAPITAL LETTER A
+<U0042> /x42 LATIN CAPITAL LETTER B
+<U0043> /x43 LATIN CAPITAL LETTER C
+<U0044> /x44 LATIN CAPITAL LETTER D
+<U0045> /x45 LATIN CAPITAL LETTER E
+<U0046> /x46 LATIN CAPITAL LETTER F
+<U0047> /x47 LATIN CAPITAL LETTER G
+<U0048> /x48 LATIN CAPITAL LETTER H
+<U0049> /x49 LATIN CAPITAL LETTER I
+<U004A> /x4a LATIN CAPITAL LETTER J
+<U004B> /x4b LATIN CAPITAL LETTER K
+<U004C> /x4c LATIN CAPITAL LETTER L
+<U004D> /x4d LATIN CAPITAL LETTER M
+<U004E> /x4e LATIN CAPITAL LETTER N
+<U004F> /x4f LATIN CAPITAL LETTER O
+<U0050> /x50 LATIN CAPITAL LETTER P
+<U0051> /x51 LATIN CAPITAL LETTER Q
+<U0052> /x52 LATIN CAPITAL LETTER R
+<U0053> /x53 LATIN CAPITAL LETTER S
+<U0054> /x54 LATIN CAPITAL LETTER T
+<U0055> /x55 LATIN CAPITAL LETTER U
+<U0056> /x56 LATIN CAPITAL LETTER V
+<U0057> /x57 LATIN CAPITAL LETTER W
+<U0058> /x58 LATIN CAPITAL LETTER X
+<U0059> /x59 LATIN CAPITAL LETTER Y
+<U005A> /x5a LATIN CAPITAL LETTER Z
+<U005B> /x5b LEFT SQUARE BRACKET
+<U005C> /x5c REVERSE SOLIDUS
+<U005D> /x5d RIGHT SQUARE BRACKET
+<U005E> /x5e CIRCUMFLEX ACCENT
+<U005F> /x5f LOW LINE
+<U0060> /x60 GRAVE ACCENT
+<U0061> /x61 LATIN SMALL LETTER A
+<U0062> /x62 LATIN SMALL LETTER B
+<U0063> /x63 LATIN SMALL LETTER C
+<U0064> /x64 LATIN SMALL LETTER D
+<U0065> /x65 LATIN SMALL LETTER E
+<U0066> /x66 LATIN SMALL LETTER F
+<U0067> /x67 LATIN SMALL LETTER G
+<U0068> /x68 LATIN SMALL LETTER H
+<U0069> /x69 LATIN SMALL LETTER I
+<U006A> /x6a LATIN SMALL LETTER J
+<U006B> /x6b LATIN SMALL LETTER K
+<U006C> /x6c LATIN SMALL LETTER L
+<U006D> /x6d LATIN SMALL LETTER M
+<U006E> /x6e LATIN SMALL LETTER N
+<U006F> /x6f LATIN SMALL LETTER O
+<U0070> /x70 LATIN SMALL LETTER P
+<U0071> /x71 LATIN SMALL LETTER Q
+<U0072> /x72 LATIN SMALL LETTER R
+<U0073> /x73 LATIN SMALL LETTER S
+<U0074> /x74 LATIN SMALL LETTER T
+<U0075> /x75 LATIN SMALL LETTER U
+<U0076> /x76 LATIN SMALL LETTER V
+<U0077> /x77 LATIN SMALL LETTER W
+<U0078> /x78 LATIN SMALL LETTER X
+<U0079> /x79 LATIN SMALL LETTER Y
+<U007A> /x7a LATIN SMALL LETTER Z
+<U007B> /x7b LEFT CURLY BRACKET
+<U007C> /x7c VERTICAL LINE
+<U007D> /x7d RIGHT CURLY BRACKET
+<U007E> /x7e TILDE
+<U007F> /x7f DELETE (DEL)
+<U0106> /x80 LATIN CAPITAL LETTER C WITH ACUTE
+<U00FC> /x81 LATIN SMALL LETTER U WITH DIAERESIS
+<U00E9> /x82 LATIN SMALL LETTER E WITH ACUTE
+<U0101> /x83 LATIN SMALL LETTER A WITH MACRON
+<U00E4> /x84 LATIN SMALL LETTER A WITH DIAERESIS
+<U0123> /x85 LATIN SMALL LETTER G WITH CEDILLA
+<U00E5> /x86 LATIN SMALL LETTER A WITH RING ABOVE
+<U0107> /x87 LATIN SMALL LETTER C WITH ACUTE
+<U0142> /x88 LATIN SMALL LETTER L WITH STROKE
+<U0113> /x89 LATIN SMALL LETTER E WITH MACRON
+<U0156> /x8a LATIN CAPITAL LETTER R WITH CEDILLA
+<U0157> /x8b LATIN SMALL LETTER R WITH CEDILLA
+<U012B> /x8c LATIN SMALL LETTER I WITH MACRON
+<U0179> /x8d LATIN CAPITAL LETTER Z WITH ACUTE
+<U00C4> /x8e LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00C5> /x8f LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00C9> /x90 LATIN CAPITAL LETTER E WITH ACUTE
+<U00E6> /x91 LATIN SMALL LETTER AE
+<U00C6> /x92 LATIN CAPITAL LETTER AE
+<U014D> /x93 LATIN SMALL LETTER O WITH MACRON
+<U00F6> /x94 LATIN SMALL LETTER O WITH DIAERESIS
+<U0122> /x95 LATIN CAPITAL LETTER G WITH CEDILLA
+<U00A2> /x96 CENT SIGN
+<U015A> /x97 LATIN CAPITAL LETTER S WITH ACUTE
+<U015B> /x98 LATIN SMALL LETTER S WITH ACUTE
+<U00D6> /x99 LATIN CAPITAL LETTER O WITH DIAERESIS
+<U00DC> /x9a LATIN CAPITAL LETTER U WITH DIAERESIS
+<U00F8> /x9b LATIN SMALL LETTER O WITH STROKE
+<U00A3> /x9c POUND SIGN
+<U00D8> /x9d LATIN CAPITAL LETTER O WITH STROKE
+<U00D7> /x9e MULTIPLICATION SIGN
+<U00A4> /x9f CURRENCY SIGN
+<U0100> /xa0 LATIN CAPITAL LETTER A WITH MACRON
+<U012A> /xa1 LATIN CAPITAL LETTER I WITH MACRON
+<U00F3> /xa2 LATIN SMALL LETTER O WITH ACUTE
+<U017B> /xa3 LATIN CAPITAL LETTER Z WITH DOT ABOVE
+<U017C> /xa4 LATIN SMALL LETTER Z WITH DOT ABOVE
+<U017A> /xa5 LATIN SMALL LETTER Z WITH ACUTE
+<U201D> /xa6 RIGHT DOUBLE QUOTATION MARK
+<U00A6> /xa7 BROKEN BAR
+<U00A9> /xa8 COPYRIGHT SIGN
+<U00AE> /xa9 REGISTERED SIGN
+<U00AC> /xaa NOT SIGN
+<U00BD> /xab VULGAR FRACTION ONE HALF
+<U00BC> /xac VULGAR FRACTION ONE QUARTER
+<U0141> /xad LATIN CAPITAL LETTER L WITH STROKE
+<U00AB> /xae LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00BB> /xaf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U2591> /xb0 LIGHT SHADE
+<U2592> /xb1 MEDIUM SHADE
+<U2593> /xb2 DARK SHADE
+<U2502> /xb3 BOX DRAWINGS LIGHT VERTICAL
+<U2524> /xb4 BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<U0104> /xb5 LATIN CAPITAL LETTER A WITH OGONEK
+<U010C> /xb6 LATIN CAPITAL LETTER C WITH CARON
+<U0118> /xb7 LATIN CAPITAL LETTER E WITH OGONEK
+<U0116> /xb8 LATIN CAPITAL LETTER E WITH DOT ABOVE
+<U2563> /xb9 BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+<U2551> /xba BOX DRAWINGS DOUBLE VERTICAL
+<U2557> /xbb BOX DRAWINGS DOUBLE DOWN AND LEFT
+<U255D> /xbc BOX DRAWINGS DOUBLE UP AND LEFT
+<U012E> /xbd LATIN CAPITAL LETTER I WITH OGONEK
+<U0160> /xbe LATIN CAPITAL LETTER S WITH CARON
+<U2510> /xbf BOX DRAWINGS LIGHT DOWN AND LEFT
+<U2514> /xc0 BOX DRAWINGS LIGHT UP AND RIGHT
+<U2534> /xc1 BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<U252C> /xc2 BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<U251C> /xc3 BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<U2500> /xc4 BOX DRAWINGS LIGHT HORIZONTAL
+<U253C> /xc5 BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<U0172> /xc6 LATIN CAPITAL LETTER U WITH OGONEK
+<U016A> /xc7 LATIN CAPITAL LETTER U WITH MACRON
+<U255A> /xc8 BOX DRAWINGS DOUBLE UP AND RIGHT
+<U2554> /xc9 BOX DRAWINGS DOUBLE DOWN AND RIGHT
+<U2569> /xca BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+<U2566> /xcb BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+<U2560> /xcc BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+<U2550> /xcd BOX DRAWINGS DOUBLE HORIZONTAL
+<U256C> /xce BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+<U017D> /xcf LATIN CAPITAL LETTER Z WITH CARON
+<U0105> /xd0 LATIN SMALL LETTER A WITH OGONEK
+<U010D> /xd1 LATIN SMALL LETTER C WITH CARON
+<U0119> /xd2 LATIN SMALL LETTER E WITH OGONEK
+<U0117> /xd3 LATIN SMALL LETTER E WITH DOT ABOVE
+<U012F> /xd4 LATIN SMALL LETTER I WITH OGONEK
+<U0161> /xd5 LATIN SMALL LETTER S WITH CARON
+<U0173> /xd6 LATIN SMALL LETTER U WITH OGONEK
+<U016B> /xd7 LATIN SMALL LETTER U WITH MACRON
+<U017E> /xd8 LATIN SMALL LETTER Z WITH CARON
+<U2518> /xd9 BOX DRAWINGS LIGHT UP AND LEFT
+<U250C> /xda BOX DRAWINGS LIGHT DOWN AND RIGHT
+<U2588> /xdb FULL BLOCK
+<U2584> /xdc LOWER HALF BLOCK
+<U258C> /xdd LEFT HALF BLOCK
+<U2590> /xde RIGHT HALF BLOCK
+<U2580> /xdf UPPER HALF BLOCK
+<U00D3> /xe0 LATIN CAPITAL LETTER O WITH ACUTE
+<U00DF> /xe1 LATIN SMALL LETTER SHARP S
+<U014C> /xe2 LATIN CAPITAL LETTER O WITH MACRON
+<U0143> /xe3 LATIN CAPITAL LETTER N WITH ACUTE
+<U00F5> /xe4 LATIN SMALL LETTER O WITH TILDE
+<U00D5> /xe5 LATIN CAPITAL LETTER O WITH TILDE
+<U00B5> /xe6 MICRO SIGN
+<U0144> /xe7 LATIN SMALL LETTER N WITH ACUTE
+<U0136> /xe8 LATIN CAPITAL LETTER K WITH CEDILLA
+<U0137> /xe9 LATIN SMALL LETTER K WITH CEDILLA
+<U013B> /xea LATIN CAPITAL LETTER L WITH CEDILLA
+<U013C> /xeb LATIN SMALL LETTER L WITH CEDILLA
+<U0146> /xec LATIN SMALL LETTER N WITH CEDILLA
+<U0112> /xed LATIN CAPITAL LETTER E WITH MACRON
+<U0145> /xee LATIN CAPITAL LETTER N WITH CEDILLA
+<U2019> /xef RIGHT SINGLE QUOTATION MARK
+<U00AD> /xf0 SOFT HYPHEN
+<U00B1> /xf1 PLUS-MINUS SIGN
+<U201C> /xf2 LEFT DOUBLE QUOTATION MARK
+<U00BE> /xf3 VULGAR FRACTION THREE QUARTERS
+<U00B6> /xf4 PILCROW SIGN
+<U00A7> /xf5 SECTION SIGN
+<U00F7> /xf6 DIVISION SIGN
+<U201E> /xf7 DOUBLE LOW-9 QUOTATION MARK
+<U00B0> /xf8 DEGREE SIGN
+<U2219> /xf9 BULLET OPERATOR
+<U00B7> /xfa MIDDLE DOT
+<U00B9> /xfb SUPERSCRIPT ONE
+<U00B3> /xfc SUPERSCRIPT THREE
+<U00B2> /xfd SUPERSCRIPT TWO
+<U25A0> /xfe BLACK SQUARE
+<U00A0> /xff NO-BREAK SPACE
+END CHARMAP
+
+WIDTH
+<U0020>...<U007E> 1
+<U0080>...<U00FF> 1
+END WIDTH
diff --git a/localedata/charmaps/GB2312 b/localedata/charmaps/GB2312
index f1dbe7a430..3dd7b481b9 100644
--- a/localedata/charmaps/GB2312
+++ b/localedata/charmaps/GB2312
@@ -9,8 +9,6 @@
% Email: hashao@china.com
% Distribution and use is free, even for comercial purpose.
%
-% alias CN
-% alias ISO646-CN
CHARMAP
<U0000> /x00 NULL (NUL)
<U0001> /x01 START OF HEADING (SOH)
@@ -173,93 +171,12 @@ CHARMAP
<U009E> /x9e PRIVACY MESSAGE (PM)
<U009F> /x9f APPLICATION PROGRAM COMMAND (APC)
<U00A0> /xa0 NO-BREAK SPACE
-<U00A1> /xa1 INVERTED EXCLAMATION MARK
-<U00A2> /xa2 CENT SIGN
-<U00A3> /xa3 POUND SIGN
-<U00A4> /xa4 CURRENCY SIGN
-<U00A5> /xa5 YEN SIGN
-<U00A6> /xa6 BROKEN BAR
-<U00A7> /xa7 SECTION SIGN
-<U00A8> /xa8 DIAERESIS
-<U00A9> /xa9 COPYRIGHT SIGN
<U00AA> /xaa FEMININE ORDINAL INDICATOR
<U00AB> /xab LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
<U00AC> /xac NOT SIGN
<U00AD> /xad SOFT HYPHEN
<U00AE> /xae REGISTERED SIGN
<U00AF> /xaf MACRON
-<U00B0> /xb0 DEGREE SIGN
-<U00B1> /xb1 PLUS-MINUS SIGN
-<U00B2> /xb2 SUPERSCRIPT TWO
-<U00B3> /xb3 SUPERSCRIPT THREE
-<U00B4> /xb4 ACUTE ACCENT
-<U00B5> /xb5 MICRO SIGN
-<U00B6> /xb6 PILCROW SIGN
-<U00B7> /xb7 MIDDLE DOT
-<U00B8> /xb8 CEDILLA
-<U00B9> /xb9 SUPERSCRIPT ONE
-<U00BA> /xba MASCULINE ORDINAL INDICATOR
-<U00BB> /xbb RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-<U00BC> /xbc VULGAR FRACTION ONE QUARTER
-<U00BD> /xbd VULGAR FRACTION ONE HALF
-<U00BE> /xbe VULGAR FRACTION THREE QUARTERS
-<U00BF> /xbf INVERTED QUESTION MARK
-<U00C0> /xc0 LATIN CAPITAL LETTER A WITH GRAVE
-<U00C1> /xc1 LATIN CAPITAL LETTER A WITH ACUTE
-<U00C2> /xc2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-<U00C3> /xc3 LATIN CAPITAL LETTER A WITH TILDE
-<U00C4> /xc4 LATIN CAPITAL LETTER A WITH DIAERESIS
-<U00C5> /xc5 LATIN CAPITAL LETTER A WITH RING ABOVE
-<U00C6> /xc6 LATIN CAPITAL LETTER AE
-<U00C7> /xc7 LATIN CAPITAL LETTER C WITH CEDILLA
-<U00C8> /xc8 LATIN CAPITAL LETTER E WITH GRAVE
-<U00C9> /xc9 LATIN CAPITAL LETTER E WITH ACUTE
-<U00CA> /xca LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-<U00CB> /xcb LATIN CAPITAL LETTER E WITH DIAERESIS
-<U00CC> /xcc LATIN CAPITAL LETTER I WITH GRAVE
-<U00CD> /xcd LATIN CAPITAL LETTER I WITH ACUTE
-<U00CE> /xce LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-<U00CF> /xcf LATIN CAPITAL LETTER I WITH DIAERESIS
-<U00D0> /xd0 LATIN CAPITAL LETTER ETH (Icelandic)
-<U00D1> /xd1 LATIN CAPITAL LETTER N WITH TILDE
-<U00D2> /xd2 LATIN CAPITAL LETTER O WITH GRAVE
-<U00D3> /xd3 LATIN CAPITAL LETTER O WITH ACUTE
-<U00D4> /xd4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-<U00D5> /xd5 LATIN CAPITAL LETTER O WITH TILDE
-<U00D6> /xd6 LATIN CAPITAL LETTER O WITH DIAERESIS
-<U00D7> /xd7 MULTIPLICATION SIGN
-<U00D8> /xd8 LATIN CAPITAL LETTER O WITH STROKE
-<U00D9> /xd9 LATIN CAPITAL LETTER U WITH GRAVE
-<U00DA> /xda LATIN CAPITAL LETTER U WITH ACUTE
-<U00DB> /xdb LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-<U00DC> /xdc LATIN CAPITAL LETTER U WITH DIAERESIS
-<U00DD> /xdd LATIN CAPITAL LETTER Y WITH ACUTE
-<U00DE> /xde LATIN CAPITAL LETTER THORN (Icelandic)
-<U00DF> /xdf LATIN SMALL LETTER SHARP S (German)
-<U00E0> /xe0 LATIN SMALL LETTER A WITH GRAVE
-<U00E1> /xe1 LATIN SMALL LETTER A WITH ACUTE
-<U00E2> /xe2 LATIN SMALL LETTER A WITH CIRCUMFLEX
-<U00E3> /xe3 LATIN SMALL LETTER A WITH TILDE
-<U00E4> /xe4 LATIN SMALL LETTER A WITH DIAERESIS
-<U00E5> /xe5 LATIN SMALL LETTER A WITH RING ABOVE
-<U00E6> /xe6 LATIN SMALL LETTER AE
-<U00E7> /xe7 LATIN SMALL LETTER C WITH CEDILLA
-<U00E8> /xe8 LATIN SMALL LETTER E WITH GRAVE
-<U00E9> /xe9 LATIN SMALL LETTER E WITH ACUTE
-<U00EA> /xea LATIN SMALL LETTER E WITH CIRCUMFLEX
-<U00EB> /xeb LATIN SMALL LETTER E WITH DIAERESIS
-<U00EC> /xec LATIN SMALL LETTER I WITH GRAVE
-<U00ED> /xed LATIN SMALL LETTER I WITH ACUTE
-<U00EE> /xee LATIN SMALL LETTER I WITH CIRCUMFLEX
-<U00EF> /xef LATIN SMALL LETTER I WITH DIAERESIS
-<U00F0> /xf0 LATIN SMALL LETTER ETH (Icelandic)
-<U00F1> /xf1 LATIN SMALL LETTER N WITH TILDE
-<U00F2> /xf2 LATIN SMALL LETTER O WITH GRAVE
-<U00F3> /xf3 LATIN SMALL LETTER O WITH ACUTE
-<U00F4> /xf4 LATIN SMALL LETTER O WITH CIRCUMFLEX
-<U00F5> /xf5 LATIN SMALL LETTER O WITH TILDE
-<U00F6> /xf6 LATIN SMALL LETTER O WITH DIAERESIS
-<U00F7> /xf7 DIVISION SIGN
<U00F8> /xf8 LATIN SMALL LETTER O WITH STROKE
<U00F9> /xf9 LATIN SMALL LETTER U WITH GRAVE
<U00FA> /xfa LATIN SMALL LETTER U WITH ACUTE
@@ -7715,3 +7632,7 @@ CHARMAP
<U9F3E> /xf7/xfd <CJK>
<U9F44> /xf7/xfe <CJK>
END CHARMAP
+
+WIDTH
+<U3000>..<U9F44> 2
+END WIDTH
diff --git a/localedata/charmaps/GBK b/localedata/charmaps/GBK
index 9a17b4e640..7c8b3bfab2 100644
--- a/localedata/charmaps/GBK
+++ b/localedata/charmaps/GBK
@@ -21927,3 +21927,7 @@ CHARMAP
<UFA28> /xfe/x4e <CJK>
<UFA29> /xfe/x4f <CJK>
END CHARMAP
+
+WIDTH
+<U4E02>..<UFA29> 2
+END WIDTH
diff --git a/localedata/charmaps/KSX1001 b/localedata/charmaps/KSX1001
index 9f683e2f63..fad17e10c0 100644
--- a/localedata/charmaps/KSX1001
+++ b/localedata/charmaps/KSX1001
@@ -844,3 +844,7 @@ CHARMAP
<U044E> /xac/xf0 # CYRILLIC SMALL LETTER YU
<U044F> /xac/xf1 # CYRILLIC SMALL LETTER YA
END CHARMAP
+
+WIDTH
+<U3000>...<U044F> 2
+END WIDTH
diff --git a/localedata/charmaps/UTF-8 b/localedata/charmaps/UTF-8
index 4e4edbf4aa..5a6e7b52fb 100644
--- a/localedata/charmaps/UTF-8
+++ b/localedata/charmaps/UTF-8
@@ -14596,9 +14596,7 @@ CHARMAP
<U4DB2> /xe4/xb6/xb2 <CJK>
<U4DB3> /xe4/xb6/xb3 <CJK>
<U4DB4> /xe4/xb6/xb4 <CJK>
-<U4DB5> /xe4/xb6/xb5 <CJK Ideograph Extension A, Last>
<U4DB5> /xe4/xb6/xb5 <CJK>
-<U4E00> /xe4/xb8/x80 <CJK Ideograph, First>
<U4E00> /xe4/xb8/x80 <CJK>
<U4E01> /xe4/xb8/x81 <CJK>
<U4E02> /xe4/xb8/x82 <CJK>
diff --git a/resolv/netdb.h b/resolv/netdb.h
index e0331db2a7..088522f608 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -136,32 +136,7 @@ extern struct hostent *gethostbyname (__const char *__name) __THROW;
set to the address type which is `AF_INET' for IPv4 or `AF_INET6'
for IPv6. */
extern struct hostent *gethostbyname2 (__const char *__name, int __af) __THROW;
-#endif
-
-#ifdef __USE_UNIX98
-/* Return entry from host data base which address match ADDR with
- length LEN and type TYPE in newly allocated buffer. */
-extern struct hostent *getipnodebyaddr (__const void *__addr, socklen_t __len,
- int __type, int *__error_num) __THROW;
-
-/* Return entry from host data base for host with NAME and newly allocated
- buffer. FLAGS is some combination of the following AI_* values. */
-extern struct hostent *getipnodebyname (__const char *__name, int __type,
- int __flags, int *__error_num) __THROW;
-
-# define AI_V4MAPPED 0x0008 /* IPv4-mapped addresses are acceptable. */
-# define AI_ALL 0x0010 /* Return both IPv4 and IPv6 addresses. */
-# define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose
- returned address type. */
-# define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG)
-/* Free structure returned by previous `getipnodebyaddr' or `getipnodebyname'
- call. */
-extern void freehostent (struct hostent *__ptr) __THROW;
-
-#endif
-
-#ifdef __USE_MISC
/* Reentrant versions of the functions above. The additional
arguments specify a buffer of BUFLEN starting at BUF. The last
argument is a pointer to a variable which gets the value which