- enable libstdc++ pthread regresses

- fix g++ regress so it can find libstdc++ in the objdir

okay espie@ kettenis@

7 files changed, 15 insertions, 14 deletions

diff --git a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread1.cc b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread1.cc
index a6af93fbe9a..38728854bfc 100644
--- a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread1.cc
+++ b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread1.cc
@@ -18,8 +18,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
-// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* } }
+// { dg-do run { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
 
 // This multi-threading C++/STL/POSIX code adheres to rules outlined here:
diff --git a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread2.cc b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread2.cc
index 2ce17b72ba9..df5b6e88aab 100644
--- a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread2.cc
+++ b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread2.cc
@@ -19,8 +19,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
-// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* } }
+// { dg-do run { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
 
 #include <fstream>
diff --git a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread3.cc b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread3.cc
index 70fd9ead58a..62749bc0342 100644
--- a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread3.cc
+++ b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread3.cc
@@ -19,8 +19,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
-// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* } }
+// { dg-do run { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
 
 #include <sstream>
diff --git a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread4.cc b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread4.cc
index d4d03b3867c..ab4100b3aeb 100644
--- a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread4.cc
+++ b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread4.cc
@@ -20,8 +20,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
-// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* } }
+// { dg-do run { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
 
 #include <string>
diff --git a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread5.cc b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread5.cc
index 955f3785a39..2b15a8b22e1 100644
--- a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread5.cc
+++ b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread5.cc
@@ -20,8 +20,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
-// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* } }
+// { dg-do run { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
 
 #include <vector>
diff --git a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread6.cc b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread6.cc
index e5ea0f98617..117d341c467 100644
--- a/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread6.cc
+++ b/gnu/lib/libstdc++/libstdc++/testsuite/thread/pthread6.cc
@@ -19,8 +19,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
-// { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* } }
+// { dg-do run { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* } }
+// { dg-options "-pthread" { target *-*-openbsd* *-*-freebsd* *-*-netbsd* *-*-linux* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
 
 #include <string>
diff --git a/gnu/usr.bin/gcc/gcc/testsuite/lib/g++.exp b/gnu/usr.bin/gcc/gcc/testsuite/lib/g++.exp
index 749e1f1c2cd..7d07cba2943 100644
--- a/gnu/usr.bin/gcc/gcc/testsuite/lib/g++.exp
+++ b/gnu/usr.bin/gcc/gcc/testsuite/lib/g++.exp
@@ -50,7 +50,7 @@ proc g++_version { } {
 	set tmp [remote_exec host "$compiler -v"]
 	set status [lindex $tmp 0];
 	set output [lindex $tmp 1];
-	regexp "version.*$" $output version
+	regexp "version\[^\n\r\]*" $output version
 	if { $status == 0 && [info exists version] } then {
 	    if [is_remote host] {
 		clone_output "$compiler $version\n"
@@ -72,6 +72,7 @@ proc g++_version { } {
 #
 proc g++_include_flags { paths } {
     global srcdir
+    global objdir
     global HAVE_LIBSTDCXX_V3
     global TESTING_IN_BUILD_TREE
 
@@ -89,7 +90,7 @@ proc g++_include_flags { paths } {
     set gccpath ${paths}
 
     if { ${HAVE_LIBSTDCXX_V3} } {
-      set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
+      set odir_v3 ${objdir}/../../../lib/libstdc++
       append flags [exec sh ${odir_v3}/testsuite_flags --build-includes]
     } else {
       set odir_v2 [lookfor_file ${gccpath} libstdc++]