Hi All, While debugging cvs gdb, I put a h/w watch point, when this watch point hits gdb calls target_insert_watchpoint macro. This macro defination is present in target.h as bellow: #define target_insert_watchpoint(addr, len, type) \ (*current_target.to_insert_watchpoint) (addr, len, type) In case of remote debugging *current_target.to_insert_watchpoint points to remote_target_insert_watchpoint function, but while native debugging it should points to _insert_watchpoint (e.g. i386_insert_watchpoint) instead it points to return_minus_one function. This patch removes declaration of macros in file gdb/config/i386/nm- i386.h for insertion and removal of h/w watchpoints. Instead it initializes register access methods in gdb/i386-linux-nat.c file. That fixes the above problem. thanks - Jitendra