diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index adbf06b173d..d54ffa1fb41 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Steev Wilcox  <steev@paradigmds.com>
+	 
+	PR libstdc++/7057
+	* include/ext/stl_hashtable.h: Fix.
+	* testsuite/ext/hash_map.cc: New.
+	
 2002-07-03  Jack Reeves  <jackw_reeves@hotmail.com>
             Kenny Simpson  <theonetruekenny@yahoo.com>
             Phil Edwards  <pme@gcc.gnu.org>
diff --git a/libstdc++-v3/include/ext/stl_hashtable.h b/libstdc++-v3/include/ext/stl_hashtable.h
index c4fab34c474..b41c821f603 100644
--- a/libstdc++-v3/include/ext/stl_hashtable.h
+++ b/libstdc++-v3/include/ext/stl_hashtable.h
@@ -607,11 +607,28 @@ bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1,
   for (size_t __n = 0; __n < __ht1._M_buckets.size(); ++__n) {
     _Node* __cur1 = __ht1._M_buckets[__n];
     _Node* __cur2 = __ht2._M_buckets[__n];
-    for ( ; __cur1 && __cur2 && __cur1->_M_val == __cur2->_M_val;
+    // Check same length of lists
+    for ( ; __cur1 && __cur2;
           __cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next)
       {}
     if (__cur1 || __cur2)
       return false;
+    // Now check one's elements are in the other
+    for (__cur1 = __ht1._M_buckets[__n] ; __cur1; __cur1 = __cur1->_M_next)
+    {
+      bool _found__cur1 = false;
+      for (_Node* __cur2 = __ht2._M_buckets[__n];
+           __cur2; __cur2 = __cur2->_M_next)
+      {
+        if (__cur1->_M_val == __cur2->_M_val)
+        {
+          _found__cur1 = true;
+          break;
+        }
+      }
+      if (!_found__cur1)
+        return false;
+    }
   }
   return true;
 }  
diff --git a/libstdc++-v3/testsuite/ext/hash_map.cc b/libstdc++-v3/testsuite/ext/hash_map.cc
new file mode 100644
index 00000000000..55b740f3ee8
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/hash_map.cc
@@ -0,0 +1,102 @@
+// Copyright (C) 2002 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// hash_map (SGI extension)
+
+#include <cstdlib>
+#include <string>
+#include <ext/hash_map>
+#include <testsuite_hooks.h>
+
+using namespace std;
+using namespace __gnu_cxx;
+
+namespace __gnu_cxx 
+{
+  inline size_t hash_string(const char* s)
+  {
+    unsigned long h; 
+    for (h=0; *s; ++s) {
+      h = 5*h + *s;
+    }
+    return size_t(h);
+  }
+
+  template<class T> struct hash<T *>
+  {
+    size_t operator()(const T *const & s) const
+      { return reinterpret_cast<size_t>(s); }
+  };    
+  
+  template<> struct hash<string>
+  {
+    size_t operator()(const string &s) const { return hash_string(s.c_str()); }
+  };
+
+  template<> struct hash<const string>
+  {
+    size_t operator()(const string &s) const { return hash_string(s.c_str()); }
+  };
+
+  template<class T1, class T2> struct hash<pair<T1,T2> >
+  {
+    hash<T1> __fh;
+    hash<T2> __sh;
+    size_t operator()(const pair<T1,T2> &p) const { 
+      return __fh(p.first) ^ __sh(p.second);
+    }
+  };
+}
+
+
+const int Size = 5;
+
+void test01()
+{
+  bool test = true;
+
+  for (int i = 0; i < 10; i++)
+  {
+    hash_map<string,int> a;
+    hash_map<string,int> b;
+    
+    vector<pair<string,int> > contents (Size);
+    for (int j = 0; j < Size; j++)
+    {
+      string s;
+      for (int k = 0; k < 10; k++)
+      {
+        s += 'a' + (rand() % 26);
+      }
+      contents[j] = make_pair(s,j);
+    }
+    for (int j = 0; j < Size; j++)
+    {
+      a[contents[j].first] = contents[j].second;
+      int k = Size - 1 - j;
+      b[contents[k].first] = contents[k].second;
+    }
+    VERIFY( a == b );
+  }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}