diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f6428ad86bbc7d34f30919838f0eb431110a6b9a..37a8b22c590bd1d84de6ad9ed0436cb300189fe0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+2004-02-19 David Edelsohn <edelsohn@gnu.org>
+
+ * 22_locale/collate/compare/wchar_t/2.cc: Change input-charset
+ from iso-8859-1 to ISO8859-1.
+ * 22_locale/collate/compare/wchar_t/wrapped_env.cc: Same.
+ * 22_locale/collate/compare/wchar_t/wrapped_locale.cc: Same.
+ * 22_locale/collate/hash/wchar_t/2.cc: Same.
+ * 22_locale/collate/hash/wchar_t/wrapped_env.cc: Same.
+ * 22_locale/collate/hash/wchar_t/wrapped_locale.cc: Same.
+ * 22_locale/collate/transform/wchar_t/2.cc: Same.
+ * 22_locale/collate/transform/wchar_t/wrapped_env.cc: Same.
+ * 22_locale/collate/transform/wchar_t/wrapped_locale.cc: Same.
+
2004-02-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.h (money_get<>::_M_extract):
diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
index 97ce326f810cbe28da657c16b1bd47a881088de8..e414718be8ddba74d367013fafda86d89d55d75b 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
@@ -19,7 +19,7 @@
// USA.
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
// 22.2.4.1.1 collate members
diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
index dd4ef2aeff533c4c69861e9f2a31e3687886ac25..7f8c2870e0da1b4806bd12e103a8ac3347a35563 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
index f8af6497cedf03a79a6c2404d25cede333586db8..0b25d8ebb514986a1cac4df0a15d90065b848809 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
index c10c50786fc9a1d4bc7c423b74ce9c880da04ec2..085d53bdf89e3684377620f2b326eeb7a04b8feb 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <locale>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
index dd4ef2aeff533c4c69861e9f2a31e3687886ac25..7f8c2870e0da1b4806bd12e103a8ac3347a35563 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
index f8af6497cedf03a79a6c2404d25cede333586db8..0b25d8ebb514986a1cac4df0a15d90065b848809 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
index 41044fd52edfbf4f02aa3e0ca9dab211bb86c5d9..9095520db1dcda81a266836c72c3135938a927ed 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <locale>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
index 7c251724a5bc18321942aed874299740d8469e74..3468dd8f75af465def637b82c9c364be11946cf4 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
index cffa25df532ee0f80106a96d45f36fca3c4c9679..477dbba2277c9c8827a8dd5abc28358ad0598ca0 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
@@ -21,7 +21,7 @@
// 22.2.4.1.1 collate members
// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
+// { dg-options "-finput-charset=ISO8859-1" }
#include <testsuite_hooks.h>