* iconvdata/cp1125.c: New file.

	* iconvdata/Makefile (distribute): Add it.
	(modules): Add CP1125.
	(gen-8bit-gap-modules): Add cp1125.
	* iconvdata/gconv-modules: Add CP1125, alias RUSCII.
	* iconvdata/tst-tables.sh: Add CP1125 to the list to test.

6 files changed, 54 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f9078753a..24e1a635b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-03  Roland McGrath  <roland@redhat.com>
+
+	* iconvdata/cp1125.c: New file.
+	* iconvdata/Makefile (distribute): Add it.
+	(modules): Add CP1125.
+	(gen-8bit-gap-modules): Add cp1125.
+	* iconvdata/gconv-modules: Add CP1125, alias RUSCII.
+	* iconvdata/tst-tables.sh: Add CP1125 to the list to test.
+
 2002-12-03  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/x86_64/fpu/libm-test-ulps: Regenerated.
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 0b36ead013..0978a105e9 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -40,8 +40,8 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
 	   IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943		 \
 	   IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046		 \
 	   IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164	 \
-	   IBM918 IBM1004 IBM1026 CP1250 CP1251 CP1252 CP1253 CP1254	 \
-	   CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1		 \
+	   IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253	 \
+	   CP1254 CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1	 \
 	   ASMO_449 ANSI_X3.110 CSN_369103 CWI DEC-MCS ECMA-CYRILLIC	 \
 	   GOST_19768-74 GREEK-CCITT GREEK7 GREEK7-OLD INIS INIS-8	 \
 	   INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT	 \
@@ -128,8 +128,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      8bit-generic.c 8bit-gap.c					    \
 	      ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h		    \
 	      cp775.c cp775.h ibm874.c cns11643.c cns11643.h		    \
-	      cns11643l1.c cns11643l1.h cp1250.c cp1251.c cp1252.c cp1253.c \
-	      cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c		    \
+	      cns11643l1.c cns11643l1.h cp1125.c cp1250.c cp1251.c cp1252.c \
+	      cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c	    \
 	      csn_369103.c cwi.c dec-mcs.c ebcdic-at-de.c ebcdic-at-de-a.c  \
 	      ebcdic-ca-fr.c ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c    \
 	      ebcdic-es-a.c ebcdic-es-s.c ebcdic-fr.c ebcdic-fi-se.c	    \
@@ -198,7 +198,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			ibm297 ibm420 ibm424 ibm437 ibm850 ibm851 ibm852   \
 			ibm855 ibm857 ibm860 ibm861 ibm862 ibm863 ibm864   \
 			ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004  \
-			ibm1026 cp1250 cp1251 cp1252 cp1253 cp1254	   \
+			ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254  \
 			cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \
 			iso8859-10 macintosh iec_p27-1 asmo_449		   \
 			csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \
diff --git a/iconvdata/cp1125.c b/iconvdata/cp1125.c
new file mode 100644
index 0000000000..352f523978
--- /dev/null
+++ b/iconvdata/cp1125.c
@@ -0,0 +1,28 @@
+/* Conversion from and to CP1125.
+   Copyright (C) 2002 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
+   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 <cp1125.h>
+
+#define CHARSET_NAME	"CP1125//"
+#define HAS_HOLES	0	/* All 256 character are defined.  */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index c5fc10e5d0..68df77a2fc 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1130,6 +1130,12 @@ module	EUC-TW//		INTERNAL		EUC-TW		1
 module	INTERNAL		EUC-TW//		EUC-TW		1
 
 #	from			to			module		cost
+alias	RUSCII//		CP1125//
+alias	IBM848//		CP1125//
+module	CP1125//		INTERNAL		CP1125		1
+module	INTERNAL		CP1125//		CP1125		1
+
+#	from			to			module		cost
 alias	MS-EE//			CP1250//
 alias	WINDOWS-1250//		CP1250//
 module	CP1250//		INTERNAL		CP1250		1
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index e5bb7f0afb..e333a5ad36 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -152,6 +152,7 @@ cat <<EOF |
   IBM1162
   IBM1163
   IBM1164
+  CP1125
   CP1250
   CP1251
   CP1252
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 530a77506f..0cecce30bc 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-03  Roland McGrath  <roland@redhat.com>
+
+	* charmaps/CP1125: New file.
+	* CHECKSUMS: Add it.
+
 2002-11-06  Thorsten Kukuk  <kukuk@suse.de>
 
         * locales/tl_PH: Fix typo: Philipines -> Philippines.