diff -Naurp a/gdb/acinclude.m4 b/gdb/acinclude.m4
--- a/gdb/acinclude.m4 2016-10-31 16:30:59.890619965 +0100
+++ b/gdb/acinclude.m4 2016-11-25 14:35:02.114813699 +0100
-@@ -246,44 +246,76 @@ fi
+@@ -249,44 +249,76 @@ fi
])
dnl Find the location of the private Tcl headers
diff -Naurp a/gdb/configure.ac b/gdb/configure.ac
--- a/gdb/configure.ac 2016-11-25 14:24:44.200083830 +0100
+++ b/gdb/configure.ac 2016-11-25 14:35:02.115813705 +0100
-@@ -1960,60 +1960,34 @@ if test "${enable_gdbtk}" = "yes"; then
+@@ -1962,60 +1962,34 @@ if test "${enable_gdbtk}" = "yes"; then
if test -z "${no_tcl}" -a -z "${no_tk}"; then
SC_LOAD_TCLCONFIG
diff -Naurp gdb.orig/breakpoint.c gdb.new/breakpoint.c
--- binutils-gdb.orig/gdb/breakpoint.c 2018-06-22 10:56:09.376862633 +0200
+++ binutils-gdb.new/gdb/breakpoint.c 2018-06-25 13:41:57.780248624 +0200
-@@ -5445,7 +5445,6 @@ bpstat_stop_status (const address_space
+@@ -5441,7 +5441,6 @@ bpstat_stop_status (const address_space
if (bs->stop)
{
++(b->hit_count);
/* We will stop here. */
if (b->disposition == disp_disable)
-@@ -5455,6 +5454,7 @@ bpstat_stop_status (const address_space
+@@ -5451,6 +5450,7 @@ bpstat_stop_status (const address_space
b->enable_state = bp_disabled;
removed_any = 1;
}