From 62172bb981450a1e9f6df8d5d56690582ec1b0b3 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Fri, 4 Apr 2008 22:59:28 +0000
Subject: [PATCH] 	* gdb.base/watch_thread_num.exp: Use
 gdb_compile_pthreads.

	* gdb.cp/mb-templates.exp: Skip test on spu*-*-* targets.
---
 gdb/testsuite/ChangeLog                     | 6 ++++++
 gdb/testsuite/gdb.base/watch_thread_num.exp | 5 ++---
 gdb/testsuite/gdb.cp/mb-templates.exp       | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 64e61b4..570e0cb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-04  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* gdb.base/watch_thread_num.exp: Use gdb_compile_pthreads.
+
+	* gdb.cp/mb-templates.exp: Skip test on spu*-*-* targets.
+
 2008-04-04  Pedro Alves  <pedro@codesourcery.com>
 
 	* gdb.mi/mi-disassemble.exp, gdb.mi/mi-stack.exp,
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 8715574..4d34d72 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -33,9 +33,8 @@ if [get_compiler_info ${binfile}] {
     return -1
 }
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug libs=-lpthread}] != "" } {
-     untested watch_thread_num.exp
-     return -1
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    return -1
 }
 
 gdb_exit
diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
index 39906f6..f56067a 100644
--- a/gdb/testsuite/gdb.cp/mb-templates.exp
+++ b/gdb/testsuite/gdb.cp/mb-templates.exp
@@ -22,6 +22,11 @@ if $tracelevel then {
 
 if { [skip_cplus_tests] } { continue }
 
+# On SPU this test fails because the executable exceeds local storage size.
+if { [istarget "spu*-*-*"] } {
+        return 0
+}
+
 set prms_id 0
 set bug_id 0
 
-- 
2.7.4