aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-09-04 12:48:31 -0700
committerUlrich Drepper <drepper@redhat.com>2010-09-04 12:48:31 -0700
commit29fddf61b28e57265b5c5f7be2b42bb73906ae53 (patch)
treef331a41b8ea8fb6a83c140424f729fd1af852b74
parent4ac42e193ff3f526549e5099f5d2a4139762215a (diff)
downloadglibc-29fddf61b28e57265b5c5f7be2b42bb73906ae53.zip
glibc-29fddf61b28e57265b5c5f7be2b42bb73906ae53.tar.gz
glibc-29fddf61b28e57265b5c5f7be2b42bb73906ae53.tar.bz2
Remove invalid iconv aliases.
-rw-r--r--ChangeLog6
-rw-r--r--iconvdata/gconv-modules5
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fe512db..e7f2747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-04 Ulrich Drepper <drepper@redhat.com>
+
+ [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@redhat.com>
* sysdeps/x86_64/add_n.S: Update from GMP 5.0.1.
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index e70432f..a318716 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -938,7 +938,6 @@ module INTERNAL IBM922// IBM922 1
# 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 @@ module INTERNAL IBM932// IBM932 1
# 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 @@ module INTERNAL IBM933// IBM933 1
# 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 @@ module INTERNAL IBM935// IBM935 1
# 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 @@ module INTERNAL IBM937// IBM937 1
# 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