Index: gdb-7.11.90.20160807/gdb/config/i386/linux64.mh

===================================================================

--- gdb-7.11.90.20160807.orig/gdb/config/i386/linux64.mh	2016-08-07 22:27:13.889285274 +0200

+++ gdb-7.11.90.20160807/gdb/config/i386/linux64.mh	2016-08-07 22:29:20.451311124 +0200

@@ -7,7 +7,7 @@

 	linux-procfs.o linux-ptrace.o linux-btrace.o \

 	linux-waitpid.o linux-personality.o x86-linux.o \

 	x86-linux-dregs.o amd64-linux-siginfo.o linux-namespaces.o

-NAT_FILE= config/nm-linux.h

+NAT_FILE= nm-linux64.h

 NAT_CDEPS = $(srcdir)/proc-service.list

 # The dynamically loaded libthread_db needs access to symbols in the

Index: gdb-7.11.90.20160807/gdb/config/i386/linux.mh

===================================================================

--- gdb-7.11.90.20160807.orig/gdb/config/i386/linux.mh	2016-08-07 22:27:13.889285274 +0200

+++ gdb-7.11.90.20160807/gdb/config/i386/linux.mh	2016-08-07 22:29:20.451311124 +0200

@@ -1,6 +1,6 @@

 # Host: Intel 386 running GNU/Linux.

-NAT_FILE= config/nm-linux.h

+NAT_FILE= nm-linux.h

 NATDEPFILES= inf-ptrace.o fork-child.o \

 	x86-nat.o x86-dregs.o i386-linux-nat.o x86-linux-nat.o \

 	proc-service.o linux-thread-db.o \

Index: gdb-7.11.90.20160807/gdb/config/i386/nm-linux.h

===================================================================

--- /dev/null	1970-01-01 00:00:00.000000000 +0000

+++ gdb-7.11.90.20160807/gdb/config/i386/nm-linux.h	2016-08-07 22:29:20.451311124 +0200

@@ -0,0 +1,28 @@

+/* Native support for GNU/Linux i386.

+

+   Copyright 2010 Free Software Foundation, Inc.

+

+   This file is part of GDB.

+

+   This program is free software; you can redistribute it and/or modify

+   it under the terms of the GNU General Public License as published by

+   the Free Software Foundation; either version 3 of the License, or

+   (at your option) any later version.

+

+   This program is distributed in the hope that it will be useful,

+   but WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+   GNU General Public License for more details.

+

+   You should have received a copy of the GNU General Public License

+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

+

+#ifndef NM_LINUX_H

+#define NM_LINUX_H

+

+#include "config/nm-linux.h"

+

+/* Red Hat backward compatibility with gdb-6.8.  */

+#define target_can_use_hardware_watchpoint(type, cnt, ot) 1

+

+#endif /* NM_LINUX64_H */

Index: gdb-7.11.90.20160807/gdb/config/i386/nm-linux64.h

===================================================================

--- /dev/null	1970-01-01 00:00:00.000000000 +0000

+++ gdb-7.11.90.20160807/gdb/config/i386/nm-linux64.h	2016-08-07 22:29:20.451311124 +0200

@@ -0,0 +1,28 @@

+/* Native support for GNU/Linux amd64.

+

+   Copyright 2010 Free Software Foundation, Inc.

+

+   This file is part of GDB.

+

+   This program is free software; you can redistribute it and/or modify

+   it under the terms of the GNU General Public License as published by

+   the Free Software Foundation; either version 3 of the License, or

+   (at your option) any later version.

+

+   This program is distributed in the hope that it will be useful,

+   but WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+   GNU General Public License for more details.

+

+   You should have received a copy of the GNU General Public License

+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

+

+#ifndef NM_LINUX64_H

+#define NM_LINUX64_H

+

+#include "config/nm-linux.h"

+

+/* Red Hat backward compatibility with gdb-6.8.  */

+#define target_can_use_hardware_watchpoint(type, cnt, ot) 1

+

+#endif /* NM_LINUX64_H */

Index: gdb-7.11.90.20160807/gdb/target.h

===================================================================

--- gdb-7.11.90.20160807.orig/gdb/target.h	2016-08-07 22:27:13.889285274 +0200

+++ gdb-7.11.90.20160807/gdb/target.h	2016-08-07 22:29:20.452311132 +0200

@@ -1939,9 +1939,11 @@

    one.  OTHERTYPE is the number of watchpoints of other types than

    this one used so far.  */

+#ifndef target_can_use_hardware_watchpoint

 #define target_can_use_hardware_watchpoint(TYPE,CNT,OTHERTYPE) \

  (*current_target.to_can_use_hw_breakpoint) (&current_target,  \

 					     TYPE, CNT, OTHERTYPE)

+#endif

 /* Returns the number of debug registers needed to watch the given

    memory region, or zero if not supported.  */

Index: gdb-7.11.90.20160807/gdb/testsuite/gdb.base/watchpoint-hw-before-run.exp

===================================================================

--- /dev/null	1970-01-01 00:00:00.000000000 +0000

+++ gdb-7.11.90.20160807/gdb/testsuite/gdb.base/watchpoint-hw-before-run.exp	2016-08-07 22:29:20.452311132 +0200

@@ -0,0 +1,40 @@

+# Copyright 2009, 2010 Free Software Foundation, Inc.

+

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+# Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.

+if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]

+     && ![istarget "ia64-*-*"])

+    || [target_info exists gdb,no_hardware_watchpoints]} then {

+    verbose "Skipping watchpoint-hw-before-run test."

+    return

+}

+

+set test watchpoint-hw-before-run

+set srcfile watchpoint-hw-hit-once.c

+if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } {

+    return -1

+}

+

+gdb_test "rwatch watchee" "ardware read watchpoint 1: watchee"

+

+# `runto_main' or `runto main' would delete the watchpoint created above.

+

+if { [gdb_start_cmd] < 0 } {

+    untested start

+    return -1

+}

+gdb_test "" "main .* at .*" "start"

+

+gdb_test "continue" "Continuing.\r\n\r\nHardware read watchpoint \[0-9\]+: watchee\r\n\r\nValue = 0\r\n.*"

Index: gdb-7.11.90.20160807/gdb/breakpoint.c

===================================================================

--- gdb-7.11.90.20160807.orig/gdb/breakpoint.c	2016-08-07 22:33:38.835405458 +0200

+++ gdb-7.11.90.20160807/gdb/breakpoint.c	2016-08-07 22:34:45.023941950 +0200

@@ -14953,7 +14953,7 @@

   if (bpt->type == bp_hardware_breakpoint)

     {

-      int i;

+      int i ATTRIBUTE_UNUSED;

       i = hw_breakpoint_used_count ();

       target_resources_ok = 

 	target_can_use_hardware_watchpoint (bp_hardware_breakpoint,