Rebase to FSF GDB 7.6.50.20130731 (pre-7.6 snapshot).

This commit is contained in:
Jan Kratochvil 2013-08-02 22:26:03 +02:00
commit 872aab074e
46 changed files with 1552 additions and 13546 deletions

View file

@ -96,10 +96,10 @@ Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=bitpos-wp.patch
Index: gdb-7.5.50.20130215/gdb/arm-linux-nat.c
Index: gdb-7.6.50.20130731-cvs/gdb/arm-linux-nat.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/arm-linux-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/arm-linux-nat.c 2013-02-15 22:42:45.988804306 +0100
--- gdb-7.6.50.20130731-cvs.orig/gdb/arm-linux-nat.c 2013-08-02 16:42:29.565632895 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/arm-linux-nat.c 2013-08-02 16:42:34.094639104 +0200
@@ -1105,7 +1105,7 @@ arm_linux_region_ok_for_hw_watchpoint (C
/* Insert a Hardware breakpoint. */
@ -127,10 +127,10 @@ Index: gdb-7.5.50.20130215/gdb/arm-linux-nat.c
{
return start <= addr && start + length - 1 >= addr;
}
Index: gdb-7.5.50.20130215/gdb/i386-nat.c
Index: gdb-7.6.50.20130731-cvs/gdb/i386-nat.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/i386-nat.c 2013-02-15 22:41:53.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/i386-nat.c 2013-02-15 22:43:14.005838741 +0100
--- gdb-7.6.50.20130731-cvs.orig/gdb/i386-nat.c 2013-08-02 16:42:29.566632896 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/i386-nat.c 2013-08-02 16:42:34.095639105 +0200
@@ -589,7 +589,7 @@ i386_update_inferior_debug_regs (struct
of the type TYPE. Return 0 on success, -1 on failure. */
@ -149,10 +149,10 @@ Index: gdb-7.5.50.20130215/gdb/i386-nat.c
struct expression *cond)
{
struct i386_debug_reg_state *state
Index: gdb-7.5.50.20130215/gdb/ia64-linux-nat.c
Index: gdb-7.6.50.20130731-cvs/gdb/ia64-linux-nat.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/ia64-linux-nat.c 2013-02-15 22:34:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/ia64-linux-nat.c 2013-02-15 22:42:45.989804309 +0100
--- gdb-7.6.50.20130731-cvs.orig/gdb/ia64-linux-nat.c 2013-08-02 16:42:29.566632896 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/ia64-linux-nat.c 2013-08-02 16:42:34.095639105 +0200
@@ -542,7 +542,7 @@ is_power_of_2 (int val)
}
@ -171,11 +171,11 @@ Index: gdb-7.5.50.20130215/gdb/ia64-linux-nat.c
struct expression *cond)
{
int idx;
Index: gdb-7.5.50.20130215/gdb/inf-ttrace.c
Index: gdb-7.6.50.20130731-cvs/gdb/inf-ttrace.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/inf-ttrace.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/inf-ttrace.c 2013-02-15 22:42:45.989804309 +0100
@@ -313,14 +313,14 @@ inf_ttrace_disable_page_protections (pid
--- gdb-7.6.50.20130731-cvs.orig/gdb/inf-ttrace.c 2013-08-02 16:42:29.567632898 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/inf-ttrace.c 2013-08-02 16:42:34.095639105 +0200
@@ -314,14 +314,14 @@ inf_ttrace_disable_page_protections (pid
type TYPE. */
static int
@ -193,7 +193,7 @@ Index: gdb-7.5.50.20130215/gdb/inf-ttrace.c
gdb_assert (type == hw_write);
@@ -337,14 +337,14 @@ inf_ttrace_insert_watchpoint (CORE_ADDR
@@ -338,14 +338,14 @@ inf_ttrace_insert_watchpoint (CORE_ADDR
type TYPE. */
static int
@ -211,11 +211,11 @@ Index: gdb-7.5.50.20130215/gdb/inf-ttrace.c
gdb_assert (type == hw_write);
Index: gdb-7.5.50.20130215/gdb/mips-linux-nat.c
Index: gdb-7.6.50.20130731-cvs/gdb/mips-linux-nat.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/mips-linux-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/mips-linux-nat.c 2013-02-15 22:42:45.990804311 +0100
@@ -1017,7 +1017,7 @@ populate_regs_from_watches (struct pt_wa
--- gdb-7.6.50.20130731-cvs.orig/gdb/mips-linux-nat.c 2013-08-02 16:42:29.568632899 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/mips-linux-nat.c 2013-08-02 16:42:34.096639106 +0200
@@ -644,7 +644,7 @@ mips_linux_new_thread (struct lwp_info *
watch. Return zero on success. */
static int
@ -224,7 +224,7 @@ Index: gdb-7.5.50.20130215/gdb/mips-linux-nat.c
struct expression *cond)
{
struct pt_watch_regs regs;
@@ -1067,7 +1067,7 @@ mips_linux_insert_watchpoint (CORE_ADDR
@@ -697,7 +697,7 @@ mips_linux_insert_watchpoint (CORE_ADDR
Return zero on success. */
static int
@ -233,10 +233,10 @@ Index: gdb-7.5.50.20130215/gdb/mips-linux-nat.c
struct expression *cond)
{
int retval;
Index: gdb-7.5.50.20130215/gdb/nto-procfs.c
Index: gdb-7.6.50.20130731-cvs/gdb/nto-procfs.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/nto-procfs.c 2013-01-01 07:32:47.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/nto-procfs.c 2013-02-15 22:42:45.990804311 +0100
--- gdb-7.6.50.20130731-cvs.orig/gdb/nto-procfs.c 2013-08-02 16:42:29.568632899 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/nto-procfs.c 2013-08-02 16:42:34.096639106 +0200
@@ -69,10 +69,10 @@ static ptid_t do_attach (ptid_t ptid);
static int procfs_can_use_hw_breakpoint (int, int, int);
@ -267,11 +267,11 @@ Index: gdb-7.5.50.20130215/gdb/nto-procfs.c
struct expression *cond)
{
return procfs_hw_watchpoint (addr, len, type);
Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
Index: gdb-7.6.50.20130731-cvs/gdb/ppc-linux-nat.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/ppc-linux-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/ppc-linux-nat.c 2013-02-15 22:42:45.991804313 +0100
@@ -1838,11 +1838,11 @@ can_use_watchpoint_cond_accel (void)
--- gdb-7.6.50.20130731-cvs.orig/gdb/ppc-linux-nat.c 2013-08-02 16:42:29.570632902 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/ppc-linux-nat.c 2013-08-02 16:42:34.097639108 +0200
@@ -1853,11 +1853,11 @@ can_use_watchpoint_cond_accel (void)
CONDITION_VALUE will hold the value which should be put in the
DVC register. */
static void
@ -286,7 +286,7 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
CORE_ADDR addr_end_data, addr_end_dvc;
/* The DVC register compares bytes within fixed-length windows which
@@ -1929,7 +1929,7 @@ num_memory_accesses (struct value *v)
@@ -1944,7 +1944,7 @@ num_memory_accesses (struct value *v)
of the constant. */
static int
check_condition (CORE_ADDR watch_addr, struct expression *cond,
@ -295,7 +295,7 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
{
int pc = 1, num_accesses_left, num_accesses_right;
struct value *left_val, *right_val, *left_chain, *right_chain;
@@ -1996,7 +1996,7 @@ check_condition (CORE_ADDR watch_addr, s
@@ -2011,7 +2011,7 @@ check_condition (CORE_ADDR watch_addr, s
the condition expression, thus only triggering the watchpoint when it is
true. */
static int
@ -304,7 +304,7 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
struct expression *cond)
{
CORE_ADDR data_value;
@@ -2013,7 +2013,7 @@ ppc_linux_can_accel_watchpoint_condition
@@ -2028,7 +2028,7 @@ ppc_linux_can_accel_watchpoint_condition
static void
create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr,
@ -313,7 +313,7 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
int insert)
{
if (len == 1
@@ -2058,7 +2058,7 @@ create_watchpoint_request (struct ppc_hw
@@ -2073,7 +2073,7 @@ create_watchpoint_request (struct ppc_hw
}
static int
@ -322,7 +322,7 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
struct expression *cond)
{
struct lwp_info *lp;
@@ -2126,7 +2126,7 @@ ppc_linux_insert_watchpoint (CORE_ADDR a
@@ -2141,7 +2141,7 @@ ppc_linux_insert_watchpoint (CORE_ADDR a
}
static int
@ -331,7 +331,7 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
struct expression *cond)
{
struct lwp_info *lp;
@@ -2266,7 +2266,7 @@ ppc_linux_stopped_by_watchpoint (void)
@@ -2292,7 +2292,7 @@ ppc_linux_stopped_by_watchpoint (void)
static int
ppc_linux_watchpoint_addr_within_range (struct target_ops *target,
CORE_ADDR addr,
@ -340,10 +340,10 @@ Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
{
int mask;
Index: gdb-7.5.50.20130215/gdb/procfs.c
Index: gdb-7.6.50.20130731-cvs/gdb/procfs.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/procfs.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/procfs.c 2013-02-15 22:42:45.992804315 +0100
--- gdb-7.6.50.20130731-cvs.orig/gdb/procfs.c 2013-08-02 16:42:29.572632904 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/procfs.c 2013-08-02 16:42:34.098639109 +0200
@@ -2433,7 +2433,7 @@ procfs_address_to_host_pointer (CORE_ADD
#endif
@ -380,11 +380,11 @@ Index: gdb-7.5.50.20130215/gdb/procfs.c
struct expression *cond)
{
return procfs_set_watchpoint (inferior_ptid, addr, 0, 0, 0);
Index: gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c
Index: gdb-7.6.50.20130731-cvs/gdb/remote-m32r-sdi.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/remote-m32r-sdi.c 2013-01-01 07:32:50.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c 2013-02-15 22:42:45.993804317 +0100
@@ -1417,14 +1417,15 @@ m32r_can_use_hw_watchpoint (int type, in
--- gdb-7.6.50.20130731-cvs.orig/gdb/remote-m32r-sdi.c 2013-08-02 16:42:29.573632906 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/remote-m32r-sdi.c 2013-08-02 16:42:34.099639111 +0200
@@ -1416,14 +1416,15 @@ m32r_can_use_hw_watchpoint (int type, in
watchpoint. */
static int
@ -403,7 +403,7 @@ Index: gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c
for (i = 0; i < MAX_ACCESS_BREAKS; i++)
{
@@ -1442,14 +1443,15 @@ m32r_insert_watchpoint (CORE_ADDR addr,
@@ -1441,14 +1442,15 @@ m32r_insert_watchpoint (CORE_ADDR addr,
}
static int
@ -422,11 +422,11 @@ Index: gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c
for (i = 0; i < MAX_ACCESS_BREAKS; i++)
{
Index: gdb-7.5.50.20130215/gdb/remote-mips.c
Index: gdb-7.6.50.20130731-cvs/gdb/remote-mips.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/remote-mips.c 2013-01-01 07:32:50.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/remote-mips.c 2013-02-15 22:42:45.994804319 +0100
@@ -2419,7 +2419,7 @@ calculate_mask (CORE_ADDR addr, int len)
--- gdb-7.6.50.20130731-cvs.orig/gdb/remote-mips.c 2013-08-02 16:42:29.574632907 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/remote-mips.c 2013-08-02 16:42:34.100639112 +0200
@@ -2426,7 +2426,7 @@ calculate_mask (CORE_ADDR addr, int len)
watchpoint. */
static int
@ -435,7 +435,7 @@ Index: gdb-7.5.50.20130215/gdb/remote-mips.c
struct expression *cond)
{
if (mips_set_breakpoint (addr, len, type))
@@ -2431,7 +2431,7 @@ mips_insert_watchpoint (CORE_ADDR addr,
@@ -2438,7 +2438,7 @@ mips_insert_watchpoint (CORE_ADDR addr,
/* Remove a watchpoint. */
static int
@ -444,11 +444,11 @@ Index: gdb-7.5.50.20130215/gdb/remote-mips.c
struct expression *cond)
{
if (mips_clear_breakpoint (addr, len, type))
Index: gdb-7.5.50.20130215/gdb/remote.c
Index: gdb-7.6.50.20130731-cvs/gdb/remote.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/remote.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/remote.c 2013-02-15 22:42:45.996804323 +0100
@@ -8155,7 +8155,7 @@ watchpoint_to_Z_packet (int type)
--- gdb-7.6.50.20130731-cvs.orig/gdb/remote.c 2013-08-02 16:42:29.577632911 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/remote.c 2013-08-02 16:42:34.103639116 +0200
@@ -8277,7 +8277,7 @@ watchpoint_to_Z_packet (int type)
}
static int
@ -457,7 +457,7 @@ Index: gdb-7.5.50.20130215/gdb/remote.c
struct expression *cond)
{
struct remote_state *rs = get_remote_state ();
@@ -8170,7 +8170,7 @@ remote_insert_watchpoint (CORE_ADDR addr
@@ -8297,7 +8297,7 @@ remote_insert_watchpoint (CORE_ADDR addr
p = strchr (rs->buf, '\0');
addr = remote_address_masked (addr);
p += hexnumstr (p, (ULONGEST) addr);
@ -466,7 +466,7 @@ Index: gdb-7.5.50.20130215/gdb/remote.c
putpkt (rs->buf);
getpkt (&rs->buf, &rs->buf_size, 0);
@@ -8190,7 +8190,7 @@ remote_insert_watchpoint (CORE_ADDR addr
@@ -8317,7 +8317,7 @@ remote_insert_watchpoint (CORE_ADDR addr
static int
remote_watchpoint_addr_within_range (struct target_ops *target, CORE_ADDR addr,
@ -475,7 +475,7 @@ Index: gdb-7.5.50.20130215/gdb/remote.c
{
CORE_ADDR diff = remote_address_masked (addr - start);
@@ -8199,7 +8199,7 @@ remote_watchpoint_addr_within_range (str
@@ -8326,7 +8326,7 @@ remote_watchpoint_addr_within_range (str
static int
@ -484,7 +484,7 @@ Index: gdb-7.5.50.20130215/gdb/remote.c
struct expression *cond)
{
struct remote_state *rs = get_remote_state ();
@@ -8214,7 +8214,7 @@ remote_remove_watchpoint (CORE_ADDR addr
@@ -8346,7 +8346,7 @@ remote_remove_watchpoint (CORE_ADDR addr
p = strchr (rs->buf, '\0');
addr = remote_address_masked (addr);
p += hexnumstr (p, (ULONGEST) addr);
@ -493,10 +493,10 @@ Index: gdb-7.5.50.20130215/gdb/remote.c
putpkt (rs->buf);
getpkt (&rs->buf, &rs->buf_size, 0);
Index: gdb-7.5.50.20130215/gdb/s390-nat.c
Index: gdb-7.6.50.20130731-cvs/gdb/s390-nat.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/s390-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/s390-nat.c 2013-02-15 22:42:45.997804325 +0100
--- gdb-7.6.50.20130731-cvs.orig/gdb/s390-nat.c 2013-08-02 16:42:29.578632913 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/s390-nat.c 2013-08-02 16:42:34.103639116 +0200
@@ -516,7 +516,7 @@ s390_fix_watch_points (struct lwp_info *
}
@ -515,21 +515,20 @@ Index: gdb-7.5.50.20130215/gdb/s390-nat.c
struct expression *cond)
{
struct lwp_info *lp;
Index: gdb-7.5.50.20130215/gdb/target.c
Index: gdb-7.6.50.20130731-cvs/gdb/target.c
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/target.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/target.c 2013-02-15 22:42:45.997804325 +0100
@@ -49,7 +49,8 @@ static void target_info (char *, int);
static void default_terminal_info (char *, int);
--- gdb-7.6.50.20130731-cvs.orig/gdb/target.c 2013-08-02 16:42:29.580632915 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/target.c 2013-08-02 16:42:52.160663787 +0200
@@ -49,7 +49,7 @@ static void target_info (char *, int);
static void default_terminal_info (const char *, int);
static int default_watchpoint_addr_within_range (struct target_ops *,
- CORE_ADDR, CORE_ADDR, int);
+ CORE_ADDR, CORE_ADDR,
+ LONGEST);
+ CORE_ADDR, CORE_ADDR, LONGEST);
static int default_region_ok_for_hw_watchpoint (CORE_ADDR, LONGEST);
@@ -114,10 +115,10 @@ static int debug_to_insert_hw_breakpoint
@@ -114,10 +114,10 @@ static int debug_to_insert_hw_breakpoint
static int debug_to_remove_hw_breakpoint (struct gdbarch *,
struct bp_target_info *);
@ -542,7 +541,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
struct expression *);
static int debug_to_stopped_by_watchpoint (void);
@@ -125,11 +126,12 @@ static int debug_to_stopped_by_watchpoin
@@ -125,11 +125,12 @@ static int debug_to_stopped_by_watchpoin
static int debug_to_stopped_data_address (struct target_ops *, CORE_ADDR *);
static int debug_to_watchpoint_addr_within_range (struct target_ops *,
@ -557,7 +556,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
struct expression *);
static void debug_to_terminal_init (void);
@@ -751,10 +753,10 @@ update_current_target (void)
@@ -790,10 +791,10 @@ update_current_target (void)
(int (*) (struct gdbarch *, struct bp_target_info *))
return_minus_one);
de_fault (to_insert_watchpoint,
@ -570,7 +569,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
return_minus_one);
de_fault (to_stopped_by_watchpoint,
(int (*) (void))
@@ -767,7 +769,7 @@ update_current_target (void)
@@ -806,7 +807,7 @@ update_current_target (void)
de_fault (to_region_ok_for_hw_watchpoint,
default_region_ok_for_hw_watchpoint);
de_fault (to_can_accel_watchpoint_condition,
@ -579,7 +578,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
return_zero);
de_fault (to_terminal_init,
(void (*) (void))
@@ -3558,7 +3560,7 @@ default_region_ok_for_hw_watchpoint (COR
@@ -3594,7 +3595,7 @@ default_region_ok_for_hw_watchpoint (COR
static int
default_watchpoint_addr_within_range (struct target_ops *target,
CORE_ADDR addr,
@ -588,7 +587,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
{
return addr >= start && addr < start + length;
}
@@ -4265,7 +4267,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
@@ -4555,7 +4556,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
}
static int
@ -597,7 +596,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
struct expression *cond)
{
int retval;
@@ -4275,8 +4277,8 @@ debug_to_can_accel_watchpoint_condition
@@ -4565,8 +4566,8 @@ debug_to_can_accel_watchpoint_condition
fprintf_unfiltered (gdb_stdlog,
"target_can_accel_watchpoint_condition "
@ -608,7 +607,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
host_address_to_string (cond), (unsigned long) retval);
return retval;
}
@@ -4311,7 +4313,7 @@ debug_to_stopped_data_address (struct ta
@@ -4601,7 +4602,7 @@ debug_to_stopped_data_address (struct ta
static int
debug_to_watchpoint_addr_within_range (struct target_ops *target,
CORE_ADDR addr,
@ -617,7 +616,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
{
int retval;
@@ -4319,9 +4321,9 @@ debug_to_watchpoint_addr_within_range (s
@@ -4609,9 +4610,9 @@ debug_to_watchpoint_addr_within_range (s
start, length);
fprintf_filtered (gdb_stdlog,
@ -629,7 +628,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
return retval;
}
@@ -4356,7 +4358,7 @@ debug_to_remove_hw_breakpoint (struct gd
@@ -4646,7 +4647,7 @@ debug_to_remove_hw_breakpoint (struct gd
}
static int
@ -638,7 +637,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
struct expression *cond)
{
int retval;
@@ -4364,14 +4366,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
@@ -4654,14 +4655,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
retval = debug_target.to_insert_watchpoint (addr, len, type, cond);
fprintf_unfiltered (gdb_stdlog,
@ -656,7 +655,7 @@ Index: gdb-7.5.50.20130215/gdb/target.c
struct expression *cond)
{
int retval;
@@ -4379,8 +4381,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
@@ -4669,8 +4670,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
retval = debug_target.to_remove_watchpoint (addr, len, type, cond);
fprintf_unfiltered (gdb_stdlog,
@ -667,11 +666,11 @@ Index: gdb-7.5.50.20130215/gdb/target.c
host_address_to_string (cond), (unsigned long) retval);
return retval;
}
Index: gdb-7.5.50.20130215/gdb/target.h
Index: gdb-7.6.50.20130731-cvs/gdb/target.h
===================================================================
--- gdb-7.5.50.20130215.orig/gdb/target.h 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/target.h 2013-02-15 22:42:45.998804328 +0100
@@ -466,8 +466,8 @@ struct target_ops
--- gdb-7.6.50.20130731-cvs.orig/gdb/target.h 2013-08-02 16:42:29.580632915 +0200
+++ gdb-7.6.50.20130731-cvs/gdb/target.h 2013-08-02 16:42:34.105639119 +0200
@@ -373,8 +373,8 @@ struct target_ops
/* Documentation of what the two routines below are expected to do is
provided with the corresponding target_* macros. */
@ -682,7 +681,7 @@ Index: gdb-7.5.50.20130215/gdb/target.h
int (*to_insert_mask_watchpoint) (struct target_ops *,
CORE_ADDR, CORE_ADDR, int);
@@ -478,13 +478,13 @@ struct target_ops
@@ -385,13 +385,13 @@ struct target_ops
int to_have_continuable_watchpoint;
int (*to_stopped_data_address) (struct target_ops *, CORE_ADDR *);
int (*to_watchpoint_addr_within_range) (struct target_ops *,