From 9ccd0dba212a29fc9f2744f35db60f6efd1976e1 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 24 Mar 2015 14:47:32 +0000
Subject: [PATCH] re PR libstdc++/33394 (Add test case for Thread race segfault
 in std::string::append with -O and -s)

	PR libstdc++/33394
	* testsuite/21_strings/basic_string/pthread33394.cc: Add test.

# Auto-generated commit message above this line, original below.
	PR libstdc++/33394
	* testsuite/21_strings/basic_string/pthread33394.cc: Add test.

From-SVN: r221635
---
 libstdc++-v3/ChangeLog                        |  5 ++
 .../21_strings/basic_string/pthread33394.cc   | 49 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5a72407acfb..4758be2b0b0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-24  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/33394
+	* testsuite/21_strings/basic_string/pthread33394.cc: Add test.
+
 2015-03-23  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/64967
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc b/libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc
new file mode 100644
index 00000000000..c706504bd53
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/pthread33394.cc
@@ -0,0 +1,49 @@
+// Copyright (C) 2015 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 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/>.
+
+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* } }
+
+// { dg-options "-DITERATIONS=1000" { target simulator } }
+#ifndef ITERATIONS
+#define ITERATIONS 50000
+#endif
+
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32261
+
+#include <pthread.h>
+#include <string>
+
+extern "C" void* thread_function(void*) {
+    for (int k = 0; k < ITERATIONS; k++) {
+        std::string my_str;
+        my_str += "foo";
+    }
+    return 0;
+}
+
+int main()
+{
+    pthread_t thread1, thread2;
+
+    pthread_create(&thread1, NULL, thread_function, NULL);
+    pthread_create(&thread2, NULL, thread_function, NULL);
+
+    void* exitcode;
+    pthread_join(thread1, &exitcode);
+    pthread_join(thread2, &exitcode);
+}
-- 
2.30.2