diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9272f153ad9..5305c346ed8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-04  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/25_algorithms/copy/1.cc: Add instantiations for
+	systems with no COMDAT or weak support.
+	* testsuite/25_algorithms/copy/2.cc: Likewise.
+	* testsuite/25_algorithms/copy/3.cc: Likewise.
+	* testsuite/25_algorithms/copy/4.cc: Likewise.
+
 2004-07-03  Paul Brook  <paul@codesourcery.com>
 
 	* configure.ac: Set ABI_TWEAKS_SRCDIR.
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
index 7c45db2e0e4..2ad90ae978e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
@@ -56,6 +56,11 @@ test01()
   VERIFY( equal(s2, s2 + N, A) );
 }
 
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+// Explicitly instantiate for systems with no COMDAT or weak support.
+template class __gnu_cxx::__mt_alloc<int>;
+#endif
+
 int
 main()
 {
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
index 8fe3b3a61c8..54bc439dac2 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
@@ -57,6 +57,11 @@ test01()
   VERIFY( equal(s2, s2 + N, a.begin()) );
 }
 
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+// Explicitly instantiate for systems with no COMDAT or weak support.
+template class __gnu_cxx::__mt_alloc<int>;
+#endif
+
 int
 main()
 {
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/3.cc b/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
index 0bf0432dccc..c3f7979d8b9 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
@@ -58,6 +58,12 @@ test01()
   VERIFY( equal(s2, s2 + N, a.begin()) );
 }
 
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+// Explicitly instantiate for systems with no COMDAT or weak support.
+template class __gnu_cxx::__mt_alloc<int*>;
+template class __gnu_cxx::__mt_alloc<int>;
+#endif
+
 int
 main()
 {
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
index 91818f36673..edd089de313 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
@@ -58,6 +58,12 @@ test01()
   VERIFY( equal(s2, s2 + N, a.begin()) );
 }
 
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+// Explicitly instantiate for systems with no COMDAT or weak support.
+template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
+template class __gnu_cxx::__mt_alloc<int>;
+#endif
+
 int
 main()
 {