[commits] r11437 - in /fsf/trunk/libc: ChangeLog iconvdata/gconv-modules

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Sep  5 00:03:41 2010
New Revision: 11437

Log:
Import glibc-mainline for 2010-09-05

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/iconvdata/gconv-modules

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Sep  5 00:03:41 2010
@@ -1,3 +1,9 @@
+2010-09-04  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #11979]
+	* iconvdata/gconv-modules: Remove EBCDIC-CP-AR2 alias from
+	IBM-930, IBM-933, IBM-935, IBM-937, and IBM-939.
+
 2010-09-02  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/x86_64/add_n.S: Update from GMP 5.0.1.

Modified: fsf/trunk/libc/iconvdata/gconv-modules
==============================================================================
--- fsf/trunk/libc/iconvdata/gconv-modules (original)
+++ fsf/trunk/libc/iconvdata/gconv-modules Sun Sep  5 00:03:41 2010
@@ -938,7 +938,6 @@
 #	from			to			module		cost
 alias	IBM-930//		IBM930//
 alias	CP930//			IBM930//
-alias	EBCDIC-CP-AR2//		IBM930//
 alias	CSIBM930//		IBM930//
 module	IBM930//		INTERNAL		IBM930		1
 module	INTERNAL		IBM930//		IBM930		1
@@ -952,7 +951,6 @@
 #	from			to			module		cost
 alias	IBM-933//		IBM933//
 alias	CP933//			IBM933//
-alias	EBCDIC-CP-AR2//		IBM933//
 alias	CSIBM933//		IBM933//
 module	IBM933//		INTERNAL		IBM933		1
 module	INTERNAL		IBM933//		IBM933		1
@@ -960,7 +958,6 @@
 #	from			to			module		cost
 alias	IBM-935//		IBM935//
 alias	CP935//			IBM935//
-alias	EBCDIC-CP-AR2//		IBM935//
 alias	CSIBM935//		IBM935//
 module	IBM935//		INTERNAL		IBM935		1
 module	INTERNAL		IBM935//		IBM935		1
@@ -968,7 +965,6 @@
 #	from			to			module		cost
 alias	IBM-937//		IBM937//
 alias	CP937//			IBM937//
-alias	EBCDIC-CP-AR2//		IBM937//
 alias	CSIBM937//		IBM937//
 module	IBM937//		INTERNAL		IBM937		1
 module	INTERNAL		IBM937//		IBM937		1
@@ -976,7 +972,6 @@
 #	from			to			module		cost
 alias	IBM-939//		IBM939//
 alias	CP939//			IBM939//
-alias	EBCDIC-CP-AR2//		IBM939//
 alias	CSIBM939//		IBM939//
 module	IBM939//		INTERNAL		IBM939		1
 module	INTERNAL		IBM939//		IBM939		1