Update.

2004-04-17 Ulrich Drepper <drepper@redhat.com> * locales/kk_KZ: New file. * charmaps/PT154: New file. * charmaps/RK1048: New file. * locales/af_ZA: Make sure yesexpr and noexpr regex * locales/ar_TN: Likewise. * locales/ar_YE: Likewise. * locales/bn_BD: Likewise. * locales/br_FR: Likewise. * locales/ca_ES: Likewise. * locales/cy_GB: Likewise. * locales/gd_GB: Likewise. * locales/gv_GB: Likewise. * locales/hy_AM: Likewise. * locales/id_ID: Likewise. * locales/ka_GE: Likewise. * locales/kw_GB: Likewise. * locales/lg_UG: Likewise. * locales/mk_MK: Likewise. * locales/oc_FR: Likewise. * locales/ru_UA: Likewise. * locales/sk_SK: Likewise. * locales/sr_YU: Likewise. * locales/sr_YU@cyrillic: Likewise. * locales/uk_UA: Likewise. * locales/ur_PK: Likewise. * locales/wa_BE: Likewise. * locales/fa_IR: Fix yesexpr and noexpr.
author: Ulrich Drepper <drepper@redhat.com> 2004-04-17 22:34:18 +0000
committer: Ulrich Drepper <drepper@redhat.com> 2004-04-17 22:34:18 +0000
commit: 7eb7fdda7e81b1b028f5fbdec6b45155d2520698 (patch)
tree: 023a01b13f1241af1ee4179f267e22122d6d6f17
parent: d7ba1313b9da6d39ca80d13c38186ce4fb7f2d92 (diff)
16 files changed, 982 insertions, 139 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 59bc1fbe23..ceefe840a5 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997-2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T		 \
 	   GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8	 \
 	   TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213		 \
-	   ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS
+	   ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -172,7 +172,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
 	      mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h	    \
 	      ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \
 	      euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c		    \
-	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c
+	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c pt154.c rk1048.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
@@ -213,7 +213,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
 			iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t	   \
 			georgian-ps georgian-academy iso-ir-209 mac-sami   \
-			iso8859-11 ibm866nav
+			iso8859-11 ibm866nav pt154 rk1048
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index eec846bb6d..a5b2d66738 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1,5 +1,5 @@
 # GNU libc iconv configuration.
-# Copyright (C) 1997-1999, 2000-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -1561,3 +1561,12 @@ module	INTERNAL		Shift_JISX0213//	SHIFT_JISX0213	1
 #	from			to			module		cost
 module	TSCII//			INTERNAL		TSCII		1
 module	INTERNAL		TSCII//			TSCII		1
+
+#	from			to			module		cost
+module	PT154//			INTERNAL		PT154		1
+module	INTERNAL		PT154//			PT154		1
+
+#	from			to			module		cost
+alias	STRK1048-2002//		RK1048//
+module	RK1048//		INTERNAL		RK1048		1
+module	INTERNAL		RK1048//		RK1048		1
diff --git a/iconvdata/pt154.c b/iconvdata/pt154.c
new file mode 100644
index 0000000000..6a8204a9f8
--- /dev/null
+++ b/iconvdata/pt154.c
@@ -0,0 +1,29 @@
+/* Conversion from and to PT154.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; 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 <pt154.h>
+
+#define CHARSET_NAME   "PT154//"
+#define HAS_HOLES      0       /* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/rk1048.c b/iconvdata/rk1048.c
new file mode 100644
index 0000000000..f8b2ad3dac
--- /dev/null
+++ b/iconvdata/rk1048.c
@@ -0,0 +1,29 @@
+/* Conversion from and to RK1048.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; 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 <rk1048.h>
+
+#define CHARSET_NAME   "RK1048//"
+#define HAS_HOLES      1       /* Not all 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index abd9e8ddbd..2c1c9d04d9 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
 #
@@ -205,6 +205,8 @@ cat <<EOF |
   ARMSCII-8
   TCVN5712-1
   TSCII
+  PT154
+  RK1048
   #
   # Multibyte encodings come here
   #
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f083609408..c0ad189e0b 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,33 +1,39 @@
+2004-04-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/kk_KZ: New file.
+	* charmaps/PT154: New file.
+	* charmaps/RK1048: New file.
+
 2004-03-19  Petter Reinholdtsen  <pere@hungry.com>
 
-	* localedata/locales/af_ZA: Make sure yesexpr and noexpr regex
+	* locales/af_ZA: Make sure yesexpr and noexpr regex
 	start with '^'.
-	* localedata/locales/ar_TN: Likewise.
-	* localedata/locales/ar_YE: Likewise.
-	* localedata/locales/bn_BD: Likewise.
-	* localedata/locales/br_FR: Likewise.
-	* localedata/locales/ca_ES: Likewise.
-	* localedata/locales/cy_GB: Likewise.
-	* localedata/locales/gd_GB: Likewise.
-	* localedata/locales/gv_GB: Likewise.
-	* localedata/locales/hy_AM: Likewise.
-	* localedata/locales/id_ID: Likewise.
-	* localedata/locales/ka_GE: Likewise.
-	* localedata/locales/kw_GB: Likewise.
-	* localedata/locales/lg_UG: Likewise.
-	* localedata/locales/mk_MK: Likewise.
-	* localedata/locales/oc_FR: Likewise.
-	* localedata/locales/ru_UA: Likewise.
-	* localedata/locales/sk_SK: Likewise.
-	* localedata/locales/sr_YU: Likewise.
-	* localedata/locales/sr_YU@cyrillic: Likewise.
-	* localedata/locales/uk_UA: Likewise.
-	* localedata/locales/ur_PK: Likewise.
-	* localedata/locales/wa_BE: Likewise.
+	* locales/ar_TN: Likewise.
+	* locales/ar_YE: Likewise.
+	* locales/bn_BD: Likewise.
+	* locales/br_FR: Likewise.
+	* locales/ca_ES: Likewise.
+	* locales/cy_GB: Likewise.
+	* locales/gd_GB: Likewise.
+	* locales/gv_GB: Likewise.
+	* locales/hy_AM: Likewise.
+	* locales/id_ID: Likewise.
+	* locales/ka_GE: Likewise.
+	* locales/kw_GB: Likewise.
+	* locales/lg_UG: Likewise.
+	* locales/mk_MK: Likewise.
+	* locales/oc_FR: Likewise.
+	* locales/ru_UA: Likewise.
+	* locales/sk_SK: Likewise.
+	* locales/sr_YU: Likewise.
+	* locales/sr_YU@cyrillic: Likewise.
+	* locales/uk_UA: Likewise.
+	* locales/ur_PK: Likewise.
+	* locales/wa_BE: Likewise.
 
 2004-03-17  Ulrich Drepper  <drepper@redhat.com>
 
-	* localedata/locales/fa_IR: Fix yesexpr and noexpr.
+	* locales/fa_IR: Fix yesexpr and noexpr.
 	Patch by Hamed Malek <hamed@bamdad.org>.
 
 2004-02-16  Ulrich Drepper  <drepper@redhat.com>
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 20f1e9f17f..2f0c87d93f 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -151,6 +151,7 @@ es_VE.UTF-8/UTF-8 \
 es_VE/ISO-8859-1 \
 et_EE.UTF-8/UTF-8 \
 et_EE/ISO-8859-1 \
+et_EE.ISO-8859-15/ISO-8859-15 \
 eu_ES.UTF-8/UTF-8 \
 eu_ES/ISO-8859-1 \
 eu_ES@euro/ISO-8859-15 \
@@ -208,6 +209,7 @@ iw_IL/ISO-8859-8 \
 ja_JP.EUC-JP/EUC-JP \
 ja_JP.UTF-8/UTF-8 \
 ka_GE/GEORGIAN-PS \
+kk_KZ/PT154 \
 kl_GL.UTF-8/UTF-8 \
 kl_GL/ISO-8859-1 \
 kn_IN/UTF-8 \
diff --git a/localedata/charmaps/PT154 b/localedata/charmaps/PT154
new file mode 100644
index 0000000000..1495247c4a
--- /dev/null
+++ b/localedata/charmaps/PT154
@@ -0,0 +1,265 @@
+<code_set_name> PT154
+<comment_char> %
+<escape_char> /
+% version: 1.0
+% source: IANA
+
+% alias Cyrillic-Asian
+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)
+<U0496>     /x80         CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+<U0492>	    /x81         CYRILLIC CAPITAL LETTER GHE WITH STROKE
+<U04EE>     /x82         CYRILLIC CAPITAL LETTER U WITH MACRON
+<U0493>     /x83         CYRILLIC SMALL LETTER GHE WITH STROKE
+<U201E>     /x84         DOUBLE LOW-9 QUOTATION MARK
+<U2026>     /x85         HORIZONTAL ELLIPSIS
+<U04B6>     /x86         CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+<U04AE>     /x87         CYRILLIC CAPITAL LETTER STRAIGHT U
+<U04B2>     /x88         CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+<U04AF>     /x89         CYRILLIC SMALL LETTER STRAIGHT U
+<U04A0>     /x8a         CYRILLIC CAPITAL LETTER BASHKIR KA
+<U04E2>     /x8b         CYRILLIC CAPITAL LETTER I WITH MACRON
+<U04A2>     /x8c         CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+<U049A>     /x8d         CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+<U04BA>     /x8e         CYRILLIC CAPITAL LETTER SHHA
+<U04B8>     /x8f         CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+<U0497>     /x90         CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+<U2018>     /x91         LEFT SINGLE QUOTATION MARK
+<U2019>     /x92         RIGHT SINGLE QUOTATION MARK
+<U201C>     /x93         LEFT DOUBLE QUOTATION MARK
+<U201D>     /x94         RIGHT DOUBLE QUOTATION MARK
+<U2022>     /x95         BULLET
+<U2013>     /x96         EN DASH
+<U2014>     /x97         EM DASH
+<U04B3>     /x98         CYRILLIC SMALL LETTER HA WITH DESCENDER
+<U04B7>     /x99         CYRILLIC SMALL LETTER CHE WITH DESCENDER
+<U04A1>     /x9a         CYRILLIC SMALL LETTER BASHKIR KA
+<U04E3>     /x9b         CYRILLIC SMALL LETTER I WITH MACRON
+<U04A3>     /x9c         CYRILLIC SMALL LETTER EN WITH DESCENDER
+<U049B>     /x9d         CYRILLIC SMALL LETTER KA WITH DESCENDER
+<U04BB>     /x9e         CYRILLIC SMALL LETTER SHHA
+<U04B9>     /x9f         CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+<U00A0>     /xa0         NO-BREAK SPACE
+<U040E>     /xa1         CYRILLIC CAPITAL LETTER SHORT U (Byelorussian)
+<U045E>     /xa2         CYRILLIC SMALL LETTER SHORT U (Byelorussian)
+<U0408>     /xa3         CYRILLIC CAPITAL LETTER JE
+<U04E8>     /xa4         CYRILLIC CAPITAL LETTER BARRED O
+<U0498>     /xa5         CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+<U04B0>     /xa6         CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+<U00A7>     /xa7         SECTION SIGN
+<U0401>     /xa8         CYRILLIC CAPITAL LETTER IO
+<U00A9>     /xa9         COPYRIGHT SIGN
+<U04D8>     /xaa         CYRILLIC CAPITAL LETTER SCHWA
+<U00AB>     /xab         LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00AC>     /xac         NOT SIGN
+<U04EF>     /xad         CYRILLIC SMALL LETTER U WITH MACRON
+<U00AE>     /xae         REGISTERED SIGN
+<U049C>     /xaf         CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+<U00B0>     /xb0         DEGREE SIGN
+<U04B1>     /xb1         CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+<U0406>     /xb2         CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+<U0456>     /xb3         CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+<U0499>     /xb4         CYRILLIC SMALL LETTER ZE WITH DESCENDER
+<U04E9>     /xb5         CYRILLIC SMALL LETTER BARRED O
+<U00B6>     /xb6         PILCROW SIGN
+<U00B7>     /xb7         MIDDLE DOT
+<U0451>     /xb8         CYRILLIC SMALL LETTER IO
+<U2116>     /xb9         NUMERO SIGN
+<U04D9>     /xba         CYRILLIC SMALL LETTER SCHWA
+<U00BB>     /xbb         RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U0458>     /xbc         CYRILLIC SMALL LETTER JE
+<U04AA>     /xbd         CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+<U04AB>     /xbe         CYRILLIC SMALL LETTER ES WITH DESCENDER
+<U049D>     /xbf         CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+<U0410>     /xc0         CYRILLIC CAPITAL LETTER A
+<U0411>     /xc1         CYRILLIC CAPITAL LETTER BE
+<U0412>     /xc2         CYRILLIC CAPITAL LETTER VE
+<U0413>     /xc3         CYRILLIC CAPITAL LETTER GHE
+<U0414>     /xc4         CYRILLIC CAPITAL LETTER DE
+<U0415>     /xc5         CYRILLIC CAPITAL LETTER IE
+<U0416>     /xc6         CYRILLIC CAPITAL LETTER ZHE
+<U0417>     /xc7         CYRILLIC CAPITAL LETTER ZE
+<U0418>     /xc8         CYRILLIC CAPITAL LETTER I
+<U0419>     /xc9         CYRILLIC CAPITAL LETTER SHORT I
+<U041A>     /xca         CYRILLIC CAPITAL LETTER KA
+<U041B>     /xcb         CYRILLIC CAPITAL LETTER EL
+<U041C>     /xcc         CYRILLIC CAPITAL LETTER EM
+<U041D>     /xcd         CYRILLIC CAPITAL LETTER EN
+<U041E>     /xce         CYRILLIC CAPITAL LETTER O
+<U041F>     /xcf         CYRILLIC CAPITAL LETTER PE
+<U0420>     /xd0         CYRILLIC CAPITAL LETTER ER
+<U0421>     /xd1         CYRILLIC CAPITAL LETTER ES
+<U0422>     /xd2         CYRILLIC CAPITAL LETTER TE
+<U0423>     /xd3         CYRILLIC CAPITAL LETTER U
+<U0424>     /xd4         CYRILLIC CAPITAL LETTER EF
+<U0425>     /xd5         CYRILLIC CAPITAL LETTER HA
+<U0426>     /xd6         CYRILLIC CAPITAL LETTER TSE
+<U0427>     /xd7         CYRILLIC CAPITAL LETTER CHE
+<U0428>     /xd8         CYRILLIC CAPITAL LETTER SHA
+<U0429>     /xd9         CYRILLIC CAPITAL LETTER SHCHA
+<U042A>     /xda         CYRILLIC CAPITAL LETTER HARD SIGN
+<U042B>     /xdb         CYRILLIC CAPITAL LETTER YERU
+<U042C>     /xdc         CYRILLIC CAPITAL LETTER SOFT SIGN
+<U042D>     /xdd         CYRILLIC CAPITAL LETTER E
+<U042E>     /xde         CYRILLIC CAPITAL LETTER YU
+<U042F>     /xdf         CYRILLIC CAPITAL LETTER YA
+<U0430>     /xe0         CYRILLIC SMALL LETTER A
+<U0431>     /xe1         CYRILLIC SMALL LETTER BE
+<U0432>     /xe2         CYRILLIC SMALL LETTER VE
+<U0433>     /xe3         CYRILLIC SMALL LETTER GHE
+<U0434>     /xe4         CYRILLIC SMALL LETTER DE
+<U0435>     /xe5         CYRILLIC SMALL LETTER IE
+<U0436>     /xe6         CYRILLIC SMALL LETTER ZHE
+<U0437>     /xe7         CYRILLIC SMALL LETTER ZE
+<U0438>     /xe8         CYRILLIC SMALL LETTER I
+<U0439>     /xe9         CYRILLIC SMALL LETTER SHORT I
+<U043A>     /xea         CYRILLIC SMALL LETTER KA
+<U043B>     /xeb         CYRILLIC SMALL LETTER EL
+<U043C>     /xec         CYRILLIC SMALL LETTER EM
+<U043D>     /xed         CYRILLIC SMALL LETTER EN
+<U043E>     /xee         CYRILLIC SMALL LETTER O
+<U043F>     /xef         CYRILLIC SMALL LETTER PE
+<U0440>     /xf0         CYRILLIC SMALL LETTER ER
+<U0441>     /xf1         CYRILLIC SMALL LETTER ES
+<U0442>     /xf2         CYRILLIC SMALL LETTER TE
+<U0443>     /xf3         CYRILLIC SMALL LETTER U
+<U0444>     /xf4         CYRILLIC SMALL LETTER EF
+<U0445>     /xf5         CYRILLIC SMALL LETTER HA
+<U0446>     /xf6         CYRILLIC SMALL LETTER TSE
+<U0447>     /xf7         CYRILLIC SMALL LETTER CHE
+<U0448>     /xf8         CYRILLIC SMALL LETTER SHA
+<U0449>     /xf9         CYRILLIC SMALL LETTER SHCHA
+<U044A>     /xfa         CYRILLIC SMALL LETTER HARD SIGN
+<U044B>     /xfb         CYRILLIC SMALL LETTER YERU
+<U044C>     /xfc         CYRILLIC SMALL LETTER SOFT SIGN
+<U044D>     /xfd         CYRILLIC SMALL LETTER E
+<U044E>     /xfe         CYRILLIC SMALL LETTER YU
+<U044F>     /xff         CYRILLIC SMALL LETTER YA
+END CHARMAP
diff --git a/localedata/charmaps/RK1048 b/localedata/charmaps/RK1048
new file mode 100644
index 0000000000..882623377d
--- /dev/null
+++ b/localedata/charmaps/RK1048
@@ -0,0 +1,265 @@
+<code_set_name> RK1048
+<comment_char> %
+<escape_char> /
+% version 1.0
+% source: UNICODE 3.2
+
+% alias STRK1048-2002
+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)
+<U0402>     /x80         CYRILLIC CAPITAL LETTER DJE
+<U0403>     /x81         CYRILLIC CAPITAL LETTER GJE
+<U201A>     /x82         SINGLE LOW-9 QUOTATION MARK
+<U0453>     /x83         CYRILLIC SMALL LETTER GJE
+<U201E>     /x84         DOUBLE LOW-9 QUOTATION MARK
+<U2026>     /x85         HORIZONTAL ELLIPSIS
+<U2020>     /x86         DAGGER
+<U2021>     /x87         DOUBLE DAGGER
+<U20AC>     /x88         EURO SIGN
+<U2030>     /x89         PER MILE SIGN
+<U0409>     /x8a         CYRILLIC CAPITAL LETTER LJE
+<U2039>     /x8b         SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+<U040A>     /x8c         CYRILLIC CAPITAL LETTER NJE
+<U049A>     /x8d         CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+<U04BA>     /x8e         CYRILLIC CAPITAL LETTER SHHA
+<U040F>     /x8f         CYRILLIC CAPITAL LETTER DZHE
+<U0452>     /x90         CYRILLIC SMALL LETTER DJE
+<U2018>     /x91         LEFT SINGLE QUOTATION MARK
+<U2019>     /x92         RIGHT SINGLE QUOTATION MARK
+<U201C>     /x93         LEFT DOUBLE QUOTATION MARK
+<U201D>     /x94         RIGHT DOUBLE QUOTATION MARK
+<U2022>     /x95         BULLET
+<U2013>     /x96         EN DASH
+<U2014>     /x97         EM DASH
+%           /x98         UNDEFINED
+<U2122>     /x99         TRADE MARK SIGN
+<U0459>     /x9a         CYRILLIC SMALL LETTER LJE
+<U203A>     /x9b         SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+<U045A>     /x9c         CYRILLIC SMALL LETTER NJE
+<U049B>     /x9d         CYRILLIC SMALL LETTER KA WITH DESCENDER
+<U04BB>     /x9e         CYRILLIC SMALL LETTER SHHA
+<U045F>     /x9f         CYRILLIC SMALL LETTER DZHE
+<U00A0>     /xa0         NO-BREAK SPACE
+<U04B0>     /xa1         CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+<U04B1>     /xa2         CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+<U04D8>     /xa3         CYRILLIC CAPITAL LETTER SCHWA
+<U00A4>     /xa4         CURRENCY SIGN
+<U04E8>     /xa5         CYRILLIC CAPITAL LETTER BARRED O
+<U00A6>     /xa6         BROKEN BAR
+<U00A7>     /xa7         SECTION SIGN
+<U0401>     /xa8         CYRILLIC CAPITAL LETTER IO
+<U00A9>     /xa9         COPYRIGHT SIGN
+<U0492>     /xaa         CYRILLIC CAPITAL LETTER GHE WITH STROKE
+<U00AB>     /xab         LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00AC>     /xac         NOT SIGN
+<U00AD>     /xad         SOFT HYPHEN
+<U00AE>     /xae         REGISTERED SIGN
+<U04AE>     /xaf         CYRILLIC CAPITAL LETTER STRAIGHT U
+<U00B0>     /xb0         DEGREE SIGN
+<U00B1>     /xb1         PLUS-MINUS SIGN
+<U0406>     /xb2         CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+<U0456>     /xb3         CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+<U04E9>     /xb4         CYRILLIC SMALL LETTER BARRED O
+<U00B5>     /xb5         MICRO SIGN
+<U00B6>     /xb6         PILCROW SIGN
+<U00B7>     /xb7         MIDDLE DOT
+<U0451>     /xb8         CYRILLIC SMALL LETTER IO
+<U2116>     /xb9         NUMERO SIGN
+<U0493>     /xba         CYRILLIC SMALL LETTER GHE WITH STROKE
+<U00BB>     /xbb         RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U04D9>     /xbc         CYRILLIC SMALL LETTER SCHWA
+<U04A2>     /xbd         CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+<U04A3>     /xbe         CYRILLIC SMALL LETTER EN WITH DESCENDER
+<U04AF>     /xbf         CYRILLIC SMALL LETTER STRAIGHT U
+<U0410>     /xc0         CYRILLIC CAPITAL LETTER A
+<U0411>     /xc1         CYRILLIC CAPITAL LETTER BE
+<U0412>     /xc2         CYRILLIC CAPITAL LETTER VE
+<U0413>     /xc3         CYRILLIC CAPITAL LETTER GHE
+<U0414>     /xc4         CYRILLIC CAPITAL LETTER DE
+<U0415>     /xc5         CYRILLIC CAPITAL LETTER IE
+<U0416>     /xc6         CYRILLIC CAPITAL LETTER ZHE
+<U0417>     /xc7         CYRILLIC CAPITAL LETTER ZE
+<U0418>     /xc8         CYRILLIC CAPITAL LETTER I
+<U0419>     /xc9         CYRILLIC CAPITAL LETTER SHORT I
+<U041A>     /xca         CYRILLIC CAPITAL LETTER KA
+<U041B>     /xcb         CYRILLIC CAPITAL LETTER EL
+<U041C>     /xcc         CYRILLIC CAPITAL LETTER EM
+<U041D>     /xcd         CYRILLIC CAPITAL LETTER EN
+<U041E>     /xce         CYRILLIC CAPITAL LETTER O
+<U041F>     /xcf         CYRILLIC CAPITAL LETTER PE
+<U0420>     /xd0         CYRILLIC CAPITAL LETTER ER
+<U0421>     /xd1         CYRILLIC CAPITAL LETTER ES
+<U0422>     /xd2         CYRILLIC CAPITAL LETTER TE
+<U0423>     /xd3         CYRILLIC CAPITAL LETTER U
+<U0424>     /xd4         CYRILLIC CAPITAL LETTER EF
+<U0425>     /xd5         CYRILLIC CAPITAL LETTER HA
+<U0426>     /xd6         CYRILLIC CAPITAL LETTER TSE
+<U0427>     /xd7         CYRILLIC CAPITAL LETTER CHE
+<U0428>     /xd8         CYRILLIC CAPITAL LETTER SHA
+<U0429>     /xd9         CYRILLIC CAPITAL LETTER SHCHA
+<U042A>     /xda         CYRILLIC CAPITAL LETTER HARD SIGN
+<U042B>     /xdb         CYRILLIC CAPITAL LETTER YERU
+<U042C>     /xdc         CYRILLIC CAPITAL LETTER SOFT SIGN
+<U042D>     /xdd         CYRILLIC CAPITAL LETTER E
+<U042E>     /xde         CYRILLIC CAPITAL LETTER YU
+<U042F>     /xdf         CYRILLIC CAPITAL LETTER YA
+<U0430>     /xe0         CYRILLIC SMALL LETTER A
+<U0431>     /xe1         CYRILLIC SMALL LETTER BE
+<U0432>     /xe2         CYRILLIC SMALL LETTER VE
+<U0433>     /xe3         CYRILLIC SMALL LETTER GHE
+<U0434>     /xe4         CYRILLIC SMALL LETTER DE
+<U0435>     /xe5         CYRILLIC SMALL LETTER IE
+<U0436>     /xe6         CYRILLIC SMALL LETTER ZHE
+<U0437>     /xe7         CYRILLIC SMALL LETTER ZE
+<U0438>     /xe8         CYRILLIC SMALL LETTER I
+<U0439>     /xe9         CYRILLIC SMALL LETTER SHORT I
+<U043A>     /xea         CYRILLIC SMALL LETTER KA
+<U043B>     /xeb         CYRILLIC SMALL LETTER EL
+<U043C>     /xec         CYRILLIC SMALL LETTER EM
+<U043D>     /xed         CYRILLIC SMALL LETTER EN
+<U043E>     /xee         CYRILLIC SMALL LETTER O
+<U043F>     /xef         CYRILLIC SMALL LETTER PE
+<U0440>     /xf0         CYRILLIC SMALL LETTER ER
+<U0441>     /xf1         CYRILLIC SMALL LETTER ES
+<U0442>     /xf2         CYRILLIC SMALL LETTER TE
+<U0443>     /xf3         CYRILLIC SMALL LETTER U
+<U0444>     /xf4         CYRILLIC SMALL LETTER EF
+<U0445>     /xf5         CYRILLIC SMALL LETTER HA
+<U0446>     /xf6         CYRILLIC SMALL LETTER TSE
+<U0447>     /xf7         CYRILLIC SMALL LETTER CHE
+<U0448>     /xf8         CYRILLIC SMALL LETTER SHA
+<U0449>     /xf9         CYRILLIC SMALL LETTER SHCHA
+<U044A>     /xfa         CYRILLIC SMALL LETTER HARD SIGN
+<U044B>     /xfb         CYRILLIC SMALL LETTER YERU
+<U044C>     /xfc         CYRILLIC SMALL LETTER SOFT SIGN
+<U044D>     /xfd         CYRILLIC SMALL LETTER E
+<U044E>     /xfe         CYRILLIC SMALL LETTER YU
+<U044F>     /xff         CYRILLIC SMALL LETTER YA
+END CHARMAP
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index bad562e818..4faec5cb53 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -17,7 +17,7 @@ comment_char %
 % Application: general
 % Users: general
 % Repertoiremap: mnemonic.ds
-% Charset: ISO-8859-1
+% Charset: ISO-8859-15
 % Distribution and use is free, also
 % for commercial purposes.
 
diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ
new file mode 100644
index 0000000000..683476285f
--- /dev/null
+++ b/localedata/locales/kk_KZ
@@ -0,0 +1,260 @@
+comment_char %
+escape_char  /
+%
+% Kazakh Language Locale for Kazakhstan
+% Source: NIPI, Kazakhstan Copper Corporation
+% Address: 6, Gagarin, 477000, Zhezkazgan, Kazakhstan
+% Contact: Timur Birsh
+% Email: birsh@mail.kz
+% Tel: +7 (310-2) 74-80-12
+% Fax:
+% Language: kk
+% Territory: KZ
+% Revision: 1.0
+% Date: 2003-06-06
+% Application: general
+% Users: general
+% Charset: PT154
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_IDENTIFICATION
+title      "Kazakh locale for Kazakhstan"
+source     "NIPI, Kazakhstan Copper Corporation"
+address    ""
+contact    ""
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "Kazakh"
+territory  "Kazakhstan"
+revision   "1.0"
+date       "2003-06-06"
+%
+category  "kk_KZ:2000";LC_IDENTIFICATION
+category  "kk_KZ:2000";LC_CTYPE
+category  "kk_KZ:2000";LC_COLLATE
+category  "kk_KZ:2000";LC_TIME
+category  "kk_KZ:2000";LC_NUMERIC
+category  "kk_KZ:2000";LC_MONETARY
+category  "kk_KZ:2000";LC_MESSAGES
+category  "kk_KZ:2000";LC_PAPER
+category  "kk_KZ:2000";LC_NAME
+category  "kk_KZ:2000";LC_ADDRESS
+category  "kk_KZ:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
+
+LC_COLLATE
+copy "iso14651_t1"
+
+% iso14651_t1 is missing Ukrainian ghe
+collating-symbol <UKR-GHE>
+collating-symbol <CYR-SCHWA>
+collating-symbol <CYR-GHE-WITH-STROKE>
+collating-symbol <CYR-KA-WITH-DESCENDER>
+collating-symbol <CYR-EN-WITH-DESCENDER>
+collating-symbol <CYR-BARRED-O>
+collating-symbol <CYR-STRAIGHT-U-WITH-STROKE>
+collating-symbol <CYR-STRAIGHT-U>
+collating-symbol <CYR-SHHA>
+collating-symbol <CYR-BEL-UKR-I>
+
+reorder-after <CYR-GZHE>
+<UKR-GHE>
+
+reorder-after <U0453>
+<U0491> <UKR-GHE>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0403>
+<U0490> <UKR-GHE>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-A>
+<CYR-SCHWA>
+
+reorder-after <U0430>
+<U04D9> <CYR-SCHWA>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0410>
+<U04D8> <CYR-SCHWA>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-GHE>
+<CYR-GHE-WITH-STROKE>
+
+reorder-after <U0433>
+<U0493> <CYR-GHE-WITH-STROKE>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0413>
+<U0492> <CYR-GHE-WITH-STROKE>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-KA>
+<CYR-KA-WITH-DESCENDER>
+
+reorder-after <U043A>
+<U049B> <CYR-KA-WITH-DESCENDER>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U041A>
+<U049A> <CYR-KA-WITH-DESCENDER>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-EN>
+<CYR-EN-WITH-DESCENDER>
+
+reorder-after <U043D>
+<U04A3> <CYR-EN-WITH-DESCENDER>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U041D>
+<U04A2> <CYR-EN-WITH-DESCENDER>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-O>
+<CYR-BARRED-O>
+
+reorder-after <U043E>
+<U04E9> <CYR-BARRED-O>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U041E>
+<U04E8> <CYR-BARRED-O>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-OU>
+<CYR-STRAIGHT-U>
+<CYR-STRAIGHT-U-WITH-STROKE>
+
+reorder-after <U0443>
+<U04AF> <CYR-STRAIGHT-U>;<BAS>;<MIN>;IGNORE
+<U04B1> <CYR-STRAIGHT-U-WITH-STROKE>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0423>
+<U04AE> <CYR-STRAIGHT-U>;<BAS>;<CAP>;IGNORE
+<U04B0> <CYR-STRAIGHT-U-WITH-STROKE>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-HA>
+<CYR-SHHA>
+
+reorder-after <U0445>
+<U04BB> <CYR-SHHA>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0425>
+<U04BA> <CYR-SHHA>;<BAS>;<CAP>;IGNORE
+
+reorder-after <CYR-I>
+<CYR-BEL-UKR-I>
+
+reorder-after <U0438>
+<U0456> <CYR-BEL-UKR-I>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0418>
+<U0406> <CYR-BEL-UKR-I>;<BAS>;<CAP>;IGNORE
+
+reorder-end
+END LC_COLLATE
+
+LC_CTYPE
+copy "i18n"
+END LC_CTYPE
+
+LC_MESSAGES
+yesexpr "<U005E><U005B><U0418><U0438><U0059><U0079><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U0416><U0436><U004E><U006E><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+LC_MONETARY
+int_curr_symbol           "<U004B><U005A><U0054><U0020>"
+currency_symbol           "<U0442><U0433>"
+mon_decimal_point         "<U002E>"
+mon_thousands_sep         "<U0020>"
+mon_grouping              3;3
+positive_sign             ""
+negative_sign             "<U002D>"
+int_frac_digits           2
+frac_digits               2
+p_cs_precedes             0
+p_sep_by_space            1
+n_cs_precedes             0
+n_sep_by_space            1
+p_sign_posn               1
+n_sign_posn               1
+END LC_MONETARY
+
+LC_NUMERIC
+decimal_point             "<U002C>"
+thousands_sep             "<U002E>"
+grouping                  3;3
+END LC_NUMERIC
+
+LC_TIME
+day     "<U0416><U0435><U043A><U0441><U0435><U043D><U0431><U0456>";/
+        "<U0414><U04AF><U0439><U0441><U0435><U043D><U0431><U0456>";/
+        "<U0421><U0435><U0439><U0441><U0435><U043D><U0431><U0456>";/
+        "<U0421><U04D9><U0440><U0441><U0435><U043D><U0431><U0456>";/
+        "<U0411><U0435><U0439><U0441><U0435><U043D><U0431><U0456>";/
+        "<U0416><U04B1><U043C><U0430>";/
+        "<U0421><U0435><U043D><U0431><U0456>"
+abday   "<U0416><U043A>";/
+        "<U0414><U0441>";/
+        "<U0421><U0441>";/
+        "<U0421><U0440>";/
+        "<U0411><U0441>";/
+        "<U0416><U043C>";/
+        "<U0421><U043D>"
+mon     "<U049A><U0430><U04A3><U0442><U0430><U0440>";/
+        "<U0410><U049B><U043F><U0430><U043D>";/
+        "<U041D><U0430><U0443><U0440><U044B><U0437>";/
+        "<U0421><U04D9><U0443><U0456><U0440>";/
+        "<U041C><U0430><U043C><U044B><U0440>";/
+        "<U041C><U0430><U0443><U0441><U044B><U043C>";/
+        "<U0428><U0456><U043B><U0434><U0435>";/
+        "<U0422><U0430><U043C><U044B><U0437>";/
+        "<U049A><U044B><U0440><U043A><U04AF><U0439><U0435><U043A>";/
+        "<U049A><U0430><U0437><U0430><U043D>";/
+        "<U049A><U0430><U0440><U0430><U0448><U0430>";/
+        "<U0416><U0435><U043B><U0442><U043E><U049B><U0441><U0430><U043D>"
+abmon   "<U049A><U0430><U04A3>";/
+        "<U0410><U049B><U043F>";/
+        "<U041D><U0430><U0443>";/
+        "<U0421><U04D9><U0443>";/
+        "<U041C><U0430><U043C>";/
+        "<U041C><U0430><U0443>";/
+        "<U0428><U0456><U043B>";/
+        "<U0422><U0430><U043C>";/
+        "<U049A><U044B><U0440>";/
+        "<U049A><U0430><U0437>";/
+        "<U049A><U0430><U0440>";/
+        "<U0416><U0435><U043B>"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062>/
+<U0020><U0025><U0059><U0020><U0025><U0054>"
+d_fmt     "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
+t_fmt     "<U0025><U0054>"
+am_pm     "";""
+t_fmt_ampm ""
+date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
+END LC_TIME
+
+LC_PAPER
+height   297
+width    210
+END LC_PAPER
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
+<U006C>"
+int_prefix     "<U0037>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+% FIXME
+measurement    1
+END LC_MEASUREMENT
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+END LC_NAME
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
+<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+END LC_ADDRESS
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b0eea29d94..4d07dac5ee 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysv/linux/sh/pthread_cond_wait.S: Remove unneeded frame info.
+	* sysv/linux/sh/pthread_cond_timedwait.S: Likewise.
+
 2004-04-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/timer_routines.c: Include errno.h.
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
index 661caa3fb5..ab3bbe035a 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
@@ -264,22 +264,14 @@ __pthread_cond_timedwait:
 
 18:	
 	add	#64, r15
-.Lfree:	
 	lds.l	@r15+, pr
-.Lpop_pr:
 	mov.l	@r15+, r13
-.Lpop_r13:
 	mov.l	@r15+, r12
-.Lpop_r12:
 	mov.l	@r15+, r11
-.Lpop_r11:
 	mov.l	@r15+, r10
-.Lpop_r10:
 	mov.l	@r15+, r9
-.Lpop_r9:
 	rts
 	 mov.l	@r15+, r8
-.Lpop_r8:
 
 .L1k:
 	.word	1000
@@ -296,7 +288,6 @@ __pthread_cond_timedwait:
 	.long	1000000000
 
 1:
-.LSblSTART:
 	/* Initial locking failed.  */
 	mov	r8, r5
 #if cond_lock != 0
@@ -370,7 +361,6 @@ __pthread_cond_timedwait:
 17:
 	bra	18b
 	 mov.l	@(24,r15), r0
-.LSblEND:
 
 	.align	2
 .Lmwait2:
@@ -604,53 +594,6 @@ __condvar_tw_cleanup:
 	.ualong	.Lalloc-.Lpush_pr
 	.byte	0xe
 	.uleb128 92
-	.byte	0x4
-	.ualong	.Lfree-.Lalloc
-	.byte	0xe
-	.uleb128 28
-	.byte	0x4
-	.ualong	.Lpop_pr-.Lfree
-	.byte	0xe
-	.uleb128 24
-	.byte	0xd1
-	.byte	0x4
-	.ualong	.Lpop_r13-.Lpop_pr
-	.byte	0xe
-	.uleb128 20
-	.byte	0xcd
-	.byte	0x4
-	.ualong	.Lpop_r12-.Lpop_r13
-	.byte	0xe
-	.uleb128 16
-	.byte	0xcc
-	.byte	0x4
-	.ualong	.Lpop_r11-.Lpop_r12
-	.byte	0xe
-	.uleb128 12
-	.byte	0xcb
-	.byte	0x4
-	.ualong	.Lpop_r10-.Lpop_r11
-	.byte	0xe
-	.uleb128 8
-	.byte	0xca
-	.byte	0x4
-	.ualong	.Lpop_r9-.Lpop_r10
-	.byte	0xe
-	.uleb128 4
-	.byte	0xc9
-	.byte	0x4
-	.ualong	.Lpop_r8-.Lpop_r9
-	.byte	0xe
-	.uleb128 0
-	.byte	0xc8
-	.byte	0x4
-	.ualong	.LSblSTART-.Lpop_r8
-	.byte	0xe
-	.uleb128 72
-	.byte	0x4
-	.ualong	.LSblEND-.LSblSTART
-	.byte	0xe
-	.uleb128 72
 	.align	2
 .LENDFDE:
 
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
index 01b906eeed..c93a304363 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
@@ -196,20 +196,13 @@ __pthread_cond_wait:
 
 14:
 	add	#48, r15
-.Lfree:	
 	lds.l	@r15+, pr
-.Lpop_pr:
 	mov.l	@r15+, r12
-.Lpop_r12:
 	mov.l	@r15+, r11
-.Lpop_r11:
 	mov.l	@r15+, r10
-.Lpop_r10:
 	mov.l	@r15+, r9
-.Lpop_r9:
 	rts
 	 mov.l	@r15+, r8
-.Lpop_r8:
 
 	.align	2
 .Lmunlock0:
@@ -222,7 +215,6 @@ __pthread_cond_wait:
 	.long	__pthread_mutex_cond_lock-.Lmlocki0b
 
 1:
-.LSblSTART:
 	/* Initial locking failed.  */
 	mov	r8, r5
 #if cond_lock != 0
@@ -296,7 +288,6 @@ __pthread_cond_wait:
 13:
 	bra	14b
 	 mov.l	@(12,r15), r0
-.LSblEND:
 
 	.align	2
 .Lmwait0:
@@ -524,48 +515,6 @@ __condvar_w_cleanup:
 	.ualong	.Lalloc-.Lpush_pr
 	.byte	0xe
 	.uleb128 72
-	.byte	0x4
-	.ualong	.Lfree-.Lalloc
-	.byte	0xe
-	.uleb128 24
-	.byte	0x4
-	.ualong	.Lpop_pr-.Lfree
-	.byte	0xe
-	.uleb128 20
-	.byte	0xd1
-	.byte	0x4
-	.ualong	.Lpop_r12-.Lpop_pr
-	.byte	0xe
-	.uleb128 16
-	.byte	0xcc
-	.byte	0x4
-	.ualong	.Lpop_r11-.Lpop_r12
-	.byte	0xe
-	.uleb128 12
-	.byte	0xcb
-	.byte	0x4
-	.ualong	.Lpop_r10-.Lpop_r11
-	.byte	0xe
-	.uleb128 8
-	.byte	0xca
-	.byte	0x4
-	.ualong	.Lpop_r9-.Lpop_r10
-	.byte	0xe
-	.uleb128 4
-	.byte	0xc9
-	.byte	0x4
-	.ualong	.Lpop_r8-.Lpop_r9
-	.byte	0xe
-	.uleb128 0
-	.byte	0xc8
-	.byte	0x4
-	.ualong	.LSblSTART-.Lpop_r8
-	.byte	0xe
-	.uleb128 72
-	.byte	0x4
-	.ualong	.LSblEND-.LSblSTART
-	.byte	0xe
-	.uleb128 72
 	.align	2
 .LENDFDE:
 
diff --git a/sysdeps/sh/elf/configure b/sysdeps/sh/elf/configure
new file mode 100644
index 0000000000..df45f2cde2
--- /dev/null
+++ b/sysdeps/sh/elf/configure
@@ -0,0 +1,47 @@
+# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
+ # Local configure fragment for sysdeps/sh/elf.
+
+if test "$usetls" != no; then
+# Check for support of thread-local storage handling in assembler and
+# linker.
+echo "$as_me:$LINENO: checking for SH TLS support" >&5
+echo $ECHO_N "checking for sh TLS support... $ECHO_C" >&6
+if test "${libc_cv_sh_tls+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat > conftest.S <<\EOF
+	.section ".tdata", "awT", @progbits
+foo:	.long	25
+	.text
+	.long	foo@TLSGD
+	.long	foo@TLSLDM
+	.long	foo@DTPOFF
+	.long	foo@GOTTPOFF
+	.long	foo@TPOFF
+EOF
+if { ac_try='${CC-cc} -S $CFLAGS conftest.S 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  libc_cv_sh_tls=yes
+else
+  libc_cv_sh_tls=no
+fi
+rm -f conftest*
+fi
+echo "$as_me:$LINENO: result: $libc_cv_sh_tls" >&5
+echo "${ECHO_T}$libc_cv_sh_tls" >&6
+if test $libc_cv_sh_tls = yes; then
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_TLS_SUPPORT 1
+_ACEOF
+
+fi
+fi
+
+cat >>confdefs.h <<\_ACEOF
+#define PI_STATIC_AND_HIDDEN 1
+_ACEOF
+
diff --git a/sysdeps/sh/elf/configure.in b/sysdeps/sh/elf/configure.in
new file mode 100644
index 0000000000..42aca3f8ef
--- /dev/null
+++ b/sysdeps/sh/elf/configure.in
@@ -0,0 +1,32 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/sh/elf.
+
+if test "$usetls" != no; then
+# Check for support of thread-local storage handling in assembler and
+# linker.
+AC_CACHE_CHECK(for SH TLS support, libc_cv_sh_tls, [dnl
+cat > conftest.S <<\EOF
+	.section ".tdata", "awT", @progbits
+foo:	.long	25
+	.text
+	.long	foo@TLSGD
+	.long	foo@TLSLDM
+	.long	foo@DTPOFF
+	.long	foo@GOTTPOFF
+	.long	foo@TPOFF
+EOF
+dnl
+if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS conftest.S 1>&AS_MESSAGE_LOG_FD); then
+  libc_cv_sh_tls=yes
+else
+  libc_cv_sh_tls=no
+fi
+rm -f conftest*])
+if test $libc_cv_sh_tls = yes; then
+  AC_DEFINE(HAVE_TLS_SUPPORT)
+fi
+fi
+
+dnl It is always possible to access static and hidden symbols in an
+dnl position independent way.
+AC_DEFINE(PI_STATIC_AND_HIDDEN)
author	Ulrich Drepper <drepper@redhat.com>	2004-04-17 22:34:18 +0000
committer	Ulrich Drepper <drepper@redhat.com>	2004-04-17 22:34:18 +0000
commit	7eb7fdda7e81b1b028f5fbdec6b45155d2520698 (patch)
tree	023a01b13f1241af1ee4179f267e22122d6d6f17
parent	d7ba1313b9da6d39ca80d13c38186ce4fb7f2d92 (diff)