AC_ARG_ENABLE(libquadmath,
AS_HELP_STRING([--disable-libquadmath],
[do not build libquadmath directory]),
-@@ -968,7 +953,7 @@ case "${target}" in
+@@ -952,7 +927,7 @@ case "${target}" in
;;
# The tpf target doesn't support gdb yet.
*-*-tpf*)
;;
*-*-uclinux*)
noconfigdirs="$noconfigdirs target-rda"
-@@ -988,7 +973,7 @@ case "${target}" in
+@@ -972,7 +957,7 @@ case "${target}" in
noconfigdirs="$noconfigdirs target-newlib target-libgloss"
;;
sh*-*-pe|mips*-*-pe|*arm-wince-pe)
;;
arc*-*-*)
noconfigdirs="$noconfigdirs sim"
-@@ -1058,15 +1043,15 @@ case "${target}" in
+@@ -1042,15 +1027,15 @@ case "${target}" in
;;
ia64*-*-elf*)
# No gdb support yet.
;;
i[[3456789]]86-w64-mingw*)
;;
-@@ -1122,13 +1107,13 @@ case "${target}" in
+@@ -1106,13 +1091,13 @@ case "${target}" in
;;
powerpc*-*-winnt* | powerpc*-*-pe*)
target_configdirs="$target_configdirs target-winsup"
;;
powerpc-*-beos*)
noconfigdirs="$noconfigdirs gdb"
-@@ -2700,7 +2685,7 @@ if echo " ${target_configdirs} " | grep
+@@ -2684,7 +2669,7 @@ if echo " ${target_configdirs} " | grep
bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
fi
# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
# and in that case we want gdb to be built without tk. Ugh!
# In fact I believe gdb is the *only* package directly dependent on tk,
-@@ -2708,7 +2693,7 @@ fi
+@@ -2692,7 +2677,7 @@ fi
# leave out the maybe dependencies when enable_gdbtk is false. I'm not
# 100% sure that that's safe though.
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
-@@ -5417,7 +5417,6 @@ bpstat_stop_status (const address_space
+@@ -5414,7 +5414,6 @@ bpstat_stop_status (const address_space
if (bs->stop)
{
++(b->hit_count);
/* We will stop here. */
if (b->disposition == disp_disable)
-@@ -5427,6 +5426,7 @@ bpstat_stop_status (const address_space
+@@ -5424,6 +5423,7 @@ bpstat_stop_status (const address_space
b->enable_state = bp_disabled;
removed_any = 1;
}