diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/s390-nat.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/hbreak.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/watchthreads-reorder.exp | 2 |
6 files changed, 15 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 64b8603feee..a23f2bae692 100644 --- 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 6bf83382edf..c67777e929a 100644 --- 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 fddb912d64a..acfde75a3aa 100644 --- 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 a172e0fc079..5bf68d7c72b 100644 --- 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 bd3ad9f56c0..6d9ca719a31 100644 --- 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 bf9b044b27f..6193356eb1c 100644 --- 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 |