gdb/

	* s390-nat.c (s390_can_use_hw_breakpoint): Only support breakpoints
	of type bp_hardware_watchpoint.

gdb/testsuite/

	* gdb.base/hbreak.exp: Disable for s390*-*-* targets.
	* gdb.base/watchpoint-hw-hit-once.exp: Likewise.
	* gdb.threads/watchthreads-reorder.exp: Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 64b8603..a23f2ba 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-27  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * s390-nat.c (s390_can_use_hw_breakpoint): Only support breakpoints
+       of type bp_hardware_watchpoint.
+
 2009-11-27  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-lang.c: Apply some corrections to the previous comment addition.

diff --git a/gdb/s390-nat.c b/gdb/s390-nat.c
index 6bf8338..c67777e 100644 (file)
--- a/gdb/s390-nat.c
+++ b/gdb/s390-nat.c
@@ -380,7 +380,7 @@ s390_remove_watchpoint (CORE_ADDR addr, int len, int type)
 static int
 s390_can_use_hw_breakpoint (int type, int cnt, int othertype)
 {
-  return 1;
+  return type == bp_hardware_watchpoint;
 }
 
 static int

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fddb912..acfde75 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-27  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       * gdb.base/hbreak.exp: Disable for s390*-*-* targets.
+       * gdb.base/watchpoint-hw-hit-once.exp: Likewise.
+       * gdb.threads/watchthreads-reorder.exp: Likewise.
+
 2009-11-24  Daniel Jacobowitz  <dan@codesourcery.com>
 
        PR gdb/8704

diff --git a/gdb/testsuite/gdb.base/hbreak.exp b/gdb/testsuite/gdb.base/hbreak.exp
index a172e0f..5bf68d7 100644 (file)
--- a/gdb/testsuite/gdb.base/hbreak.exp
+++ b/gdb/testsuite/gdb.base/hbreak.exp
@@ -15,7 +15,7 @@
 
 # Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
 if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
-     && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
+     && ![istarget "ia64-*-*"])
     || [target_info exists gdb,no_hardware_watchpoints]} then {
     verbose "Skipping hbreak test."
     return

diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
index bd3ad9f..6d9ca71 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
@@ -15,7 +15,7 @@
 
 # Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
 if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
-     && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
+     && ![istarget "ia64-*-*"])
     || [target_info exists gdb,no_hardware_watchpoints]} then {
     verbose "Skipping watchpoint-hw-hit-once test."
     return

diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
index bf9b044..6193356 100644 (file)
--- a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp
@@ -26,7 +26,7 @@
 # different/new watchpoint, just based on the watchpoint/debug register number.
 
 if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
-     && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
+     && ![istarget "ia64-*-*"])
     || [target_info exists gdb,no_hardware_watchpoints]
     || ![istarget *-*-linux*]} {
     return 0