obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 69 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
new file mode 100644
index 000000000..86b4216d1
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
@@ -0,0 +1,69 @@
+// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
+// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
+// { dg-options "-pthreads" { target *-*-solaris* } }
+// { dg-require-namedlocale "en_US" }
+// { dg-require-namedlocale "fr_FR" }
+
+// Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.1.1.2 locale constructors and destructors [lib.locale.cons]
+
+#include <locale>
+#include <pthread.h>
+#include <testsuite_hooks.h>
+
+const int max_thread_count = 20;
+//const int max_loop_count = 1000000; // orig value
+const int max_loop_count = 100000;
+const int max_locales = 10;
+ 
+void* thread_main(void*)
+{
+  try
+    {
+      std::locale loc_c = std::locale::classic();
+      std::locale loc[max_locales];
+      for (int j = 0; j < max_locales; ++j)
+	loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");
+      
+      for (int i = 0; i < max_loop_count; ++i)
+	{
+	  int k = i % max_locales;
+	  loc[k] = std::locale::global(loc[k]);
+	  
+	  if (i % 37 == 0)
+	    loc[k] = loc[k].combine<std::ctype<char> >(loc_c);
+	}
+    }
+  catch (...) { }
+  return 0;
+}
+ 
+int
+main()
+{
+  pthread_t tid[max_thread_count];
+  
+  for (int i = 0; i < max_thread_count; i++)
+    pthread_create (&tid[i], 0, thread_main, 0);
+  
+  for (int i = 0; i < max_thread_count; i++)
+    pthread_join (tid[i], 0);
+
+  return 0;
+}