Merge changes between r3614 and r3746 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@3747 7b3dc134-2b1b-0410-93df-9e9f96275f8d

7 files changed, 79 insertions, 6 deletions

diff --git a/libc/iconvdata/Makefile b/libc/iconvdata/Makefile
index 29c9fe590..f7f41e60d 100644
--- a/libc/iconvdata/Makefile
+++ b/libc/iconvdata/Makefile
@@ -62,7 +62,7 @@ modules-$(OPTION_EGLIBC_CHARSETS)					 \
 	   IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 	 \
 	   IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
 	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF	 \
-	   MAC-CENTRALEUROPE
+	   MAC-CENTRALEUROPE KOI8-RU ISO8859-9E
 
 modules.so := $(addsuffix .so, $(modules-y))
 
@@ -169,7 +169,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
 	      inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c	    \
 	      iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
 	      iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c  \
-	      iso8859-11.c iso8859-13.c iso8859-14.c			    \
+	      iso8859-11.c iso8859-13.c iso8859-14.c iso8859-9e.c	    \
 	      iso8859-15.c iso_2033.c iso_5427-ext.c iso_5427.c iso_5428.c  \
 	      iso_6937.c iso_6937-2.c iso_10367-box.c jis0201.c jis0201.h   \
 	      jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c	    \
@@ -225,7 +225,8 @@ gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
 		    ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a ebcdic-fr	    \
 		    ebcdic-is-friss ebcdic-it ebcdic-pt ebcdic-uk ebcdic-us \
 		    ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
-		    ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii
+		    ibm891 ibm903 ibm904 ibm905 ibm1047 iso8859-16 viscii   \
+		    iso8859-9e
 
 gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290   \
@@ -243,7 +244,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t	   \
 			georgian-ps georgian-academy iso-ir-209 mac-sami   \
 			iso8859-11 ibm866nav pt154 rk1048 mik brf \
-			mac-centraleurope
+			mac-centraleurope koi8-ru
 
 gen-special-modules := iso8859-7jp
 
diff --git a/libc/iconvdata/TESTS b/libc/iconvdata/TESTS
index 251f24b73..9284b448e 100644
--- a/libc/iconvdata/TESTS
+++ b/libc/iconvdata/TESTS
@@ -39,6 +39,7 @@ ISO-8859-6		ISO-8859-6		Y	UTF8
 ISO-8859-7		ISO-8859-7		Y	UTF8
 ISO-8859-8		ISO-8859-8		Y	UTF8
 ISO-8859-9		ISO-8859-9		Y	UTF8
+ISO-8859-9E		ISO-8859-9E		Y	UTF8
 ISO-8859-10		ISO-8859-10		Y	UCS-2BE UTF8
 ISO-8859-14		ISO-8859-14		Y	UTF8
 ISO-8859-15		ISO-8859-15		Y	UTF8
@@ -169,3 +170,4 @@ MIK			MIK			Y	UTF8
 BRF			BRF			-	UTF8
 MAC-SAMI		MAC-SAMI		Y	UTF8
 MAC-CENTRALEUROPE	MAC-CENTRALEUROPE	Y	UTF8
+KOI8-RU			KOI8-RU			Y	UTF8
diff --git a/libc/iconvdata/gconv-modules b/libc/iconvdata/gconv-modules
index fc8e3cdb2..a8fcd8f0b 100644
--- a/libc/iconvdata/gconv-modules
+++ b/libc/iconvdata/gconv-modules
@@ -1916,3 +1916,14 @@ module	INTERNAL		BRF//			BRF		1
 alias	CP1282//		MAC-CENTRALEUROPE//
 module	MAC-CENTRALEUROPE//	INTERNAL		MAC-CENTRALEUROPE 1
 module	INTERNAL		MAC-CENTRALEUROPE//	MAC-CENTRALEUROPE 1
+
+#	from			to			module		cost
+module	KOI8-RU//		INTERNAL		KOI8-RU		1
+module	INTERNAL		KOI8-RU//		KOI8-RU		1
+
+#	from			to			module		cost
+alias	ISO_8859-9E//		ISO-8859-9E//
+alias	ISO8859-9E//		ISO-8859-9E//
+alias	ISO88599E//		ISO-8859-9E//
+module	ISO-8859-9E//		INTERNAL		ISO8859-9E	1
+module	INTERNAL		ISO-8859-9E//		ISO8859-9E	1
diff --git a/libc/iconvdata/iso8859-9e.c b/libc/iconvdata/iso8859-9e.c
new file mode 100644
index 000000000..7048edac6
--- /dev/null
+++ b/libc/iconvdata/iso8859-9e.c
@@ -0,0 +1,28 @@
+/* Conversion from and to ISO 8859-9E.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2007.
+
+   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.  */
+
+/* Get the conversion table.  */
+#include <stdint.h>
+#include <iso8859-9e.h>
+
+#define CHARSET_NAME "ISO-8859-9E//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-generic.c>
diff --git a/libc/iconvdata/koi8-r.c b/libc/iconvdata/koi8-r.c
index 88fe157a0..2e7934d0b 100644
--- a/libc/iconvdata/koi8-r.c
+++ b/libc/iconvdata/koi8-r.c
@@ -1,5 +1,5 @@
 /* Conversion from and to KOI8-R.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -24,6 +24,6 @@
 #define TABLES <koi8-r.h>
 
 #define CHARSET_NAME	"KOI8-R//"
-#define HAS_HOLES	1	/* Not all 256 character are defined.  */
+#define HAS_HOLES	0	/* All 256 character are defined.  */
 
 #include <8bit-gap.c>
diff --git a/libc/iconvdata/koi8-ru.c b/libc/iconvdata/koi8-ru.c
new file mode 100644
index 000000000..ce1b1cff5
--- /dev/null
+++ b/libc/iconvdata/koi8-ru.c
@@ -0,0 +1,29 @@
+/* Conversion from and to KOI8-RU.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 20077.
+
+   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>
+
+/* Specify the conversion table.  */
+#define TABLES <koi8-ru.h>
+
+#define CHARSET_NAME	"KOI8-RU//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/libc/iconvdata/tst-tables.sh b/libc/iconvdata/tst-tables.sh
index 3b34615eb..0f0e4ea90 100755
--- a/libc/iconvdata/tst-tables.sh
+++ b/libc/iconvdata/tst-tables.sh
@@ -66,6 +66,7 @@ cat <<EOF |
   ISO-8859-7
   ISO-8859-8
   ISO-8859-9
+  ISO-8859-9E
   ISO-8859-10
   ISO-8859-11
   ISO-8859-13
@@ -211,6 +212,7 @@ cat <<EOF |
   MIK
   BRF
   MAC-CENTRALEUROPE
+  KOI8-RU
   #
   # Multibyte encodings come here
   #