diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/ChangeLog ./bfd/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/ChangeLog	2015-08-04 01:58:55.000000000 +0000
+++ ./bfd/ChangeLog	2015-08-11 01:59:15.000000000 +0000
@@ -1,3 +1,8 @@
+2015-07-28  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* configure.in: Add asprintf and vasprintf to AC_CHECK_DECLS.
+	* config.in, configure: Regenerate.
+
 2015-07-06  Joel Brobecker  <brobecker@adacore.com>
 
 	* development.sh (development): Set to false.
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/config.in ./bfd/config.in
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/config.in	2015-08-04 01:58:56.000000000 +0000
+++ ./bfd/config.in	2015-08-11 01:59:15.000000000 +0000
@@ -17,6 +17,10 @@
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
 
+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ASPRINTF
+
 /* Define to 1 if you have the declaration of `basename', and to 0 if you
    don't. */
 #undef HAVE_DECL_BASENAME
@@ -72,6 +76,10 @@
    */
 #undef HAVE_DECL_STRSTR
 
+/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VASPRINTF
+
 /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
    don't. */
 #undef HAVE_DECL_VSNPRINTF
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/configure ./bfd/configure
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/configure	2015-08-04 01:58:56.000000000 +0000
+++ ./bfd/configure	2015-08-11 01:59:15.000000000 +0000
@@ -13819,6 +13819,28 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRSTR $ac_have_decl
 _ACEOF
 
+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASPRINTF $ac_have_decl
+_ACEOF
+
+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VASPRINTF $ac_have_decl
+_ACEOF
+
 ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
 if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
   ac_have_decl=1
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/configure.ac ./bfd/configure.ac
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/configure.ac	2015-08-04 01:58:56.000000000 +0000
+++ ./bfd/configure.ac	2015-08-11 01:59:15.000000000 +0000
@@ -232,6 +232,8 @@ AC_CHECK_DECLS(malloc)
 AC_CHECK_DECLS(realloc)
 AC_CHECK_DECLS(stpcpy)
 AC_CHECK_DECLS(strstr)
+AC_CHECK_DECLS(asprintf)
+AC_CHECK_DECLS(vasprintf)
 AC_CHECK_DECLS(snprintf)
 AC_CHECK_DECLS(vsnprintf)
 AC_CHECK_DECLS(strnlen)
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/version.h ./bfd/version.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/bfd/version.h	2015-08-04 01:58:56.000000000 +0000
+++ ./bfd/version.h	2015-08-11 01:59:15.000000000 +0000
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20150804
+#define BFD_VERSION_DATE 20150811
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/djunpack.bat ./djunpack.bat
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/djunpack.bat	2015-08-04 02:01:48.000000000 +0000
+++ ./djunpack.bat	2015-08-11 02:02:15.000000000 +0000
@@ -17,8 +17,8 @@ Rem
 Rem The following 2 lines need to be changed with each new GDB release, to
 Rem be identical to the name of the top-level directory where the GDB
 Rem distribution unpacks itself.
-set GDBVER=$package-7.9.90.20150804
-if "%GDBVER%"=="$package-7.9.90.20150804" GoTo EnvOk
+set GDBVER=$package-7.9.90.20150811
+if "%GDBVER%"=="$package-7.9.90.20150811" GoTo EnvOk
 Rem If their environment space is too small, re-exec with a larger one
 command.com /e:4096 /c %0 %1
 GoTo End
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/breakpoint.c ./gdb/breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/breakpoint.c	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/breakpoint.c	2015-08-11 01:59:17.000000000 +0000
@@ -5752,13 +5752,23 @@ bpstat_what (bpstat bs_head)
 	case bp_longjmp:
 	case bp_longjmp_call_dummy:
 	case bp_exception:
-	  this_action = BPSTAT_WHAT_SET_LONGJMP_RESUME;
-	  retval.is_longjmp = bptype != bp_exception;
+	  if (bs->stop)
+	    {
+	      this_action = BPSTAT_WHAT_SET_LONGJMP_RESUME;
+	      retval.is_longjmp = bptype != bp_exception;
+	    }
+	  else
+	    this_action = BPSTAT_WHAT_SINGLE;
 	  break;
 	case bp_longjmp_resume:
 	case bp_exception_resume:
-	  this_action = BPSTAT_WHAT_CLEAR_LONGJMP_RESUME;
-	  retval.is_longjmp = bptype == bp_longjmp_resume;
+	  if (bs->stop)
+	    {
+	      this_action = BPSTAT_WHAT_CLEAR_LONGJMP_RESUME;
+	      retval.is_longjmp = bptype == bp_longjmp_resume;
+	    }
+	  else
+	    this_action = BPSTAT_WHAT_SINGLE;
 	  break;
 	case bp_step_resume:
 	  if (bs->stop)
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/ChangeLog ./gdb/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/ChangeLog	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/ChangeLog	2015-08-11 01:59:17.000000000 +0000
@@ -1,3 +1,33 @@
+2015-08-10  Doug Evans  <dje@google.com>
+	    Keith Seitz  <keiths@redhat.com>
+
+	PR gdb/17960
+	* symtab.c (make_file_symbol_completion_list_1): Renamed from
+	make_file_symbol_completion_list and made static.
+	(make_file_symbol_completion_list): New function.
+
+2015-08-06  Clem Dickey  <clemd@acm.org>
+
+	PR python/17136
+	* python/lib/gdb/command/type_printers.py (InfoTypePrinter): Fix typo.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* nat/linux-waitpid.c (my_waitpid): Only print *status if waitpid
+	returned > 0.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* target/waitstatus.h (enum target_stop_reason)
+	<TARGET_STOPPED_BY_SINGLE_STEP>: New value.
+
+2015-08-05  Pedro Alves  <palves@redhat.com>
+	    Joel Brobecker  <brobecker@adacore.com>
+
+        * breakpoint.c (bpstat_what) <bp_longjmp, bp_longjmp_call_dummy>
+	<bp_exception, bp_longjmp_resume, bp_exception_resume>: Handle the
+	case where BS->STOP is not set.
+
 2015-07-30  Pedro Alves  <palves@redhat.com>
 
 	PR threads/18600
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gcore.1 ./gdb/doc/gcore.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gcore.1	2015-08-04 02:01:40.000000000 +0000
+++ ./gdb/doc/gcore.1	2015-08-11 02:02:06.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GCORE 1"
-.TH GCORE 1 "2015-08-04" "gdb-7.9.90.20150804-cvs" "GNU Development Tools"
+.TH GCORE 1 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.1 ./gdb/doc/gdb.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.1	2015-08-04 02:01:40.000000000 +0000
+++ ./gdb/doc/gdb.1	2015-08-11 02:02:06.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB 1"
-.TH GDB 1 "2015-08-04" "gdb-7.9.90.20150804-cvs" "GNU Development Tools"
+.TH GDB 1 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info ./gdb/doc/gdb.info
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info	2015-08-04 02:01:40.000000000 +0000
+++ ./gdb/doc/gdb.info	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-1 ./gdb/doc/gdb.info-1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-1	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-1	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
@@ -45,7 +45,7 @@ Debugging with GDB
 
 This file describes GDB, the GNU symbolic debugger.
 
-   This is the Tenth Edition, for GDB (GDB) Version 7.9.90.20150804-cvs.
+   This is the Tenth Edition, for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
@@ -494,7 +494,7 @@ Let us use GDB to try to see what is goi
      There is absolutely no warranty for GDB; type "show warranty"
       for details.
 
-     GDB 7.9.90.20150804-cvs, Copyright 1999 Free Software Foundation, Inc...
+     GDB 7.9.90.20150811-cvs, Copyright 1999 Free Software Foundation, Inc...
      (gdb)
 
 GDB reads only enough symbol data to know where to find the rest when
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-2 ./gdb/doc/gdb.info-2
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-2	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-2	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-3 ./gdb/doc/gdb.info-3
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-3	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-3	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-4 ./gdb/doc/gdb.info-4
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-4	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-4	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-5 ./gdb/doc/gdb.info-5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-5	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-5	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-6 ./gdb/doc/gdb.info-6
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-6	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-6	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
@@ -68,7 +68,7 @@ and TeX (or `texi2roff') to typeset the 
 
    GDB includes an already formatted copy of the on-line Info version
 of this manual in the `gdb' subdirectory.  The main Info file is
-`gdb-7.9.90.20150804-cvs/gdb/gdb.info', and it refers to subordinate
+`gdb-7.9.90.20150811-cvs/gdb/gdb.info', and it refers to subordinate
 files matching `gdb.info*' in the same directory.  If necessary, you
 can print out these files, or read them with any editor; but they are
 easier to read using the `info' subsystem in GNU Emacs or the
@@ -79,8 +79,8 @@ distribution.
 Info formatting programs, such as `texinfo-format-buffer' or `makeinfo'.
 
    If you have `makeinfo' installed, and are in the top level GDB
-source directory (`gdb-7.9.90.20150804-cvs', in the case of version
-7.9.90.20150804-cvs), you can make the Info file by typing:
+source directory (`gdb-7.9.90.20150811-cvs', in the case of version
+7.9.90.20150811-cvs), you can make the Info file by typing:
 
      cd gdb
      make gdb.info
@@ -105,7 +105,7 @@ format.  On its own, TeX cannot either r
 
    If you have TeX and a DVI printer program installed, you can typeset
 and print this manual.  First switch to the `gdb' subdirectory of the
-main source directory (for example, to `gdb-7.9.90.20150804-cvs/gdb')
+main source directory (for example, to `gdb-7.9.90.20150811-cvs/gdb')
 and type:
 
      make gdb.dvi
@@ -114,8 +114,8 @@ and type:
 
    ---------- Footnotes ----------
 
-   (1) In `gdb-7.9.90.20150804-cvs/gdb/refcard.ps' of the version
-7.9.90.20150804-cvs release.
+   (1) In `gdb-7.9.90.20150811-cvs/gdb/refcard.ps' of the version
+7.9.90.20150811-cvs release.
 
 
 File: gdb.info,  Node: Installing GDB,  Next: Maintenance Commands,  Prev: Formatting Documentation,  Up: Top
@@ -225,39 +225,39 @@ preparing GDB for installation; you can 
 in a single directory, whose name is usually composed by appending the
 version number to `gdb'.
 
-   For example, the GDB version 7.9.90.20150804-cvs distribution is in
-the `gdb-7.9.90.20150804-cvs' directory.  That directory contains:
+   For example, the GDB version 7.9.90.20150811-cvs distribution is in
+the `gdb-7.9.90.20150811-cvs' directory.  That directory contains:
 
-`gdb-7.9.90.20150804-cvs/configure (and supporting files)'
+`gdb-7.9.90.20150811-cvs/configure (and supporting files)'
      script for configuring GDB and all its supporting libraries
 
-`gdb-7.9.90.20150804-cvs/gdb'
+`gdb-7.9.90.20150811-cvs/gdb'
      the source specific to GDB itself
 
-`gdb-7.9.90.20150804-cvs/bfd'
+`gdb-7.9.90.20150811-cvs/bfd'
      source for the Binary File Descriptor library
 
-`gdb-7.9.90.20150804-cvs/include'
+`gdb-7.9.90.20150811-cvs/include'
      GNU include files
 
-`gdb-7.9.90.20150804-cvs/libiberty'
+`gdb-7.9.90.20150811-cvs/libiberty'
      source for the `-liberty' free software library
 
-`gdb-7.9.90.20150804-cvs/opcodes'
+`gdb-7.9.90.20150811-cvs/opcodes'
      source for the library of opcode tables and disassemblers
 
-`gdb-7.9.90.20150804-cvs/readline'
+`gdb-7.9.90.20150811-cvs/readline'
      source for the GNU command-line interface
 
-`gdb-7.9.90.20150804-cvs/glob'
+`gdb-7.9.90.20150811-cvs/glob'
      source for the GNU filename pattern-matching subroutine
 
-`gdb-7.9.90.20150804-cvs/mmalloc'
+`gdb-7.9.90.20150811-cvs/mmalloc'
      source for the GNU memory-mapped malloc package
 
    The simplest way to configure and build GDB is to run `configure'
 from the `gdb-VERSION-NUMBER' source directory, which in this example
-is the `gdb-7.9.90.20150804-cvs' directory.
+is the `gdb-7.9.90.20150811-cvs' directory.
 
    First switch to the `gdb-VERSION-NUMBER' source directory if you are
 not already in it; then run `configure'.  Pass the identifier for the
@@ -265,7 +265,7 @@ platform on which GDB will run as an arg
 
    For example:
 
-     cd gdb-7.9.90.20150804-cvs
+     cd gdb-7.9.90.20150811-cvs
      ./configure HOST
      make
 
@@ -287,8 +287,8 @@ you may need to run `sh' on it explicitl
 
    If you run `configure' from a directory that contains source
 directories for multiple libraries or programs, such as the
-`gdb-7.9.90.20150804-cvs' source directory for version
-7.9.90.20150804-cvs, `configure' creates configuration files for every
+`gdb-7.9.90.20150811-cvs' source directory for version
+7.9.90.20150811-cvs, `configure' creates configuration files for every
 directory level underneath (unless you tell it not to, with the
 `--norecursion' option).
 
@@ -329,13 +329,13 @@ directory.  If the path to `configure' w
 argument to `--srcdir', you can leave out the `--srcdir' option; it is
 assumed.)
 
-   For example, with version 7.9.90.20150804-cvs, you can build GDB in a
+   For example, with version 7.9.90.20150811-cvs, you can build GDB in a
 separate directory for a Sun 4 like this:
 
-     cd gdb-7.9.90.20150804-cvs
+     cd gdb-7.9.90.20150811-cvs
      mkdir ../gdb-sun4
      cd ../gdb-sun4
-     ../gdb-7.9.90.20150804-cvs/configure sun4
+     ../gdb-7.9.90.20150811-cvs/configure sun4
      make
 
    When `configure' builds a configuration using a remote source
@@ -346,7 +346,7 @@ directory `gdb-sun4/libiberty', and GDB 
 
    Make sure that your path to the `configure' script has just one
 instance of `gdb' in it.  If your path to `configure' looks like
-`../gdb-7.9.90.20150804-cvs/gdb/configure', you are configuring only
+`../gdb-7.9.90.20150811-cvs/gdb/configure', you are configuring only
 one subdirectory of GDB, not the whole package.  This leads to build
 errors about missing include files such as `bfd/bfd.h'.
 
@@ -362,8 +362,8 @@ called `configure' (or one of its subdir
 
    The `Makefile' that `configure' generates in each source directory
 also runs recursively.  If you type `make' in a source directory such
-as `gdb-7.9.90.20150804-cvs' (or in a separate configured directory
-configured with `--srcdir=DIRNAME/gdb-7.9.90.20150804-cvs'), you will
+as `gdb-7.9.90.20150811-cvs' (or in a separate configured directory
+configured with `--srcdir=DIRNAME/gdb-7.9.90.20150811-cvs'), you will
 build all the required libraries, and then build GDB.
 
    When you have multiple hosts or targets configured in separate
@@ -408,7 +408,7 @@ you can use it to test your guesses on a
      Invalid configuration `i986v': machine `i986v' not recognized
 
 `config.sub' is also distributed in the GDB source directory
-(`gdb-7.9.90.20150804-cvs', for version 7.9.90.20150804-cvs).
+(`gdb-7.9.90.20150811-cvs', for version 7.9.90.20150811-cvs).
 
 
 File: gdb.info,  Node: Configure Options,  Next: System-wide configuration,  Prev: Config Names,  Up: Installing GDB
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-7 ./gdb/doc/gdb.info-7
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-7	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-7	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-8 ./gdb/doc/gdb.info-8
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdb.info-8	2015-08-04 02:01:39.000000000 +0000
+++ ./gdb/doc/gdb.info-8	2015-08-11 02:02:06.000000000 +0000
@@ -22,7 +22,7 @@ developing GNU and promoting software fr
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of `Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150804-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150811-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdbinit.5 ./gdb/doc/gdbinit.5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdbinit.5	2015-08-04 02:01:40.000000000 +0000
+++ ./gdb/doc/gdbinit.5	2015-08-11 02:02:06.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBINIT 5"
-.TH GDBINIT 5 "2015-08-04" "gdb-7.9.90.20150804-cvs" "GNU Development Tools"
+.TH GDBINIT 5 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdbserver.1 ./gdb/doc/gdbserver.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/doc/gdbserver.1	2015-08-04 02:01:40.000000000 +0000
+++ ./gdb/doc/gdbserver.1	2015-08-11 02:02:06.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBSERVER 1"
-.TH GDBSERVER 1 "2015-08-04" "gdb-7.9.90.20150804-cvs" "GNU Development Tools"
+.TH GDBSERVER 1 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/gdbserver/ChangeLog ./gdb/gdbserver/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/gdbserver/ChangeLog	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/gdbserver/ChangeLog	2015-08-11 01:59:17.000000000 +0000
@@ -1,3 +1,57 @@
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (move_out_of_jump_pad_callback): Temporarily switch
+	the current thread.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (linux_write_memory): Rewrite debug output to avoid
+	reading beyond the passed in buffer length.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (handle_extended_wait): Set the fork child's suspend
+	count if stopping and suspending threads.
+	(check_stopped_by_breakpoint): If stopped by trace, set the LWP's
+	stop reason to TARGET_STOPPED_BY_SINGLE_STEP.
+	(linux_detach): Complete an ongoing step-over.
+	(lwp_suspended_inc, lwp_suspended_decr): New functions.  Use
+	throughout.
+	(resume_stopped_resumed_lwps): Don't resume a suspended thread.
+	(linux_wait_1): If passing a signal to the inferior after
+	finishing a step-over, unsuspend and re-resume all lwps.  If we
+	see a single-step event but the thread should be continuing, don't
+	pass the trap to gdb.
+	(stuck_in_jump_pad_callback, move_out_of_jump_pad_callback): Use
+	internal_error instead of gdb_assert.
+	(enqueue_pending_signal): New function.
+	(check_ptrace_stopped_lwp_gone): Add debug output.
+	(start_step_over): Use internal_error instead of gdb_assert.
+	(complete_ongoing_step_over): New function.
+	(linux_resume_one_thread): Don't resume a suspended thread.
+	(proceed_one_lwp): If the LWP is stepping over a breakpoint, reset
+	it stepping.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (add_lwp): Set waitstatus to TARGET_WAITKIND_IGNORE.
+	(linux_thread_alive): Use lwp_is_marked_dead.
+	(extended_event_reported): Delete.
+	(linux_wait_1): Check if waitstatus is TARGET_WAITKIND_IGNORE
+	instead of extended_event_reported.
+	(mark_lwp_dead): Don't set the 'dead' flag.  Store the waitstatus
+	as well.
+	(lwp_is_marked_dead): New function.
+	(lwp_running): Use lwp_is_marked_dead.
+	* linux-low.h: Delete 'dead' field, and update 'waitstatus's
+	comment.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* linux-low.c (linux_wait_1): Move fork event output out of the
+	!report_to_gdb check.  Pass event_child->waitstatus to
+	target_waitstatus_to_string instead of ourstatus.
+
 2015-07-14  Pedro Alves  <palves@redhat.com>
 
 	* linux-low.c (kill_wait_lwp): Don't assert if waitpid fails.
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/gdbserver/linux-low.c ./gdb/gdbserver/linux-low.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/gdbserver/linux-low.c	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/gdbserver/linux-low.c	2015-08-11 01:59:17.000000000 +0000
@@ -264,9 +264,12 @@ static int linux_wait_for_event (ptid_t 
 static struct lwp_info *add_lwp (ptid_t ptid);
 static int linux_stopped_by_watchpoint (void);
 static void mark_lwp_dead (struct lwp_info *lwp, int wstat);
+static int lwp_is_marked_dead (struct lwp_info *lwp);
 static void proceed_all_lwps (void);
 static int finish_step_over (struct lwp_info *lwp);
 static int kill_lwp (unsigned long lwpid, int signo);
+static void enqueue_pending_signal (struct lwp_info *lwp, int signal, siginfo_t *info);
+static void complete_ongoing_step_over (void);
 
 /* When the event-loop is doing a step-over, this points at the thread
    being stepped.  */
@@ -488,6 +491,15 @@ handle_extended_wait (struct lwp_info *e
 	  child_thr->last_resume_kind = resume_stop;
 	  child_thr->last_status.kind = TARGET_WAITKIND_STOPPED;
 
+	  /* If we're suspending all threads, leave this one suspended
+	     too.  */
+	  if (stopping_threads == STOPPING_AND_SUSPENDING_THREADS)
+	    {
+	      if (debug_threads)
+		debug_printf ("HEW: leaving child suspended\n");
+	      child_lwp->suspended = 1;
+	    }
+
 	  parent_proc = get_thread_process (event_thr);
 	  child_proc->attached = parent_proc->attached;
 	  clone_all_breakpoints (&child_proc->breakpoints,
@@ -687,6 +699,8 @@ check_stopped_by_breakpoint (struct lwp_
 		  debug_printf ("CSBB: %s stopped by trace\n",
 				target_pid_to_str (ptid_of (thr)));
 		}
+
+	      lwp->stop_reason = TARGET_STOPPED_BY_SINGLE_STEP;
 	    }
 	}
     }
@@ -746,8 +760,9 @@ add_lwp (ptid_t ptid)
 {
   struct lwp_info *lwp;
 
-  lwp = (struct lwp_info *) xmalloc (sizeof (*lwp));
-  memset (lwp, 0, sizeof (*lwp));
+  lwp = (struct lwp_info *) xcalloc (1, sizeof (*lwp));
+
+  lwp->waitstatus.kind = TARGET_WAITKIND_IGNORE;
 
   if (the_low_target.new_thread != NULL)
     the_low_target.new_thread (lwp);
@@ -1308,6 +1323,11 @@ linux_detach (int pid)
   if (process == NULL)
     return -1;
 
+  /* As there's a step over already in progress, let it finish first,
+     otherwise nesting a stabilize_threads operation on top gets real
+     messy.  */
+  complete_ongoing_step_over ();
+
   /* Stop all threads before detaching.  First, ptrace requires that
      the thread is stopped to sucessfully detach.  Second, thread_db
      may need to uninstall thread event breakpoints from memory, which
@@ -1388,7 +1408,7 @@ linux_thread_alive (ptid_t ptid)
      exited but we still haven't been able to report it to GDB, we'll
      hold on to the last lwp of the dead process.  */
   if (lwp != NULL)
-    return !lwp->dead;
+    return !lwp_is_marked_dead (lwp);
   else
     return 0;
 }
@@ -1676,6 +1696,39 @@ not_stopped_callback (struct inferior_li
   return 0;
 }
 
+/* Increment LWP's suspend count.  */
+
+static void
+lwp_suspended_inc (struct lwp_info *lwp)
+{
+  lwp->suspended++;
+
+  if (debug_threads && lwp->suspended > 4)
+    {
+      struct thread_info *thread = get_lwp_thread (lwp);
+
+      debug_printf ("LWP %ld has a suspiciously high suspend count,"
+		    " suspended=%d\n", lwpid_of (thread), lwp->suspended);
+    }
+}
+
+/* Decrement LWP's suspend count.  */
+
+static void
+lwp_suspended_decr (struct lwp_info *lwp)
+{
+  lwp->suspended--;
+
+  if (lwp->suspended < 0)
+    {
+      struct thread_info *thread = get_lwp_thread (lwp);
+
+      internal_error (__FILE__, __LINE__,
+		      "unsuspend LWP %ld, suspended=%d\n", lwpid_of (thread),
+		      lwp->suspended);
+    }
+}
+
 /* This function should only be called if the LWP got a SIGTRAP.
 
    Handle any tracepoint steps or hits.  Return true if a tracepoint
@@ -1693,7 +1746,7 @@ handle_tracepoints (struct lwp_info *lwp
      uninsert tracepoints.  To do this, we temporarily pause all
      threads, unpatch away, and then unpause threads.  We need to make
      sure the unpausing doesn't resume LWP too.  */
-  lwp->suspended++;
+  lwp_suspended_inc (lwp);
 
   /* And we need to be sure that any all-threads-stopping doesn't try
      to move threads out of the jump pads, as it could deadlock the
@@ -1709,7 +1762,7 @@ handle_tracepoints (struct lwp_info *lwp
      actions.  */
   tpoint_related_event |= tracepoint_was_hit (tinfo, lwp->stop_pc);
 
-  lwp->suspended--;
+  lwp_suspended_decr (lwp);
 
   gdb_assert (lwp->suspended == 0);
   gdb_assert (!stabilizing_threads || lwp->collecting_fast_tracepoint);
@@ -2159,10 +2212,13 @@ linux_low_filter_event (int lwpid, int w
 
   /* Note that TRAP_HWBKPT can indicate either a hardware breakpoint
      or hardware watchpoint.  Check which is which if we got
-     TARGET_STOPPED_BY_HW_BREAKPOINT.  */
+     TARGET_STOPPED_BY_HW_BREAKPOINT.  Likewise, we may have single
+     stepped an instruction that triggered a watchpoint.  In that
+     case, on some architectures (such as x86), instead of
+     TRAP_HWBKPT, si_code indicates TRAP_TRACE, and we need to check
+     the debug registers separately.  */
   if (WIFSTOPPED (wstat) && WSTOPSIG (wstat) == SIGTRAP
-      && (child->stop_reason == TARGET_STOPPED_BY_NO_REASON
-	  || child->stop_reason == TARGET_STOPPED_BY_HW_BREAKPOINT))
+      && child->stop_reason != TARGET_STOPPED_BY_SW_BREAKPOINT)
     check_stopped_by_watchpoint (child);
 
   if (!have_stop_pc)
@@ -2221,6 +2277,7 @@ resume_stopped_resumed_lwps (struct infe
   struct lwp_info *lp = get_thread_lwp (thread);
 
   if (lp->stopped
+      && !lp->suspended
       && !lp->status_pending_p
       && thread->last_resume_kind != resume_stop
       && thread->last_status.kind == TARGET_WAITKIND_IGNORE)
@@ -2591,9 +2648,7 @@ unsuspend_one_lwp (struct inferior_list_
   if (lwp == except)
     return 0;
 
-  lwp->suspended--;
-
-  gdb_assert (lwp->suspended >= 0);
+  lwp_suspended_decr (lwp);
   return 0;
 }
 
@@ -2686,7 +2741,7 @@ linux_stabilize_threads (void)
 	  lwp = get_thread_lwp (current_thread);
 
 	  /* Lock it.  */
-	  lwp->suspended++;
+	  lwp_suspended_inc (lwp);
 
 	  if (ourstatus.value.sig != GDB_SIGNAL_0
 	      || current_thread->last_resume_kind == resume_stop)
@@ -2732,20 +2787,6 @@ ignore_event (struct target_waitstatus *
   return null_ptid;
 }
 
-/* Return non-zero if WAITSTATUS reflects an extended linux
-   event.  Otherwise, return zero.  */
-
-static int
-extended_event_reported (const struct target_waitstatus *waitstatus)
-{
-  if (waitstatus == NULL)
-    return 0;
-
-  return (waitstatus->kind == TARGET_WAITKIND_FORKED
-	  || waitstatus->kind == TARGET_WAITKIND_VFORKED
-	  || waitstatus->kind == TARGET_WAITKIND_VFORK_DONE);
-}
-
 /* Wait for process, returns status.  */
 
 static ptid_t
@@ -3086,8 +3127,25 @@ linux_wait_1 (ptid_t ptid,
 	info_p = &info;
       else
 	info_p = NULL;
-      linux_resume_one_lwp (event_child, event_child->stepping,
-			    WSTOPSIG (w), info_p);
+
+      if (step_over_finished)
+	{
+	  /* We cancelled this thread's step-over above.  We still
+	     need to unsuspend all other LWPs, and set them back
+	     running again while the signal handler runs.  */
+	  unsuspend_all_lwps (event_child);
+
+	  /* Enqueue the pending signal info so that proceed_all_lwps
+	     doesn't lose it.  */
+	  enqueue_pending_signal (event_child, WSTOPSIG (w), info_p);
+
+	  proceed_all_lwps ();
+	}
+      else
+	{
+	  linux_resume_one_lwp (event_child, event_child->stepping,
+				WSTOPSIG (w), info_p);
+	}
       return ignore_event (ourstatus);
     }
 
@@ -3103,17 +3161,25 @@ linux_wait_1 (ptid_t ptid,
      do, we're be able to handle GDB breakpoints on top of internal
      breakpoints, by handling the internal breakpoint and still
      reporting the event to GDB.  If we don't, we're out of luck, GDB
-     won't see the breakpoint hit.  */
+     won't see the breakpoint hit.  If we see a single-step event but
+     the thread should be continuing, don't pass the trap to gdb.
+     That indicates that we had previously finished a single-step but
+     left the single-step pending -- see
+     complete_ongoing_step_over.  */
   report_to_gdb = (!maybe_internal_trap
 		   || (current_thread->last_resume_kind == resume_step
 		       && !in_step_range)
 		   || event_child->stop_reason == TARGET_STOPPED_BY_WATCHPOINT
-		   || (!step_over_finished && !in_step_range
-		       && !bp_explains_trap && !trace_event)
+		   || (!in_step_range
+		       && !bp_explains_trap
+		       && !trace_event
+		       && !step_over_finished
+		       && !(current_thread->last_resume_kind == resume_continue
+			    && event_child->stop_reason == TARGET_STOPPED_BY_SINGLE_STEP))
 		   || (gdb_breakpoint_here (event_child->stop_pc)
 		       && gdb_condition_true_at_breakpoint (event_child->stop_pc)
 		       && gdb_no_commands_at_breakpoint (event_child->stop_pc))
-		   || extended_event_reported (&event_child->waitstatus));
+		   || event_child->waitstatus.kind != TARGET_WAITKIND_IGNORE);
 
   run_breakpoint_commands (event_child->stop_pc);
 
@@ -3135,13 +3201,6 @@ linux_wait_1 (ptid_t ptid,
 			  paddress (event_child->stop_pc),
 			  paddress (event_child->step_range_start),
 			  paddress (event_child->step_range_end));
-	  if (extended_event_reported (&event_child->waitstatus))
-	    {
-	      char *str = target_waitstatus_to_string (ourstatus);
-	      debug_printf ("LWP %ld: extended event with waitstatus %s\n",
-			    lwpid_of (get_lwp_thread (event_child)), str);
-	      xfree (str);
-	    }
 	}
 
       /* We're not reporting this breakpoint to GDB, so apply the
@@ -3172,6 +3231,15 @@ linux_wait_1 (ptid_t ptid,
 
   if (debug_threads)
     {
+      if (event_child->waitstatus.kind != TARGET_WAITKIND_IGNORE)
+	{
+	  char *str;
+
+	  str = target_waitstatus_to_string (&event_child->waitstatus);
+	  debug_printf ("LWP %ld: extended event with waitstatus %s\n",
+			lwpid_of (get_lwp_thread (event_child)), str);
+	  xfree (str);
+	}
       if (current_thread->last_resume_kind == resume_step)
 	{
 	  if (event_child->step_range_start == event_child->step_range_end)
@@ -3251,12 +3319,11 @@ linux_wait_1 (ptid_t ptid,
 	unstop_all_lwps (1, event_child);
     }
 
-  if (extended_event_reported (&event_child->waitstatus))
+  if (event_child->waitstatus.kind != TARGET_WAITKIND_IGNORE)
     {
-      /* If the reported event is a fork, vfork or exec, let GDB know.  */
-      ourstatus->kind = event_child->waitstatus.kind;
-      ourstatus->value = event_child->waitstatus.value;
-
+      /* If the reported event is an exit, fork, vfork or exec, let
+	 GDB know.  */
+      *ourstatus = event_child->waitstatus;
       /* Clear the event lwp's waitstatus since we handled it already.  */
       event_child->waitstatus.kind = TARGET_WAITKIND_IGNORE;
     }
@@ -3456,7 +3523,7 @@ suspend_and_send_sigstop_callback (struc
   if (lwp == except)
     return 0;
 
-  lwp->suspended++;
+  lwp_suspended_inc (lwp);
 
   return send_sigstop_callback (entry, except);
 }
@@ -3464,13 +3531,23 @@ suspend_and_send_sigstop_callback (struc
 static void
 mark_lwp_dead (struct lwp_info *lwp, int wstat)
 {
-  /* It's dead, really.  */
-  lwp->dead = 1;
-
   /* Store the exit status for later.  */
   lwp->status_pending_p = 1;
   lwp->status_pending = wstat;
 
+  /* Store in waitstatus as well, as there's nothing else to process
+     for this event.  */
+  if (WIFEXITED (wstat))
+    {
+      lwp->waitstatus.kind = TARGET_WAITKIND_EXITED;
+      lwp->waitstatus.value.integer = WEXITSTATUS (wstat);
+    }
+  else if (WIFSIGNALED (wstat))
+    {
+      lwp->waitstatus.kind = TARGET_WAITKIND_SIGNALLED;
+      lwp->waitstatus.value.sig = gdb_signal_from_host (WTERMSIG (wstat));
+    }
+
   /* Prevent trying to stop it.  */
   lwp->stopped = 1;
 
@@ -3478,6 +3555,17 @@ mark_lwp_dead (struct lwp_info *lwp, int
   lwp->stop_expected = 0;
 }
 
+/* Return true if LWP has exited already, and has a pending exit event
+   to report to GDB.  */
+
+static int
+lwp_is_marked_dead (struct lwp_info *lwp)
+{
+  return (lwp->status_pending_p
+	  && (WIFEXITED (lwp->status_pending)
+	      || WIFSIGNALED (lwp->status_pending)));
+}
+
 /* Wait for all children to stop for the SIGSTOPs we just queued.  */
 
 static void
@@ -3537,7 +3625,12 @@ stuck_in_jump_pad_callback (struct infer
   struct thread_info *thread = (struct thread_info *) entry;
   struct lwp_info *lwp = get_thread_lwp (thread);
 
-  gdb_assert (lwp->suspended == 0);
+  if (lwp->suspended != 0)
+    {
+      internal_error (__FILE__, __LINE__,
+		      "LWP %ld is suspended, suspended=%d\n",
+		      lwpid_of (thread), lwp->suspended);
+    }
   gdb_assert (lwp->stopped);
 
   /* Allow debugging the jump pad, gdb_collect, etc..  */
@@ -3553,12 +3646,22 @@ static void
 move_out_of_jump_pad_callback (struct inferior_list_entry *entry)
 {
   struct thread_info *thread = (struct thread_info *) entry;
+  struct thread_info *saved_thread;
   struct lwp_info *lwp = get_thread_lwp (thread);
   int *wstat;
 
-  gdb_assert (lwp->suspended == 0);
+  if (lwp->suspended != 0)
+    {
+      internal_error (__FILE__, __LINE__,
+		      "LWP %ld is suspended, suspended=%d\n",
+		      lwpid_of (thread), lwp->suspended);
+    }
   gdb_assert (lwp->stopped);
 
+  /* For gdb_breakpoint_here.  */
+  saved_thread = current_thread;
+  current_thread = thread;
+
   wstat = lwp->status_pending_p ? &lwp->status_pending : NULL;
 
   /* Allow debugging the jump pad, gdb_collect, etc.  */
@@ -3585,7 +3688,9 @@ move_out_of_jump_pad_callback (struct in
       linux_resume_one_lwp (lwp, 0, 0, NULL);
     }
   else
-    lwp->suspended++;
+    lwp_suspended_inc (lwp);
+
+  current_thread = saved_thread;
 }
 
 static int
@@ -3594,7 +3699,7 @@ lwp_running (struct inferior_list_entry 
   struct thread_info *thread = (struct thread_info *) entry;
   struct lwp_info *lwp = get_thread_lwp (thread);
 
-  if (lwp->dead)
+  if (lwp_is_marked_dead (lwp))
     return 0;
   if (lwp->stopped)
     return 0;
@@ -3640,6 +3745,24 @@ stop_all_lwps (int suspend, struct lwp_i
     }
 }
 
+/* Enqueue one signal in the chain of signals which need to be
+   delivered to this process on next resume.  */
+
+static void
+enqueue_pending_signal (struct lwp_info *lwp, int signal, siginfo_t *info)
+{
+  struct pending_signals *p_sig;
+
+  p_sig = xmalloc (sizeof (*p_sig));
+  p_sig->prev = lwp->pending_signals;
+  p_sig->signal = signal;
+  if (info == NULL)
+    memset (&p_sig->info, 0, sizeof (siginfo_t));
+  else
+    memcpy (&p_sig->info, info, sizeof (siginfo_t));
+  lwp->pending_signals = p_sig;
+}
+
 /* Resume execution of LWP.  If STEP is nonzero, single-step it.  If
    SIGNAL is nonzero, give it that signal.  */
 
@@ -4159,7 +4282,13 @@ start_step_over (struct lwp_info *lwp)
 		  lwpid_of (thread));
 
   stop_all_lwps (1, lwp);
-  gdb_assert (lwp->suspended == 0);
+
+  if (lwp->suspended != 0)
+    {
+      internal_error (__FILE__, __LINE__,
+		      "LWP %ld suspended=%d\n", lwpid_of (thread),
+		      lwp->suspended);
+    }
 
   if (debug_threads)
     debug_printf ("Done stopping all threads for step-over.\n");
@@ -4231,6 +4360,39 @@ finish_step_over (struct lwp_info *lwp)
     return 0;
 }
 
+/* If there's a step over in progress, wait until all threads stop
+   (that is, until the stepping thread finishes its step), and
+   unsuspend all lwps.  The stepping thread ends with its status
+   pending, which is processed later when we get back to processing
+   events.  */
+
+static void
+complete_ongoing_step_over (void)
+{
+  if (!ptid_equal (step_over_bkpt, null_ptid))
+    {
+      struct lwp_info *lwp;
+      int wstat;
+      int ret;
+
+      if (debug_threads)
+	debug_printf ("detach: step over in progress, finish it first\n");
+
+      /* Passing NULL_PTID as filter indicates we want all events to
+	 be left pending.  Eventually this returns when there are no
+	 unwaited-for children left.  */
+      ret = linux_wait_for_event_filtered (minus_one_ptid, null_ptid,
+					   &wstat, __WALL);
+      gdb_assert (ret == -1);
+
+      lwp = find_lwp_pid (step_over_bkpt);
+      if (lwp != NULL)
+	finish_step_over (lwp);
+      step_over_bkpt = null_ptid;
+      unsuspend_all_lwps (lwp);
+    }
+}
+
 /* This function is called once per thread.  We check the thread's resume
    request, which will tell us whether to resume, step, or leave the thread
    stopped; and what signal, if any, it should be sent.
@@ -4305,13 +4467,16 @@ linux_resume_one_thread (struct inferior
     }
 
   /* If this thread which is about to be resumed has a pending status,
-     then don't resume any threads - we can just report the pending
-     status.  Make sure to queue any signals that would otherwise be
-     sent.  In all-stop mode, we do this decision based on if *any*
-     thread has a pending status.  If there's a thread that needs the
-     step-over-breakpoint dance, then don't resume any other thread
-     but that particular one.  */
-  leave_pending = (lwp->status_pending_p || leave_all_stopped);
+     then don't resume it - we can just report the pending status.
+     Likewise if it is suspended, because e.g., another thread is
+     stepping past a breakpoint.  Make sure to queue any signals that
+     would otherwise be sent.  In all-stop mode, we do this decision
+     based on if *any* thread has a pending status.  If there's a
+     thread that needs the step-over-breakpoint dance, then don't
+     resume any other thread but that particular one.  */
+  leave_pending = (lwp->suspended
+		   || lwp->status_pending_p
+		   || leave_all_stopped);
 
   if (!leave_pending)
     {
@@ -4494,7 +4659,23 @@ proceed_one_lwp (struct inferior_list_en
       send_sigstop (lwp);
     }
 
-  step = thread->last_resume_kind == resume_step;
+  if (thread->last_resume_kind == resume_step)
+    {
+      if (debug_threads)
+	debug_printf ("   stepping LWP %ld, client wants it stepping\n",
+		      lwpid_of (thread));
+      step = 1;
+    }
+  else if (lwp->bp_reinsert != 0)
+    {
+      if (debug_threads)
+	debug_printf ("   stepping LWP %ld, reinsert set\n",
+		      lwpid_of (thread));
+      step = 1;
+    }
+  else
+    step = 0;
+
   linux_resume_one_lwp (lwp, step, 0, NULL);
   return 0;
 }
@@ -4508,8 +4689,7 @@ unsuspend_and_proceed_one_lwp (struct in
   if (lwp == except)
     return 0;
 
-  lwp->suspended--;
-  gdb_assert (lwp->suspended >= 0);
+  lwp_suspended_decr (lwp);
 
   return proceed_one_lwp (entry, except);
 }
@@ -5131,15 +5311,19 @@ linux_write_memory (CORE_ADDR memaddr, c
   if (debug_threads)
     {
       /* Dump up to four bytes.  */
-      unsigned int val = * (unsigned int *) myaddr;
-      if (len == 1)
-	val = val & 0xff;
-      else if (len == 2)
-	val = val & 0xffff;
-      else if (len == 3)
-	val = val & 0xffffff;
-      debug_printf ("Writing %0*x to 0x%08lx in process %d\n",
-		    2 * ((len < 4) ? len : 4), val, (long)memaddr, pid);
+      char str[4 * 2 + 1];
+      char *p = str;
+      int dump = len < 4 ? len : 4;
+
+      for (i = 0; i < dump; i++)
+	{
+	  sprintf (p, "%02x", myaddr[i]);
+	  p += 2;
+	}
+      *p = '\0';
+
+      debug_printf ("Writing %s to 0x%08lx in process %d\n",
+		    str, (long) memaddr, pid);
     }
 
   /* Fill start and end extra bytes of buffer with existing memory data.  */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/gdbserver/linux-low.h ./gdb/gdbserver/linux-low.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/gdbserver/linux-low.h	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/gdbserver/linux-low.h	2015-08-11 01:59:17.000000000 +0000
@@ -266,16 +266,13 @@ struct lwp_info
      event already received in a wait()).  */
   int stopped;
 
-  /* If this flag is set, the lwp is known to be dead already (exit
-     event already received in a wait(), and is cached in
-     status_pending).  */
-  int dead;
-
   /* When stopped is set, the last wait status recorded for this lwp.  */
   int last_status;
 
-  /* This is used to store extended ptrace event information until
-     it is reported to GDB.  */
+  /* If WAITSTATUS->KIND != TARGET_WAITKIND_IGNORE, the waitstatus for
+     this LWP's last event, to pass to GDB without any further
+     processing.  This is used to store extended ptrace event
+     information or exit status until it can be reported to GDB.  */
   struct target_waitstatus waitstatus;
 
   /* When stopped is set, this is where the lwp last stopped, with
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/nat/linux-waitpid.c ./gdb/nat/linux-waitpid.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/nat/linux-waitpid.c	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/nat/linux-waitpid.c	2015-08-11 01:59:17.000000000 +0000
@@ -144,7 +144,7 @@ my_waitpid (int pid, int *status, int fl
     }
 
   linux_debug ("my_waitpid (%d, 0x%x): status(%x), %d\n",
-	       pid, flags, status ? *status : -1, ret);
+	       pid, flags, (ret > 0 && status != NULL) ? *status : -1, ret);
 
   errno = out_errno;
   return ret;
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/po/gdb.pot ./gdb/po/gdb.pot
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/po/gdb.pot	2015-08-04 02:01:38.000000000 +0000
+++ ./gdb/po/gdb.pot	2015-08-11 02:02:05.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-04 02:01+0000\n"
+"POT-Creation-Date: 2015-08-11 02:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -768,8 +768,8 @@ msgstr ""
 msgid "condition missing after `if' keyword"
 msgstr ""
 
-#: ada-lang.c:12882 break-catch-throw.c:478 breakpoint.c:9505
-#: breakpoint.c:11448 breakpoint.c:11592 breakpoint.c:11637 breakpoint.c:15151
+#: ada-lang.c:12882 break-catch-throw.c:478 breakpoint.c:9515
+#: breakpoint.c:11458 breakpoint.c:11602 breakpoint.c:11647 breakpoint.c:15161
 msgid "Junk at end of arguments."
 msgstr ""
 
@@ -3272,7 +3272,7 @@ msgid ""
 "defined for this breakpoint."
 msgstr ""
 
-#: breakpoint.c:1118 breakpoint.c:14351
+#: breakpoint.c:1118 breakpoint.c:14361
 #, possible-c-format
 msgid "No breakpoint number %d."
 msgstr ""
@@ -3426,332 +3426,332 @@ msgstr ""
 msgid "Watchpoint condition cannot be tested in the current scope"
 msgstr ""
 
-#: breakpoint.c:5826
+#: breakpoint.c:5836
 msgid "bpstat_what: tracepoint encountered"
 msgstr ""
 
-#: breakpoint.c:5847
+#: breakpoint.c:5857
 #, possible-c-format
 msgid "bpstat_what: unhandled bptype %d"
 msgstr ""
 
-#: breakpoint.c:6116
+#: breakpoint.c:6126
 #, possible-c-format
 msgid "bptypes table does not describe type #%d."
 msgstr ""
 
-#: breakpoint.c:6250
+#: breakpoint.c:6260
 msgid "print_one_breakpoint: bp_none encountered\n"
 msgstr ""
 
-#: breakpoint.c:6886
+#: breakpoint.c:6896
 msgid "Note: breakpoint "
 msgstr ""
 
 #. if (others == ???)
-#: breakpoint.c:6888
+#: breakpoint.c:6898
 msgid "Note: breakpoints "
 msgstr ""
 
-#: breakpoint.c:6906
+#: breakpoint.c:6916
 msgid "also set at pc "
 msgstr ""
 
-#: breakpoint.c:7083
+#: breakpoint.c:7093
 #, possible-c-format
 msgid "Breakpoint %d address previously adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:7086
+#: breakpoint.c:7096
 #, possible-c-format
 msgid "Breakpoint address adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:7202
+#: breakpoint.c:7212
 msgid "unknown breakpoint type"
 msgstr ""
 
-#: breakpoint.c:7811
+#: breakpoint.c:7821
 #, possible-c-format
 msgid "Temporarily disabling breakpoints for unloaded shared library \"%s\""
 msgstr ""
 
-#: breakpoint.c:8012
+#: breakpoint.c:8022
 #, possible-c-format
 msgid "Catchpoint %d (fork)"
 msgstr ""
 
-#: breakpoint.c:8128
+#: breakpoint.c:8138
 #, possible-c-format
 msgid "Catchpoint %d (vfork)"
 msgstr ""
 
-#: breakpoint.c:8305
+#: breakpoint.c:8315
 #, possible-c-format
 msgid "load of library matching %s"
 msgstr ""
 
-#: breakpoint.c:8307
+#: breakpoint.c:8317
 msgid "load of library"
 msgstr ""
 
-#: breakpoint.c:8312
+#: breakpoint.c:8322
 #, possible-c-format
 msgid "unload of library matching %s"
 msgstr ""
 
-#: breakpoint.c:8314
+#: breakpoint.c:8324
 msgid "unload of library"
 msgstr ""
 
-#: breakpoint.c:8329
+#: breakpoint.c:8339
 #, possible-c-format
 msgid "Catchpoint %d (%s)"
 msgstr ""
 
-#: breakpoint.c:8379 objc-lang.c:589 objc-lang.c:740 symtab.c:4545
+#: breakpoint.c:8389 objc-lang.c:589 objc-lang.c:740 symtab.c:4545
 #: thread.c:1612
 #, possible-c-format
 msgid "Invalid regexp (%s): %s"
 msgstr ""
 
-#: breakpoint.c:8588
+#: breakpoint.c:8598
 #, possible-c-format
 msgid "Catchpoint %d (exec)"
 msgstr ""
 
-#: breakpoint.c:8989 printcmd.c:2265
+#: breakpoint.c:8999 printcmd.c:2265
 msgid "Bad format string, missing '\"'."
 msgstr ""
 
-#: breakpoint.c:8996
+#: breakpoint.c:9006
 msgid "No function supplied for dprintf call"
 msgstr ""
 
-#: breakpoint.c:9014
+#: breakpoint.c:9024
 msgid "Target cannot run dprintf commands, falling back to GDB printf"
 msgstr ""
 
-#: breakpoint.c:9020
+#: breakpoint.c:9030
 msgid "Invalid dprintf style."
 msgstr ""
 
-#: breakpoint.c:9080 breakpoint.c:14569
+#: breakpoint.c:9090 breakpoint.c:14579
 msgid "No hardware breakpoint support in the target."
 msgstr ""
 
-#: breakpoint.c:9082 breakpoint.c:10212 breakpoint.c:14571
+#: breakpoint.c:9092 breakpoint.c:10222 breakpoint.c:14581
 msgid "Hardware breakpoints used exceeds limit."
 msgstr ""
 
-#: breakpoint.c:9137 breakpoint.c:9146
+#: breakpoint.c:9147 breakpoint.c:9156
 #, possible-c-format
 msgid "Probed static tracepoint marker \"%s\"\n"
 msgstr ""
 
-#: breakpoint.c:9151
+#: breakpoint.c:9161
 msgid "Couldn't determine the static tracepoint marker to probe"
 msgstr ""
 
-#: breakpoint.c:9171
+#: breakpoint.c:9181
 #, possible-c-format
 msgid "Garbage '%s' follows condition"
 msgstr ""
 
-#: breakpoint.c:9181 breakpoint.c:13351
+#: breakpoint.c:9191 breakpoint.c:13361
 msgid "Format string required"
 msgstr ""
 
-#: breakpoint.c:9184
+#: breakpoint.c:9194
 #, possible-c-format
 msgid "Garbage '%s' at end of command"
 msgstr ""
 
-#: breakpoint.c:9342
+#: breakpoint.c:9352
 msgid "No default breakpoint address now."
 msgstr ""
 
-#: breakpoint.c:9414
+#: breakpoint.c:9424
 #, possible-c-format
 msgid "May not have a fast tracepoint at 0x%s%s"
 msgstr ""
 
-#: breakpoint.c:9426 thread.c:1532
+#: breakpoint.c:9436 thread.c:1532
 #, possible-c-format
 msgid "Unknown thread %d."
 msgstr ""
 
-#: breakpoint.c:9482
+#: breakpoint.c:9492
 msgid "Junk after thread keyword."
 msgstr ""
 
-#: breakpoint.c:9494
+#: breakpoint.c:9504
 msgid "Junk after task keyword."
 msgstr ""
 
-#: breakpoint.c:9496
+#: breakpoint.c:9506
 #, possible-c-format
 msgid "Unknown task %d."
 msgstr ""
 
-#: breakpoint.c:9531
+#: breakpoint.c:9541
 #, possible-c-format
 msgid "No known static tracepoint marker named %s"
 msgstr ""
 
-#: breakpoint.c:9614
+#: breakpoint.c:9624
 #, possible-c-format
 msgid "Make %s pending on future shared library load? "
 msgstr ""
 
-#: breakpoint.c:9701
+#: breakpoint.c:9711
 #, possible-c-format
 msgid "Garbage '%s' at end of location"
 msgstr ""
 
-#: breakpoint.c:9778
+#: breakpoint.c:9788
 msgid ""
 "Multiple breakpoints were set.\n"
 "Use the \"delete\" command to delete unwanted breakpoints."
 msgstr ""
 
-#: breakpoint.c:9841 linespec.c:1997
+#: breakpoint.c:9851 linespec.c:1997
 #, possible-c-format
 msgid "No line %d in file \"%s\"."
 msgstr ""
 
-#: breakpoint.c:9917
+#: breakpoint.c:9927
 msgid ""
 "Specify the type of breakpoint to set.\n"
 "Usage: stop in <function | address>\n"
 "       stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:9950
+#: breakpoint.c:9960
 msgid "Usage: stop in <function | address>\n"
 msgstr ""
 
-#: breakpoint.c:9982
+#: breakpoint.c:9992
 msgid "Usage: stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:10011
+#: breakpoint.c:10021
 msgid "May only run agent-printf on the target"
 msgstr ""
 
-#: breakpoint.c:10139
+#: breakpoint.c:10149
 #, possible-c-format
 msgid "Hardware assisted ranged breakpoint %d from %s to %s."
 msgstr ""
 
-#: breakpoint.c:10180 breakpoint.c:10260
+#: breakpoint.c:10190 breakpoint.c:10270
 msgid "Could not find location of the end of the range."
 msgstr ""
 
-#: breakpoint.c:10205
+#: breakpoint.c:10215
 msgid "This target does not support hardware ranged breakpoints."
 msgstr ""
 
-#: breakpoint.c:10216
+#: breakpoint.c:10226
 msgid "No address range specified."
 msgstr ""
 
-#: breakpoint.c:10226
+#: breakpoint.c:10236
 msgid "Too few arguments."
 msgstr ""
 
-#: breakpoint.c:10228
+#: breakpoint.c:10238
 msgid "Could not find location of the beginning of the range."
 msgstr ""
 
-#: breakpoint.c:10234 breakpoint.c:10265
+#: breakpoint.c:10244 breakpoint.c:10275
 msgid "Cannot create a ranged breakpoint with multiple locations."
 msgstr ""
 
-#: breakpoint.c:10273
+#: breakpoint.c:10283
 msgid "Invalid address range, end precedes start."
 msgstr ""
 
 #. Length overflowed.
-#: breakpoint.c:10278
+#: breakpoint.c:10288
 msgid "Address range too large."
 msgstr ""
 
-#: breakpoint.c:10669 breakpoint.c:10806 breakpoint.c:10862 breakpoint.c:10893
+#: breakpoint.c:10679 breakpoint.c:10816 breakpoint.c:10872 breakpoint.c:10903
 msgid "Invalid hardware watchpoint type."
 msgstr ""
 
-#: breakpoint.c:10700
+#: breakpoint.c:10710
 msgid "Invalid watchpoint type."
 msgstr ""
 
-#: breakpoint.c:10810
+#: breakpoint.c:10820
 msgid ""
 "\n"
 "Check the underlying instruction at PC for the memory\n"
 "address and value which triggered this watchpoint.\n"
 msgstr ""
 
-#: breakpoint.c:10985
+#: breakpoint.c:10995
 msgid "You can specify only one thread."
 msgstr ""
 
-#: breakpoint.c:10993
+#: breakpoint.c:11003
 #, possible-c-format
 msgid "Invalid thread ID specification %s."
 msgstr ""
 
-#: breakpoint.c:11007
+#: breakpoint.c:11017
 msgid "You can specify only one mask."
 msgstr ""
 
-#: breakpoint.c:11051
+#: breakpoint.c:11061
 #, possible-c-format
 msgid "Cannot watch constant value `%.*s'."
 msgstr ""
 
-#: breakpoint.c:11078
+#: breakpoint.c:11088
 msgid "This target does not support masked watchpoints."
 msgstr ""
 
-#: breakpoint.c:11080
+#: breakpoint.c:11090
 msgid "Invalid mask or memory region."
 msgstr ""
 
-#: breakpoint.c:11106
+#: breakpoint.c:11116
 msgid "Junk at end of command."
 msgstr ""
 
-#: breakpoint.c:11442
+#: breakpoint.c:11452
 msgid "Couldn't get information on specified line."
 msgstr ""
 
-#: breakpoint.c:11609
+#: breakpoint.c:11619
 msgid "unsupported or unknown fork kind; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:11686 breakpoint.c:11693
+#: breakpoint.c:11696 breakpoint.c:11703
 msgid "Catch requires an event name."
 msgstr ""
 
-#: breakpoint.c:11752
+#: breakpoint.c:11762
 msgid "No source file specified."
 msgstr ""
 
-#: breakpoint.c:11850
+#: breakpoint.c:11860
 #, possible-c-format
 msgid "No breakpoint at %s."
 msgstr ""
 
-#: breakpoint.c:11852
+#: breakpoint.c:11862
 msgid "No breakpoint at this line."
 msgstr ""
 
-#: breakpoint.c:11875
+#: breakpoint.c:11885
 msgid "Deleted breakpoint "
 msgstr ""
 
-#: breakpoint.c:11877
+#: breakpoint.c:11887
 msgid "Deleted breakpoints "
 msgstr ""
 
@@ -3763,187 +3763,187 @@ msgstr ""
 #. Note that at this point, old_loc->owner is still
 #. valid, as delete_breakpoint frees the breakpoint
 #. only after calling us.
-#: breakpoint.c:12305
+#: breakpoint.c:12315
 #, possible-c-format
 msgid "warning: Error removing breakpoint %d\n"
 msgstr ""
 
-#: breakpoint.c:12537
+#: breakpoint.c:12547
 #, possible-c-format
 msgid " (%s) pending."
 msgstr ""
 
-#: breakpoint.c:12893
+#: breakpoint.c:12903
 msgid "Temporary breakpoint"
 msgstr ""
 
-#: breakpoint.c:12895
+#: breakpoint.c:12905
 msgid "Breakpoint"
 msgstr ""
 
-#: breakpoint.c:12896 breakpoint.c:13234 breakpoint.c:13238 breakpoint.c:13242
+#: breakpoint.c:12906 breakpoint.c:13244 breakpoint.c:13248 breakpoint.c:13252
 #, possible-c-format
 msgid " %d"
 msgstr ""
 
-#: breakpoint.c:12898
+#: breakpoint.c:12908
 msgid " at gnu-indirect-function resolver"
 msgstr ""
 
-#: breakpoint.c:12901
+#: breakpoint.c:12911
 #, possible-c-format
 msgid "Hardware assisted breakpoint %d"
 msgstr ""
 
-#: breakpoint.c:12904
+#: breakpoint.c:12914
 #, possible-c-format
 msgid "Dprintf %d"
 msgstr ""
 
-#: breakpoint.c:12925
+#: breakpoint.c:12935
 #, possible-c-format
 msgid "unhandled breakpoint type %d"
 msgstr ""
 
 #. Not sure how we will get here.
 #. GDB should not stop for these breakpoints.
-#: breakpoint.c:13031
+#: breakpoint.c:13041
 msgid "Thread Event Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. By analogy with the thread event, GDB should not stop for these.
-#: breakpoint.c:13036
+#: breakpoint.c:13046
 msgid "Overlay Event Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:13041
+#: breakpoint.c:13051
 msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:13046
+#: breakpoint.c:13056
 msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:13052
+#: breakpoint.c:13062
 msgid "Exception Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
-#: breakpoint.c:13187
+#: breakpoint.c:13197
 msgid "probe not found"
 msgstr ""
 
-#: breakpoint.c:13233
+#: breakpoint.c:13243
 msgid "Tracepoint"
 msgstr ""
 
-#: breakpoint.c:13237
+#: breakpoint.c:13247
 msgid "Fast tracepoint"
 msgstr ""
 
-#: breakpoint.c:13241
+#: breakpoint.c:13251
 msgid "Static tracepoint"
 msgstr ""
 
-#: breakpoint.c:13246 breakpoint.c:13265
+#: breakpoint.c:13256 breakpoint.c:13275
 #, possible-c-format
 msgid "unhandled tracepoint type %d"
 msgstr ""
 
-#: breakpoint.c:13507
+#: breakpoint.c:13517
 #, possible-c-format
 msgid "marker %s not found"
 msgstr ""
 
-#: breakpoint.c:13701
+#: breakpoint.c:13711
 msgid "Delete all breakpoints? "
 msgstr ""
 
-#: breakpoint.c:13807
+#: breakpoint.c:13817
 #, possible-c-format
 msgid "static tracepoint %d changed probed marker from %s to %s"
 msgstr ""
 
-#: breakpoint.c:13842
+#: breakpoint.c:13852
 #, possible-c-format
 msgid "marker for static tracepoint %d (%s) not found at previous line number"
 msgstr ""
 
-#: breakpoint.c:13935
+#: breakpoint.c:13945
 #, possible-c-format
 msgid "Could not reset ranged breakpoint %d: multiple locations found\n"
 msgstr ""
 
-#: breakpoint.c:13975
+#: breakpoint.c:13985
 #, possible-c-format
 msgid "failed to reevaluate condition for breakpoint %d: %s"
 msgstr ""
 
-#: breakpoint.c:14327
+#: breakpoint.c:14337
 #, possible-c-format
 msgid "Ignore count ignored for tracepoint %d."
 msgstr ""
 
-#: breakpoint.c:14336
+#: breakpoint.c:14346
 #, possible-c-format
 msgid "Will stop next time breakpoint %d is reached."
 msgstr ""
 
-#: breakpoint.c:14340
+#: breakpoint.c:14350
 #, possible-c-format
 msgid "Will ignore next crossing of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:14343
+#: breakpoint.c:14353
 #, possible-c-format
 msgid "Will ignore next %d crossings of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:14363
+#: breakpoint.c:14373
 msgid "a breakpoint number"
 msgstr ""
 
-#: breakpoint.c:14367
+#: breakpoint.c:14377
 #, possible-c-format
 msgid "bad breakpoint number: '%s'"
 msgstr ""
 
-#: breakpoint.c:14369
+#: breakpoint.c:14379
 msgid "Second argument (specified ignore-count) is missing."
 msgstr ""
 
-#: breakpoint.c:14392
+#: breakpoint.c:14402
 msgid "one or more breakpoint numbers"
 msgstr ""
 
-#: breakpoint.c:14405
+#: breakpoint.c:14415
 #, possible-c-format
 msgid "bad breakpoint number at or near '%s'"
 msgstr ""
 
-#: breakpoint.c:14417
+#: breakpoint.c:14427
 #, possible-c-format
 msgid "No breakpoint number %d.\n"
 msgstr ""
 
-#: breakpoint.c:14437 breakpoint.c:14446
+#: breakpoint.c:14447 breakpoint.c:14456
 #, possible-c-format
 msgid "Bad breakpoint number '%s'"
 msgstr ""
 
-#: breakpoint.c:14451 breakpoint.c:14458
+#: breakpoint.c:14461 breakpoint.c:14468
 #, possible-c-format
 msgid "Bad breakpoint location number '%s'"
 msgstr ""
 
-#: breakpoint.c:14590
+#: breakpoint.c:14600
 #, possible-c-format
 msgid "Cannot enable watchpoint %d: "
 msgstr ""
 
-#: breakpoint.c:14731
+#: breakpoint.c:14741
 msgid "hit count"
 msgstr ""
 
@@ -3951,72 +3951,72 @@ msgstr ""
 #. address.  Since there is no way to confirm that the address
 #. means the same thing as when the trace was started, warn the
 #. user.
-#: breakpoint.c:14972
+#: breakpoint.c:14982
 #, possible-c-format
 msgid "Uploaded tracepoint %d has no source location, using raw address"
 msgstr ""
 
-#: breakpoint.c:14981
+#: breakpoint.c:14991
 #, possible-c-format
 msgid "Uploaded tracepoint %d condition has no source form, ignoring it"
 msgstr ""
 
-#: breakpoint.c:15029
+#: breakpoint.c:15039
 #, possible-c-format
 msgid "Uploaded tracepoint %d actions have no source form, ignoring them"
 msgstr ""
 
-#: breakpoint.c:15103
+#: breakpoint.c:15113
 msgid "Delete all tracepoints? "
 msgstr ""
 
-#: breakpoint.c:15122
+#: breakpoint.c:15132
 #, possible-c-format
 msgid "Setting tracepoint %d's passcount to %d\n"
 msgstr ""
 
-#: breakpoint.c:15139
+#: breakpoint.c:15149
 msgid "passcount command requires an argument (count + optional TP num)"
 msgstr ""
 
-#: breakpoint.c:15237
+#: breakpoint.c:15247
 #, possible-c-format
 msgid "bad tracepoint number at or near '%s'\n"
 msgstr ""
 
-#: breakpoint.c:15240
+#: breakpoint.c:15250
 msgid "No previous tracepoint\n"
 msgstr ""
 
-#: breakpoint.c:15282
+#: breakpoint.c:15292
 msgid "Argument required (file name in which to save)"
 msgstr ""
 
-#: breakpoint.c:15308
+#: breakpoint.c:15318
 msgid "Nothing to save."
 msgstr ""
 
-#: breakpoint.c:15316
+#: breakpoint.c:15326
 #, possible-c-format
 msgid "Unable to open file '%s' for saving (%s)"
 msgstr ""
 
-#: breakpoint.c:15388
+#: breakpoint.c:15398
 #, possible-c-format
 msgid "Saved to file '%s'.\n"
 msgstr ""
 
-#: breakpoint.c:15481
+#: breakpoint.c:15491
 msgid "\"save\" must be followed by the name of a save subcommand.\n"
 msgstr ""
 
-#: breakpoint.c:15762
+#: breakpoint.c:15772
 msgid ""
 "Set ignore-count of breakpoint number N to COUNT.\n"
 "Usage is `ignore N COUNT'."
 msgstr ""
 
-#: breakpoint.c:15766
+#: breakpoint.c:15776
 msgid ""
 "Set commands to be executed when a breakpoint is hit.\n"
 "Give breakpoint number as argument after \"commands\".\n"
@@ -4027,14 +4027,14 @@ msgid ""
 "then no output is printed when it is hit, except what the commands print."
 msgstr ""
 
-#: breakpoint.c:15775
+#: breakpoint.c:15785
 msgid ""
 "Specify breakpoint number N to break only if COND is true.\n"
 "Usage is `condition N COND', where N is an integer and COND is an\n"
 "expression to be evaluated whenever breakpoint N is reached."
 msgstr ""
 
-#: breakpoint.c:15781
+#: breakpoint.c:15791
 msgid ""
 "Set a temporary breakpoint.\n"
 "Like \"break\" except the breakpoint is only temporary,\n"
@@ -4043,7 +4043,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15790
+#: breakpoint.c:15800
 msgid ""
 "Set a hardware assisted breakpoint.\n"
 "Like \"break\" except the breakpoint requires hardware support,\n"
@@ -4051,7 +4051,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15798
+#: breakpoint.c:15808
 msgid ""
 "Set a temporary hardware assisted breakpoint.\n"
 "Like \"hbreak\" except the breakpoint is only temporary,\n"
@@ -4059,7 +4059,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15806
+#: breakpoint.c:15816
 msgid ""
 "Enable some breakpoints.\n"
 "Give breakpoint numbers (separated by spaces) as arguments.\n"
@@ -4068,7 +4068,7 @@ msgid ""
 "With a subcommand you can enable temporarily."
 msgstr ""
 
-#: breakpoint.c:15816
+#: breakpoint.c:15826
 msgid ""
 "Enable some breakpoints.\n"
 "Give breakpoint numbers (separated by spaces) as arguments.\n"
@@ -4076,26 +4076,26 @@ msgid ""
 "May be abbreviated to simply \"enable\".\n"
 msgstr ""
 
-#: breakpoint.c:15823 breakpoint.c:15844
+#: breakpoint.c:15833 breakpoint.c:15854
 msgid ""
 "Enable breakpoints for one hit.  Give breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion, it becomes disabled."
 msgstr ""
 
-#: breakpoint.c:15828 breakpoint.c:15839
+#: breakpoint.c:15838 breakpoint.c:15849
 msgid ""
 "Enable breakpoints and delete when hit.  Give breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion, it is deleted."
 msgstr ""
 
-#: breakpoint.c:15833 breakpoint.c:15849
+#: breakpoint.c:15843 breakpoint.c:15859
 msgid ""
 "Enable breakpoints for COUNT hits.  Give count and then breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion,\n"
 "the count is decremented; when it reaches zero, the breakpoint is disabled."
 msgstr ""
 
-#: breakpoint.c:15855
+#: breakpoint.c:15865
 msgid ""
 "Disable some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -4103,7 +4103,7 @@ msgid ""
 "A disabled breakpoint is not forgotten, but has no effect until re-enabled."
 msgstr ""
 
-#: breakpoint.c:15864
+#: breakpoint.c:15874
 msgid ""
 "Disable some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -4112,7 +4112,7 @@ msgid ""
 "This command may be abbreviated \"disable\"."
 msgstr ""
 
-#: breakpoint.c:15872
+#: breakpoint.c:15882
 msgid ""
 "Delete some breakpoints or auto-display expressions.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -4122,7 +4122,7 @@ msgid ""
 "The \"unset\" command is also an alias for \"delete\"."
 msgstr ""
 
-#: breakpoint.c:15883
+#: breakpoint.c:15893
 msgid ""
 "Delete some breakpoints or auto-display expressions.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -4130,7 +4130,7 @@ msgid ""
 "This command may be abbreviated \"delete\"."
 msgstr ""
 
-#: breakpoint.c:15890
+#: breakpoint.c:15900
 msgid ""
 "Clear breakpoint at specified line or function.\n"
 "Argument may be line number, function name, or \"*\" and an address.\n"
@@ -4145,23 +4145,23 @@ msgid ""
 "See also the \"delete\" command which clears breakpoints by number."
 msgstr ""
 
-#: breakpoint.c:15903
+#: breakpoint.c:15913
 msgid "Set breakpoint at specified line or function.\n"
 msgstr ""
 
-#: breakpoint.c:15915
+#: breakpoint.c:15925
 msgid "Break in function/address or break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:15919
+#: breakpoint.c:15929
 msgid "Break in function or address."
 msgstr ""
 
-#: breakpoint.c:15921
+#: breakpoint.c:15931
 msgid "Break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:15922
+#: breakpoint.c:15932
 msgid ""
 "Status of user-settable breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -4183,7 +4183,7 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15939
+#: breakpoint.c:15949
 msgid ""
 "Status of specified breakpoints (all user-settable breakpoints if no "
 "argument).\n"
@@ -4206,7 +4206,7 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15957
+#: breakpoint.c:15967
 msgid ""
 "Status of all breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -4232,43 +4232,43 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15978
+#: breakpoint.c:15988
 msgid "Set catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15983
+#: breakpoint.c:15993
 msgid "Set temporary catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15988
+#: breakpoint.c:15998
 msgid "Catch calls to fork."
 msgstr ""
 
-#: breakpoint.c:15993
+#: breakpoint.c:16003
 msgid "Catch calls to vfork."
 msgstr ""
 
-#: breakpoint.c:15998
+#: breakpoint.c:16008
 msgid "Catch calls to exec."
 msgstr ""
 
-#: breakpoint.c:16003
+#: breakpoint.c:16013
 msgid ""
 "Catch loads of shared libraries.\n"
 "Usage: catch load [REGEX]\n"
 "If REGEX is given, only stop for libraries matching the regular expression."
 msgstr ""
 
-#: breakpoint.c:16010
+#: breakpoint.c:16020
 msgid ""
 "Catch unloads of shared libraries.\n"
 "Usage: catch unload [REGEX]\n"
 "If REGEX is given, only stop for libraries matching the regular expression."
 msgstr ""
 
-#: breakpoint.c:16018
+#: breakpoint.c:16028
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: watch [-l|-location] EXPRESSION\n"
@@ -4278,7 +4278,7 @@ msgid ""
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:16027
+#: breakpoint.c:16037
 msgid ""
 "Set a read watchpoint for an expression.\n"
 "Usage: rwatch [-l|-location] EXPRESSION\n"
@@ -4288,7 +4288,7 @@ msgid ""
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:16036
+#: breakpoint.c:16046
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: awatch [-l|-location] EXPRESSION\n"
@@ -4298,19 +4298,19 @@ msgid ""
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:16045
+#: breakpoint.c:16055
 msgid "Status of specified watchpoints (all watchpoints if no argument)."
 msgstr ""
 
-#: breakpoint.c:16051
+#: breakpoint.c:16061
 msgid "Set debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:16052
+#: breakpoint.c:16062
 msgid "Show debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:16053
+#: breakpoint.c:16063
 msgid ""
 "If zero, gdb will not use hardware for new watchpoints, even if\n"
 "such is available.  (However, any hardware watchpoints that were\n"
@@ -4319,19 +4319,19 @@ msgid ""
 msgstr ""
 
 #. Tracepoint manipulation commands.
-#: breakpoint.c:16066
+#: breakpoint.c:16076
 msgid ""
 "Set a tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:16078
+#: breakpoint.c:16088
 msgid ""
 "Set a fast tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:16085
+#: breakpoint.c:16095
 msgid ""
 "Set a static tracepoint at specified line, function or marker.\n"
 "\n"
@@ -4359,35 +4359,35 @@ msgid ""
 "Do \"help tracepoints\" for info on other tracepoint commands."
 msgstr ""
 
-#: breakpoint.c:16111
+#: breakpoint.c:16121
 msgid ""
 "Status of specified tracepoints (all tracepoints if no argument).\n"
 "Convenience variable \"$tpnum\" contains the number of the\n"
 "last tracepoint set."
 msgstr ""
 
-#: breakpoint.c:16118
+#: breakpoint.c:16128
 msgid ""
 "Delete specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means delete all tracepoints."
 msgstr ""
 
-#: breakpoint.c:16125
+#: breakpoint.c:16135
 msgid ""
 "Disable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means disable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:16132
+#: breakpoint.c:16142
 msgid ""
 "Enable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means enable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:16139
+#: breakpoint.c:16149
 msgid ""
 "Set the passcount for a tracepoint.\n"
 "The trace will end when the tracepoint has been passed 'count' times.\n"
@@ -4395,12 +4395,12 @@ msgid ""
 "if TPNUM is omitted, passcount refers to the last tracepoint defined."
 msgstr ""
 
-#: breakpoint.c:16146
+#: breakpoint.c:16156
 msgid "Save breakpoint definitions as a script."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:16150
+#: breakpoint.c:16160
 msgid ""
 "Save current breakpoint definitions as a script.\n"
 "This includes all types of breakpoints (breakpoints, watchpoints,\n"
@@ -4408,29 +4408,29 @@ msgid ""
 "session to restore them."
 msgstr ""
 
-#: breakpoint.c:16158
+#: breakpoint.c:16168
 msgid ""
 "Save current tracepoint definitions as a script.\n"
 "Use the 'source' command in another debug session to restore them."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:16167 breakpoint.c:16173
+#: breakpoint.c:16177 breakpoint.c:16183
 msgid ""
 "Breakpoint specific settings\n"
 "Configure various breakpoint-specific variables such as\n"
 "pending breakpoint behavior"
 msgstr ""
 
-#: breakpoint.c:16181
+#: breakpoint.c:16191
 msgid "Set debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:16182
+#: breakpoint.c:16192
 msgid "Show debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:16183
+#: breakpoint.c:16193
 msgid ""
 "If on, an unrecognized breakpoint location will cause gdb to create a\n"
 "pending breakpoint.  If off, an unrecognized breakpoint location results in\n"
@@ -4438,15 +4438,15 @@ msgid ""
 "user-query to see if a pending breakpoint should be created."
 msgstr ""
 
-#: breakpoint.c:16196
+#: breakpoint.c:16206
 msgid "Set automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:16197
+#: breakpoint.c:16207
 msgid "Show automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:16198
+#: breakpoint.c:16208
 msgid ""
 "If set, the debugger will automatically use hardware breakpoints for\n"
 "breakpoints set with \"break\" but falling in read-only memory.  If not "
@@ -4454,15 +4454,15 @@ msgid ""
 "a warning will be emitted for such breakpoints."
 msgstr ""
 
-#: breakpoint.c:16208
+#: breakpoint.c:16218
 msgid "Set mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:16209
+#: breakpoint.c:16219
 msgid "Show mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:16210
+#: breakpoint.c:16220
 msgid ""
 "When this mode is on, breakpoints are inserted immediately as soon as\n"
 "they're created, kept inserted even when execution stops, and removed\n"
@@ -4471,15 +4471,15 @@ msgid ""
 "when execution stops."
 msgstr ""
 
-#: breakpoint.c:16223
+#: breakpoint.c:16233
 msgid "Set mode of breakpoint condition evaluation."
 msgstr ""
 
-#: breakpoint.c:16224
+#: breakpoint.c:16234
 msgid "Show mode of breakpoint condition evaluation."
 msgstr ""
 
-#: breakpoint.c:16225
+#: breakpoint.c:16235
 msgid ""
 "When this is set to \"host\", breakpoint conditions will be\n"
 "evaluated on the host's side by GDB.  When it is set to \"target\",\n"
@@ -4491,7 +4491,7 @@ msgid ""
 "be set to \"gdb\""
 msgstr ""
 
-#: breakpoint.c:16238
+#: breakpoint.c:16248
 msgid ""
 "Set a breakpoint for an address range.\n"
 "break-range START-LOCATION, END-LOCATION\n"
@@ -4509,7 +4509,7 @@ msgid ""
 "range (including START-LOCATION and END-LOCATION)."
 msgstr ""
 
-#: breakpoint.c:16254
+#: breakpoint.c:16264
 msgid ""
 "Set a dynamic printf at specified line or function.\n"
 "dprintf location,format string,arg1,arg2,...\n"
@@ -4518,15 +4518,15 @@ msgid ""
 "If a function is specified, break at start of code for that function."
 msgstr ""
 
-#: breakpoint.c:16263
+#: breakpoint.c:16273
 msgid "Set the style of usage for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:16264
+#: breakpoint.c:16274
 msgid "Show the style of usage for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:16265
+#: breakpoint.c:16275
 msgid ""
 "This setting chooses how GDB will do a dynamic printf.\n"
 "If the value is \"gdb\", then the printing is done by GDB to its own\n"
@@ -4536,37 +4536,37 @@ msgid ""
 "output stream by setting dprintf-function and dprintf-channel."
 msgstr ""
 
-#: breakpoint.c:16277
+#: breakpoint.c:16287
 msgid "Set the function to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16278
+#: breakpoint.c:16288
 msgid "Show the function to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16285
+#: breakpoint.c:16295
 msgid "Set the channel to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16286
+#: breakpoint.c:16296
 msgid "Show the channel to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16292
+#: breakpoint.c:16302
 msgid "Set whether dprintf continues after GDB disconnects."
 msgstr ""
 
-#: breakpoint.c:16293
+#: breakpoint.c:16303
 msgid "Show whether dprintf continues after GDB disconnects."
 msgstr ""
 
-#: breakpoint.c:16294
+#: breakpoint.c:16304
 msgid ""
 "Use this to let dprintf commands continue to hit and produce output\n"
 "even if GDB disconnects or detaches from the target."
 msgstr ""
 
-#: breakpoint.c:16301
+#: breakpoint.c:16311
 msgid ""
 "agent-printf \"printf format string\", arg1, arg2, arg3, ..., argn\n"
 "(target agent only) This is useful for formatted output in user-defined "
@@ -11516,17 +11516,17 @@ msgstr ""
 msgid "libthread-db-search-path component too long, ignored: %s."
 msgstr ""
 
-#: gdbserver/linux-low.c:563 linux-nat.c:2179
+#: gdbserver/linux-low.c:575 linux-nat.c:2179
 #, possible-c-format
 msgid "unknown ptrace event %d"
 msgstr ""
 
-#: gdbserver/linux-low.c:946 linux-nat.c:1236
+#: gdbserver/linux-low.c:961 linux-nat.c:1236
 #, possible-c-format
 msgid "Cannot attach to lwp %d: %s"
 msgstr ""
 
-#: gdbserver/linux-low.c:1294 linux-nat.c:1493
+#: gdbserver/linux-low.c:1309 linux-nat.c:1493
 #, possible-c-format
 msgid "Can't detach %s: %s"
 msgstr ""
@@ -26554,50 +26554,50 @@ msgid ""
 "Non-debugging symbols:\n"
 msgstr ""
 
-#: symtab.c:6250 symtab.c:6253
+#: symtab.c:6278 symtab.c:6281
 msgid "All global and static variable names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:6257
+#: symtab.c:6285
 msgid "All function names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:6268
+#: symtab.c:6296
 msgid "All type names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:6271
+#: symtab.c:6299
 msgid "Source files in the program."
 msgstr ""
 
-#: symtab.c:6274
+#: symtab.c:6302
 msgid "Set a breakpoint for all functions matching REGEXP."
 msgstr ""
 
-#: symtab.c:6278
+#: symtab.c:6306
 msgid ""
 "Set the debugger behavior when more than one symbol are possible matches\n"
 "in an expression."
 msgstr ""
 
-#: symtab.c:6280
+#: symtab.c:6308
 msgid "Show how the debugger handles ambiguities in expressions."
 msgstr ""
 
-#: symtab.c:6281
+#: symtab.c:6309
 msgid ""
 "Valid values are \"ask\", \"all\", \"cancel\", and the default is \"all\"."
 msgstr ""
 
-#: symtab.c:6286
+#: symtab.c:6314
 msgid "Set whether a source file may have multiple base names."
 msgstr ""
 
-#: symtab.c:6287
+#: symtab.c:6315
 msgid "Show whether a source file may have multiple base names."
 msgstr ""
 
-#: symtab.c:6288
+#: symtab.c:6316
 msgid ""
 "(A \"base name\" is the name of a file with the directory part removed.\n"
 "Example: The base name of \"/home/user/hello.c\" is \"hello.c\".)\n"
@@ -26608,56 +26608,56 @@ msgid ""
 "one base name, and gdb will do file name comparisons more efficiently."
 msgstr ""
 
-#: symtab.c:6300
+#: symtab.c:6328
 msgid "Set debugging of symbol table creation."
 msgstr ""
 
-#: symtab.c:6301
+#: symtab.c:6329
 msgid "Show debugging of symbol table creation."
 msgstr ""
 
-#: symtab.c:6301
+#: symtab.c:6329
 msgid ""
 "When enabled (non-zero), debugging messages are printed when building\n"
 "symbol tables.  A value of 1 (one) normally provides enough information.\n"
 "A value greater than 1 provides more verbose information."
 msgstr ""
 
-#: symtab.c:6310
+#: symtab.c:6338
 msgid "Set debugging of symbol lookup."
 msgstr ""
 
-#: symtab.c:6311
+#: symtab.c:6339
 msgid "Show debugging of symbol lookup."
 msgstr ""
 
-#: symtab.c:6312
+#: symtab.c:6340
 msgid "When enabled (non-zero), symbol lookups are logged."
 msgstr ""
 
-#: symtab.c:6319
+#: symtab.c:6347
 msgid "Set the size of the symbol cache."
 msgstr ""
 
-#: symtab.c:6320
+#: symtab.c:6348
 msgid "Show the size of the symbol cache."
 msgstr ""
 
-#: symtab.c:6320
+#: symtab.c:6348
 msgid ""
 "The size of the symbol cache.\n"
 "If zero then the symbol cache is disabled."
 msgstr ""
 
-#: symtab.c:6328
+#: symtab.c:6356
 msgid "Dump the symbol cache for each program space."
 msgstr ""
 
-#: symtab.c:6333
+#: symtab.c:6361
 msgid "Print symbol cache statistics for each program space."
 msgstr ""
 
-#: symtab.c:6338
+#: symtab.c:6366
 msgid "Flush the symbol cache for each program space."
 msgstr ""
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/python/lib/gdb/command/type_printers.py ./gdb/python/lib/gdb/command/type_printers.py
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/python/lib/gdb/command/type_printers.py	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/python/lib/gdb/command/type_printers.py	2015-08-11 01:59:17.000000000 +0000
@@ -47,7 +47,7 @@ class InfoTypePrinter(gdb.Command):
         sep = ''
         for objfile in gdb.objfiles():
             if objfile.type_printers:
-                print ("%sType printers for %s:" % (sep, objfile.name))
+                print ("%sType printers for %s:" % (sep, objfile.filename))
                 self.list_type_printers(objfile.type_printers)
                 sep = '\n'
         if gdb.current_progspace().type_printers:
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/symtab.c ./gdb/symtab.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/symtab.c	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/symtab.c	2015-08-11 01:59:17.000000000 +0000
@@ -5598,9 +5598,9 @@ make_symbol_completion_list_fn (struct c
 /* Like make_symbol_completion_list, but returns a list of symbols
    defined in a source file FILE.  */
 
-VEC (char_ptr) *
-make_file_symbol_completion_list (const char *text, const char *word,
-				  const char *srcfile)
+static VEC (char_ptr) *
+make_file_symbol_completion_list_1 (const char *text, const char *word,
+				    const char *srcfile)
 {
   struct symbol *sym;
   struct symtab *s;
@@ -5656,8 +5656,6 @@ make_file_symbol_completion_list (const 
 
   sym_text_len = strlen (sym_text);
 
-  return_val = NULL;
-
   /* Find the symtab for SRCFILE (this loads it if it was not yet read
      in).  */
   s = lookup_symtab (srcfile);
@@ -5693,6 +5691,36 @@ make_file_symbol_completion_list (const 
   return (return_val);
 }
 
+/* Wrapper around make_file_symbol_completion_list_1
+   to handle MAX_COMPLETIONS_REACHED_ERROR.  */
+
+VEC (char_ptr) *
+make_file_symbol_completion_list (const char *text, const char *word,
+				  const char *srcfile)
+{
+  struct cleanup *back_to, *cleanups;
+
+  completion_tracker = new_completion_tracker ();
+  cleanups = make_cleanup_free_completion_tracker (&completion_tracker);
+  return_val = NULL;
+  back_to = make_cleanup (do_free_completion_list, &return_val);
+
+  TRY
+    {
+      make_file_symbol_completion_list_1 (text, word, srcfile);
+    }
+  CATCH (except, RETURN_MASK_ERROR)
+    {
+      if (except.error != MAX_COMPLETIONS_REACHED_ERROR)
+	throw_exception (except);
+    }
+  END_CATCH
+
+  discard_cleanups (back_to);
+  do_cleanups (cleanups);
+  return return_val;
+}
+
 /* A helper function for make_source_files_completion_list.  It adds
    another file name to a list of possible completions, growing the
    list as necessary.  */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/target/waitstatus.h ./gdb/target/waitstatus.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/target/waitstatus.h	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/target/waitstatus.h	2015-08-11 01:59:17.000000000 +0000
@@ -131,7 +131,10 @@ enum target_stop_reason
   TARGET_STOPPED_BY_HW_BREAKPOINT,
 
   /* Stopped by a watchpoint.  */
-  TARGET_STOPPED_BY_WATCHPOINT
+  TARGET_STOPPED_BY_WATCHPOINT,
+
+  /* Stopped by a single step finishing.  */
+  TARGET_STOPPED_BY_SINGLE_STEP
 };
 
 /* Prototypes */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/ChangeLog ./gdb/testsuite/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/ChangeLog	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/testsuite/ChangeLog	2015-08-11 01:59:17.000000000 +0000
@@ -1,3 +1,19 @@
+2015-08-10  Doug Evans  <dje@google.com>
+	    Keith Seitz  <keiths@redhat.com>
+
+	PR gdb/17960
+	* gdb.base/completion.exp: Add location completer tests.
+
+2015-08-06  Pedro Alves  <palves@redhat.com>
+
+	* gdb.threads/forking-threads-plus-breakpoint.exp: New file.
+	* gdb.threads/forking-threads-plus-breakpoint.c: New file.
+
+2015-08-05  Pedro Alves  <palves@redhat.com>
+
+	* gdb.threads/next-while-other-thread-longjmps.c: New file.
+	* gdb.threads/next-while-other-thread-longjmps.exp: New file.
+
 2015-07-30  Pedro Alves  <palves@redhat.com>
 
 	* linux-low.c (handle_extended_wait): Set the child's last
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.base/completion.exp ./gdb/testsuite/gdb.base/completion.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.base/completion.exp	2015-08-04 01:58:57.000000000 +0000
+++ ./gdb/testsuite/gdb.base/completion.exp	2015-08-11 01:59:17.000000000 +0000
@@ -777,6 +777,88 @@ gdb_test_multiple "" "$test" {
 }
 
 #
+# Tests for the location completer
+#
+
+# Turn off pending breakpoint support so that we don't get queried
+# all the time.
+gdb_test_no_output "set breakpoint pending off"
+
+set subsrc [string range $srcfile 0 [expr {[string length $srcfile] - 3}]]
+set test "tab complete break $subsrc"
+send_gdb "break $subsrc\t\t"
+gdb_test_multiple "" $test {
+    -re "break\.c.*break1\.c.*$gdb_prompt " {
+	send_gdb "1\t\n"
+	gdb_test_multiple "" $test {
+	    -re ".*Function \"$srcfile2\" not defined\..*$gdb_prompt " {
+		pass $test
+	    }
+	    -re "$gdb_prompt p$" {
+		fail $test
+	    }
+	}
+    }
+
+    -re "$gdb_prompt p$" {
+	fail $test
+    }
+}
+
+gdb_test "complete break $subsrc" "break\.c.*break1\.c"
+
+set test "tab complete break need"
+send_gdb "break need\t"
+gdb_test_multiple "" $test {
+    -re "break need_malloc " {
+	send_gdb "\n"
+	gdb_test_multiple "" $test {
+	    -re ".*Breakpoint.*at .*/$srcfile, line .*$gdb_prompt " {
+		pass $test
+		gdb_test_no_output "delete breakpoint \$bpnum" \
+		    "delete breakpoint for $test"
+	    }
+	    -re "$gdb_prompt p$" {
+		fail $test
+	    }
+	}
+    }
+    -re "$gdb_prompt p$" {
+	fail $test
+    }
+}
+
+gdb_test "complete break need" "need_malloc"
+
+# gdb/17960
+# Enabling max-completions is necessary to trigger the bug.
+gdb_test_no_output "set max-completions 10"
+set test "tab complete break $srcfile:ma"
+send_gdb "break $srcfile:ma\t"
+gdb_test_multiple "" $test {
+    -re "break $srcfile:main " {
+	send_gdb "\n"
+	gdb_test_multiple "" $test {
+	    -re ".*Breakpoint.*at .*/$srcfile, line .*$gdb_prompt " {
+		pass $test
+		gdb_test_no_output "delete breakpoint \$bpnum" \
+		    "delete breakpoint for $test"
+	    }
+	    -re "$gdb_prompt p$" {
+		fail $test
+	    }
+	}
+    }
+    -re "$gdb_prompt p$" {
+	fail $test
+    }
+}
+
+gdb_test "complete break $srcfile:ma" "break\.c:main"
+
+# End of gdb/17960 testing.
+
+#
 # Completion limiting.
 #
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c ./gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c	2015-08-11 01:59:17.000000000 +0000
@@ -0,0 +1,139 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2015 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/>.  */
+
+#include <assert.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+
+/* Number of threads.  Each thread continuously spawns a fork and wait
+   for it.  If we have another thread continuously start a step over,
+   gdbserver should end up finding new forks while suspending
+   threads.  */
+#define NTHREADS 10
+
+pthread_t threads[NTHREADS];
+
+pthread_barrier_t barrier;
+
+#define NFORKS 10
+
+/* Used to create a conditional breakpoint that always fails.  */
+volatile int zero;
+
+static void *
+thread_forks (void *arg)
+{
+  int i;
+
+  pthread_barrier_wait (&barrier);
+
+  for (i = 0; i < NFORKS; i++)
+    {
+      pid_t pid;
+
+      pid = fork ();
+
+      if (pid > 0)
+	{
+	  int status;
+
+	  /* Parent.  */
+	  pid = waitpid (pid, &status, 0);
+	  if (pid == -1)
+	    {
+	      perror ("wait");
+	      exit (1);
+	    }
+
+	  if (!WIFEXITED (status))
+	    {
+	      printf ("Unexpected wait status 0x%x from child %d\n",
+		      status, pid);
+	    }
+	}
+      else if (pid == 0)
+	{
+	  /* Child.  */
+	  exit (0);
+	}
+      else
+	{
+	  perror ("fork");
+	  exit (1);
+	}
+    }
+}
+
+/* Set this to tell the thread_breakpoint thread to exit.  */
+volatile int break_out;
+
+static void *
+thread_breakpoint (void *arg)
+{
+  pthread_barrier_wait (&barrier);
+
+  while (!break_out)
+    {
+      usleep (1); /* set break here */
+    }
+
+  return NULL;
+}
+
+pthread_barrier_t barrier;
+
+int
+main (void)
+{
+  int i;
+  int ret;
+  pthread_t bp_thread;
+
+  /* Don't run forever.  */
+  alarm (180);
+
+  pthread_barrier_init (&barrier, NULL, NTHREADS + 1);
+
+  /* Start the threads that constantly fork.  */
+  for (i = 0; i < NTHREADS; i++)
+    {
+      ret = pthread_create (&threads[i], NULL, thread_forks, NULL);
+      assert (ret == 0);
+    }
+
+  /* Start the thread that constantly hit a conditional breakpoint
+     that needs to be stepped over.  */
+  ret = pthread_create (&bp_thread, NULL, thread_breakpoint, NULL);
+  assert (ret == 0);
+
+  /* Wait for forking to stop.  */
+  for (i = 0; i < NTHREADS; i++)
+    {
+      ret = pthread_join (threads[i], NULL);
+      assert (ret == 0);
+    }
+
+  break_out = 1;
+  pthread_join (bp_thread, NULL);
+  assert (ret == 0);
+
+  return 0;
+}
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp ./gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp	2015-08-11 01:59:17.000000000 +0000
@@ -0,0 +1,117 @@
+# Copyright (C) 2015 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/>.
+
+# This test verifies that several threads forking while another thread
+# is constantly stepping over a breakpoint is properly handled.
+
+standard_testfile
+
+set linenum [gdb_get_line_number "set break here"]
+
+if {[build_executable "failed to prepare" $testfile $srcfile {debug pthreads}] == -1} {
+    return -1
+}
+
+# The test proper.  If COND_BP_TARGET is true, then test with
+# conditional breakpoints evaluated on the target side, if possible.
+# DETACH_ON_FORK is used as value for the "set detach-on-fork"
+# setting.  If "on", this exercises GDB explicitly continuing the fork
+# child until exit.  If "off", this exercises GDB detaching the fork
+# child.
+proc do_test { cond_bp_target detach_on_fork } {
+    global GDBFLAGS
+    global srcfile testfile binfile
+    global decimal gdb_prompt
+    global linenum
+    global is_remote_target
+
+    set saved_gdbflags $GDBFLAGS
+    set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""]
+    clean_restart $binfile
+    set GDBFLAGS $saved_gdbflags
+
+    if ![runto_main] then {
+	fail "Can't run to main"
+	return 0
+    }
+
+    gdb_test_no_output "set detach-on-fork $detach_on_fork"
+
+    gdb_test "break $linenum if zero == 1" \
+	"Breakpoint .*" \
+	"set breakpoint that evals false"
+
+    set test "continue &"
+    gdb_test_multiple $test $test {
+	-re "$gdb_prompt " {
+	    pass $test
+	}
+    }
+
+    set fork_count 0
+    set ok 0
+
+    set test "inferior 1 exited"
+    gdb_test_multiple "" $test {
+	-re "Inferior 1 \(\[^\r\n\]+\) exited normally" {
+	    set ok 1
+	    pass $test
+	}
+	-re "Inferior $decimal \(\[^\r\n\]+\) exited normally" {
+	    incr fork_count
+	    if {$fork_count <= 100} {
+		exp_continue
+	    } else {
+		fail "$test (too many forks)"
+	    }
+	}
+    }
+
+    if {!$ok} {
+	# No use testing further.
+	return
+    }
+
+    gdb_test "info threads" "No threads\." \
+	"no threads left"
+
+    gdb_test "info inferiors" \
+	"Num\[ \t\]+Description\[ \t\]+Executable\[ \t\]+\r\n\\* 1 \[^\r\n\]+" \
+	"only inferior 1 left"
+}
+
+# Wrapper for foreach that calls with_test_prefix on each iteration,
+# including the iterator's current value in the prefix.
+
+proc foreach_with_prefix {var list body} {
+    upvar 1 $var myvar
+    foreach myvar $list {
+	with_test_prefix "$var=$myvar" {
+	    uplevel 1 $body
+	}
+    }
+}
+
+foreach_with_prefix cond_bp_target {1 0} {
+    foreach_with_prefix detach_on_fork {"on" "off"} {
+	do_test $cond_bp_target $detach_on_fork
+
+	# Disable "off" for now.  The test does pass with
+	# detach-on-fork off (at the time of writing), but gdb seems
+	# to slow down quadratically as inferiors are created, and
+	# then the test takes annoyingly long to complete...
+	break
+    }
+}
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.c ./gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.c	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.c	2015-08-11 01:59:17.000000000 +0000
@@ -0,0 +1,127 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2015 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/>.  */
+
+#include <assert.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <setjmp.h>
+
+/* Number of threads.  */
+#define NTHREADS 10
+
+/* When set, threads exit.  */
+volatile int break_out;
+
+pthread_barrier_t barrier;
+
+/* Entry point for threads that setjmp/longjmp.  */
+
+static void *
+thread_longjmp (void *arg)
+{
+  jmp_buf env;
+
+  pthread_barrier_wait (&barrier);
+
+  while (!break_out)
+    {
+      if (setjmp (env) == 0)
+	longjmp (env, 1);
+
+      usleep (1);
+    }
+  return NULL;
+}
+
+/* Entry point for threads that try/catch.  */
+
+static void *
+thread_try_catch (void *arg)
+{
+  volatile unsigned int counter = 0;
+
+  pthread_barrier_wait (&barrier);
+
+  while (!break_out)
+    {
+      try
+	{
+	  throw 1;
+	}
+      catch (...)
+	{
+	  counter++;
+	}
+
+      usleep (1);
+    }
+  return NULL;
+}
+
+int
+main (void)
+{
+  pthread_t threads[NTHREADS];
+  int i;
+  int ret;
+
+  /* Don't run forever.  */
+  alarm (180);
+
+  pthread_barrier_init (&barrier, NULL, NTHREADS + 1);
+
+  for (i = 0; i < NTHREADS; i++)
+    {
+      /* Half of the threads does setjmp/longjmp, the other half does
+	 try/catch.  */
+      if ((i % 2) == 0)
+	ret = pthread_create (&threads[i], NULL, thread_longjmp , NULL);
+      else
+	ret = pthread_create (&threads[i], NULL, thread_try_catch , NULL);
+      assert (ret == 0);
+    }
+
+  /* Wait until all threads are running.  */
+  pthread_barrier_wait (&barrier);
+
+#define LINE usleep (1)
+
+  /* The other thread's setjmp/longjmp/try/catch should not disturb
+     this thread's stepping over these lines.  */
+
+  LINE; /* set break here */
+  LINE; /* line 1 */
+  LINE; /* line 2 */
+  LINE; /* line 3 */
+  LINE; /* line 4 */
+  LINE; /* line 5 */
+  LINE; /* line 6 */
+  LINE; /* line 7 */
+  LINE; /* line 8 */
+  LINE; /* line 9 */
+  LINE; /* line 10 */
+
+  break_out = 1;
+
+  for (i = 0; i < NTHREADS; i++)
+    {
+      ret = pthread_join (threads[i], NULL);
+      assert (ret == 0);
+    }
+
+  return 0;
+}
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp ./gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp	2015-08-11 01:59:17.000000000 +0000
@@ -0,0 +1,40 @@
+# Copyright (C) 2015 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/>.
+
+# This test has the main thread step over a few lines, while a few
+# threads constantly do setjmp/long and others do try/catch.  The
+# "next" commands in the main thread should be able to complete
+# undisturbed.
+
+standard_testfile
+
+set linenum [gdb_get_line_number "set break here"]
+
+if {[prepare_for_testing "failed to prepare" \
+	 $testfile $srcfile {c++ debug pthreads}] == -1} {
+    return -1
+}
+
+if ![runto_main] then {
+    fail "Can't run to main"
+    return 0
+}
+
+gdb_breakpoint $linenum
+gdb_continue_to_breakpoint "start line"
+
+for {set i 1} {$i <= 10} {incr i} {
+    gdb_test "next" " line $i .*" "next to line $i"
+}
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/md5.sum ./md5.sum
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150804/md5.sum	2015-08-04 02:01:48.000000000 +0000
+++ ./md5.sum	2015-08-11 02:02:15.000000000 +0000
@@ -38,7 +38,7 @@ f74f5720bf485dc971d7b4151b97318b  bfd/pe
 d714ee957aefa81619f03058d91b23cb  bfd/elfcore.h
 64f6bec36e44883df8ceae0157bb7a4e  bfd/elf64-mips.c
 57287cb3abe2dc7f66af4ab28aafebe9  bfd/cpu-m9s12x.c
-21eaa14852d279b1358df15b5298731a  bfd/version.h
+028ede5f0ce847f3c2c032ee136e9d61  bfd/version.h
 a107ac2f34a58b7629fbff59490f61f1  bfd/cpu-tilegx.c
 ceebc66a221f8f9297b660d643de9009  bfd/coff-mcore.c
 b33e0ba78cdd46c771e365ab8b48bfc1  bfd/cpu-avr.c
@@ -97,9 +97,9 @@ e3c124c38ea4570880eea37805573a14  bfd/co
 44f38f85d08fe90e795466e4290d7eed  bfd/pef-traceback.h
 55e00bd9014a3d3560c12792adfd92b0  bfd/cpu-m68hc11.c
 e8d05731a4478f362040f06713539674  bfd/coff-go32.c
-951aa84194434f5235f492b9a661791a  bfd/config.in
+45397e77d40a7a78658b196b6a486571  bfd/config.in
 36024c3c1dc8d56546d1d2ca9d725ff9  bfd/hash.c
-e51dbb0326a8ac5550e1ec432a7d10c3  bfd/configure.ac
+32a42ea9d1578ceb30718e4afce9aa72  bfd/configure.ac
 5e46070804158249faa239479c9835a1  bfd/compress.c
 7b230ee4119f55b9ab4cbb76392a909f  bfd/cpu-w65.c
 0c6f8c4af12bb99cbf76d6dbffaa8b3e  bfd/README
@@ -366,7 +366,7 @@ e301bdd246cdf7352ee89dbf73ea052c  bfd/el
 14f93dd0b380ce57a88b262ca5f301db  bfd/nlm32-i386.c
 20cd132505e6203fdc3068e8baadf398  bfd/cpu-arc.c
 54eea14eaca3145ab10100e6dd73e607  bfd/acinclude.m4
-69da812bafc7c02ef06215774161e299  bfd/configure
+13cb4b8933496fa1af1c0abf0eec2014  bfd/configure
 046755660e117f735a0540b93124a1f3  bfd/cpu-arm.c
 c449aada5c464ee95c7c4f4118977b78  bfd/elf64-ppc.h
 e4c7bffec050e8812f13a6dd7551121e  bfd/merge.c
@@ -434,7 +434,7 @@ ad06b2d8cb037bf4e2929d37067e5b3d  bfd/co
 7b89e415f08d597d888efc2c3dded43c  bfd/elfxx-ia64.h
 930e4ba115922c6a2566a16405388942  bfd/elf32-or1k.c
 08ead0e86a5e0431461a7432ce28e1c5  bfd/targets.c
-75c4bcf519027131c779130ddaa8b23b  bfd/ChangeLog
+13363978b5601483a923e549cb5fb24a  bfd/ChangeLog
 31bf82d5b20800911fe4f2557ea3c505  bfd/section.c
 f5be33ca327fa9960fa4941c9149601d  bfd/elf-s390-common.c
 cfd84c67d7dd852f0331d96ba0edfbdf  bfd/elf32-lm32.c
@@ -949,7 +949,7 @@ b9066d1a65e8514522b02f3978132322  gdb/py
 25965e75d146f9c33e7bb45254754509  gdb/python/lib/gdb/prompt.py
 bc0b67bcddb9772178be38d7ad77ed95  gdb/python/lib/gdb/FrameDecorator.py
 145874e967a68b1473ab332edba5568d  gdb/python/lib/gdb/command/unwinders.py
-76272fb7cc96c8290d754394559269fa  gdb/python/lib/gdb/command/type_printers.py
+75f33a07101cba09d574b2281c2f73cb  gdb/python/lib/gdb/command/type_printers.py
 3acb3be1d4eb66164f26beb122abb937  gdb/python/lib/gdb/command/prompt.py
 b68307c79ea7fbfd4dd39653799c7128  gdb/python/lib/gdb/command/explore.py
 03d92d847e9acebff86f93bc900d08be  gdb/python/lib/gdb/command/pretty_printers.py
@@ -1058,7 +1058,7 @@ ffead0956cd726c71c5c37062347d95c  gdb/na
 c687e0580e5a12d6e0ed07f2ef6c835e  gdb/nat/linux-btrace.h
 438a661fb60ff1a0a505f7d333245569  gdb/nat/linux-namespaces.h
 a20db5a50862281e0c33c011e26917ba  gdb/nat/linux-personality.c
-7f96493e385a602effd492459e9d90e8  gdb/nat/linux-waitpid.c
+074d74171723b6d79caa903695db8647  gdb/nat/linux-waitpid.c
 6d6af0cb7ab4fd37314aa8af76ae26dc  gdb/dsrec.c
 9c609b5097f68ac06f991a9dc487090e  gdb/go-valprint.c
 b099f0183fbb9021bb0a4c13db15363d  gdb/dwarf2loc.c
@@ -1186,7 +1186,7 @@ cb029bf8ddbfd4dcce86204ba7a7948c  gdb/p-
 8536ef5434b85fadbe1852ceeb3eb7ee  gdb/target/target.h
 ff0399f51859e14d5959c160e466ec94  gdb/target/wait.h
 ede0b930ccc313c8eedd0bd954096318  gdb/target/resume.h
-c4980dda3dc545bd7ce5e239e37c1ec4  gdb/target/waitstatus.h
+f09df19f7b414ef2402cf5ae156b076b  gdb/target/waitstatus.h
 ad28fd2388b0cdaf0936b45cc2e104c4  gdb/target/waitstatus.c
 dd63e64892b68ac56ffcac5c7600ef53  gdb/memrange.c
 bbc4d2132f27f80a5d4c268eceba04ff  gdb/i386nbsd-nat.c
@@ -2631,7 +2631,7 @@ c003a0b4c20c35b13875bc20268a9017  gdb/te
 932ad1f9d0ca1c221713154e60e9d5c1  gdb/testsuite/gdb.base/siginfo-thread.exp
 42ce7c95b90c7fa7080f984e16f3cb6d  gdb/testsuite/gdb.base/mips_pro.exp
 2d70eb4738500f885cb68e862cf88b7e  gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp
-3eafb1242f1649d182f935b91aa284b0  gdb/testsuite/gdb.base/completion.exp
+d437b330d6e2ba09f49a566d87827e53  gdb/testsuite/gdb.base/completion.exp
 59a90917be2c4fc3f76ddee248f5b09e  gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
 601f4ed2b5be1d234ba175e76d7bba62  gdb/testsuite/gdb.base/branches.c
 20b63a2c127d0257909bfbed9356c5f5  gdb/testsuite/gdb.base/attach-pie-noexec.exp
@@ -3585,6 +3585,7 @@ a2d113a7f444b497b4564e0ee9ddc899  gdb/te
 896138da22c68c931198ea05210aa340  gdb/testsuite/gdb.trace/trace-mt.exp
 50dda4bdd3cd74bc92c1b230f8cfbe3f  gdb/testsuite/configure
 9fbe2b163224a88edcfdc50c8ca21621  gdb/testsuite/aclocal.m4
+281dfb05da89694b7406ff718ecb75ab  gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
 fda53dda096c181aeed6c78de55f455a  gdb/testsuite/gdb.threads/clone-new-thread-event.exp
 74fe8139d67c0c776a4a28460b473f30  gdb/testsuite/gdb.threads/tls-var.exp
 19562238a9f887dbc7bc5b534b90ced2  gdb/testsuite/gdb.threads/siginfo-threads.c
@@ -3697,6 +3698,7 @@ a14cd3640c067bed8169ed8ca2cc3a82  gdb/te
 34d7357618b291ddbf72c725eb1af0c6  gdb/testsuite/gdb.threads/kill.c
 116d5f9d2564fa3fd77381e1c768aeb3  gdb/testsuite/gdb.threads/hand-call-new-thread.exp
 abcb223a22e788a09e29542e63f4f27a  gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.c
+6b6028d400f628ff9e075a0dc79fcd64  gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.c
 16b4e4848e1e9936959df7c7d956a960  gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp
 748ccd45d02dbd2287853d95ac88cf5d  gdb/testsuite/gdb.threads/continue-pending-status.c
 b58d0f333f8e1c21a851ec19bf5997cd  gdb/testsuite/gdb.threads/switch-threads.c
@@ -3712,6 +3714,7 @@ cd24e61275a3331463e1c810ca036ee6  gdb/te
 8c2e8d1987b66f5eb096380f46004c7e  gdb/testsuite/gdb.threads/step-bg-decr-pc-switch-thread.exp
 4d600e51eeefad0d860972cc9b370d98  gdb/testsuite/gdb.threads/no-unwaited-for-left.c
 a974b5a446207107ba7db8626c351d49  gdb/testsuite/gdb.threads/non-ldr-exc-2.exp
+df108e83265b78d2994395883e0668b0  gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
 842744f3ec4ac3c5e5f5f928905dcbec  gdb/testsuite/gdb.threads/stepi-random-signal.c
 982e44a999badc73b20be50166ff6afd  gdb/testsuite/gdb.threads/gcore-stale-thread.exp
 8230671d251dc34a02dac6da5e9f64ae  gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -3744,6 +3747,7 @@ fa08207a0d828feebea518c2f3881790  gdb/te
 88c31c17973d7f5526b7a90641c7e4f9  gdb/testsuite/gdb.threads/ia64-sigill.exp
 d5fc1b19190c2938aa6c8446d86b6a8a  gdb/testsuite/gdb.threads/gcore-stale-thread.c
 27b4b4f2d1cdfb2473cb8e53bf9fe26a  gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
+d640e49c5327dcf7e1a5c042d5beba16  gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c
 a7c2c6b952b068007c503da1f2aafacc  gdb/testsuite/gdb.threads/dlopen-libpthread.exp
 8e51237f2e601b09a8981af7beb8db6d  gdb/testsuite/gdb.threads/clone-new-thread-event.c
 19a8fb2f391ed64f3528d72aab62364b  gdb/testsuite/gdb.threads/clone-thread_db.exp
@@ -3774,7 +3778,7 @@ e928ad8539846ca007aafb3031dfbaa3  gdb/te
 4127afeb79b2a2bff6c65f128ebd5969  gdb/testsuite/gdb.go/integers.exp
 68d17058fa82304a192749f0eadc138d  gdb/testsuite/gdb.go/strings.go
 81b7ed6cb92c627d245bd2efc4b953b9  gdb/testsuite/gdb.go/methods.go
-eafa56d641955776ac6301efb77a2273  gdb/testsuite/ChangeLog
+2718201d80109c1e0804e2e0594ffde8  gdb/testsuite/ChangeLog
 b3f11b21e5921c419a43f93720dedf85  gdb/testsuite/gdb.asm/empty.inc
 37e24b5cf07dbd52c98944590fde4d51  gdb/testsuite/gdb.asm/asm-source.exp
 f1621bbbb2acbec5adef86d7d9549975  gdb/testsuite/gdb.asm/bfin.inc
@@ -4387,43 +4391,43 @@ dc3fd52f6c7a3934f21054cf80ecd074  gdb/f-
 19a5a53a8dbef5372bd3113c323a2bf2  gdb/gdb_curses.h
 1bbdb3e7ea9ca53f9a8cf1a548dca9f5  gdb/jv-valprint.c
 8108dd8f906f2654fecc74958cf383db  gdb/doc/psrc.sed
-ca3934c93340421609870697d2d6036b  gdb/doc/gdb.info-3
-00cae2fa559c8ad985d325bc6cc3af8a  gdb/doc/gdb.info-4
+59ff17a5ac4a7e462e3646af0d3d6f2a  gdb/doc/gdb.info-3
+182b2d4a3f9aaed5d94050999f7a55a6  gdb/doc/gdb.info-4
 ab0fe311032294b952da80585b8b90e7  gdb/doc/fdl.texi
 b28439f57122aec81b0ba8ee0479893d  gdb/doc/Makefile.in
-ada60583ecb0ec5d8b61cc26512ee1fd  gdb/doc/gdb.info-7
+98b19958c7bea65745502699926d7288  gdb/doc/gdb.info-7
 65ee16c0a68d8954d5892092576beb66  gdb/doc/observer.texi
-1c089ba34beac142f7de20e3a0d47c8c  gdb/doc/gdbserver.1
+78f73cc4cab5701109e9914da54c5e8a  gdb/doc/gdbserver.1
 e2d60785de02ac5252c6d40e24f4a7e4  gdb/doc/guile.texi
 f81a0e00e0cb9e41b078069fb9bedb07  gdb/doc/stack_frame.txt
 a63345597c2ea67a59b96a1159d50da7  gdb/doc/stabs.info
-b7ed3da2fff165e6cbb5d0cf76cd9bf6  gdb/doc/gdb.info-5
-1f522818fc00d53397b54701c176e508  gdb/doc/gdb.info-8
+5558ba9a1ae98383c077700cc5d1b877  gdb/doc/gdb.info-5
+434f3f5ddacae9016f70674f8b517cb9  gdb/doc/gdb.info-8
 132df0593e237d8337cf0134804ca21e  gdb/doc/agentexpr.texi
-5c8c7eca7c5ab401064cb96b3aaaceff  gdb/doc/gdb.info-1
+da52be00dfa1bc6f81d2b8c20ad88e41  gdb/doc/gdb.info-1
 d5d06eaf9b4d44aa442a4a281aa9aea4  gdb/doc/a4rc.sed
-9673dee6dca77f8f2d4b26a6bb5cfe83  gdb/doc/gdb.info-6
+0ea83472b31f40c2796d2c8f8dbbcb4f  gdb/doc/gdb.info-6
 b1f1fd2f3273d7026e54af847e5529c9  gdb/doc/gdb.texinfo
 553b7fe1bf4b5d8b96fdb8cd83503de1  gdb/doc/stack_frame.svg
 04c82b1da7e894a6555868e4f86225af  gdb/doc/filter-for-doxygen
 938187ce9976cbeb134b49335770152c  gdb/doc/Doxyfile-gdb-api.in
 f828e05ce4faab3d297f32d540f77c99  gdb/doc/annotate.info
-66f8061a465fc51323c9d9cc98f54e42  gdb/doc/gdb.info-2
+2065f2bf4b346ca9488acc27022b477e  gdb/doc/gdb.info-2
 df443225fa3e5719ca7e6925a7e633e0  gdb/doc/refcard.tex
 6076d300a46651562d4ecd0604442414  gdb/doc/stack_frame.png
-62c32f8d206171ec4bec3fa09f5b76aa  gdb/doc/gdb.info
+d59bb96927288076330ff3c4ef5a1969  gdb/doc/gdb.info
 51fe9bc8ae61f4c3f8d31c2a67998119  gdb/doc/python.texi
 0c6f6a14ac05e4293883f89b750804e3  gdb/doc/stabs.texinfo
 4b898436ab7b3497b414592e8c62e44e  gdb/doc/ChangeLog
-f5450e27d6d48b102b2b12c7ae6931fe  gdb/doc/gdb.1
-a4e302bacd838cb9c706e3f1722c3e6c  gdb/doc/gcore.1
+71bb0dfd75a3b0719fdfa4a958e352a7  gdb/doc/gdb.1
+6e40c67b66e57d32e2bc0cdcf246ccbe  gdb/doc/gcore.1
 d39233c86ed6a6dc9e853ae6a11fe03e  gdb/doc/stack_frame.pdf
 2daa53916456ce35b6806c2883623b89  gdb/doc/Doxyfile-base.in
 7e8f20fd3b739803f4bd3991d35a4a1f  gdb/doc/all-cfg.texi
 bf96494e6e4d346175babd5ef9781882  gdb/doc/gpl.texi
 cd5e3faa9bd1b684a73c7d527cdb4988  gdb/doc/filter-params.pl
 7bfdb0765c5d050d204fbb30aeeba0d8  gdb/doc/stack_frame.eps
-13d0bf90583808d4dedd4d686b9c8eb0  gdb/doc/gdbinit.5
+6fc72a521dbeb68f2dba72b4708f4a90  gdb/doc/gdbinit.5
 d606e873666ae0bc7bc7c84d6c9c2332  gdb/doc/Doxyfile-gdb-xref.in
 705bf0b3fb65b3f7e3db4cc5d9ae8eba  gdb/doc/annotate.texinfo
 79278fc2f5486809779a9a8f8883d401  gdb/doc/doxy-index.in
@@ -4810,7 +4814,7 @@ d99d990f736410d8846bf12606d92960  gdb/fe
 27017411a6f4e30bac937af3fe144dd3  gdb/solib-target.c
 a139eb01a2fe8bf3bf89308c6285f548  gdb/tilegx-tdep.c
 39ea2c70489bb412e91c1139c460c77e  gdb/c-lang.h
-614940eb8f38ac6ad221dba61fd8c0b6  gdb/breakpoint.c
+081b9d4b0d6b2bb8f5899d4deeaadbce  gdb/breakpoint.c
 10c784bc31fe315e0fe28aafe664efc9  gdb/block.h
 a7d03261f30658bd7b02502575ed5fff  gdb/ax-gdb.c
 c529eab219d300d1f0e39c157d86ac1b  gdb/prologue-value.h
@@ -4863,7 +4867,7 @@ dc1f70ce31b012803ec1621bd838c815  gdb/ia
 cae9b8adabfe1884c312d3f9380881cb  gdb/frv-tdep.c
 b76a008c7b9215f6874bd6c949ff1fec  gdb/c-varobj.c
 1f51d13023f12ad59e3f62f26a3107c1  gdb/i386-tdep.c
-a90b81a5ae2685a512283a8aa56a99d6  gdb/symtab.c
+bdc4734136103ca99ba01ce6918aacdf  gdb/symtab.c
 ddba1e35119e6ad20e516851219e6498  gdb/osabi.c
 a165441ff57ae43263467cc5fcb3138d  gdb/m32r-linux-tdep.c
 bf0ee72881541e5967ce27a9c29b3c37  gdb/mipsnbsd-tdep.h
@@ -4892,7 +4896,7 @@ ac8cd5adb103f97f943cc1eec57e566b  gdb/co
 f1679b5d9950d66febb8259748700963  gdb/std-regs.c
 9da9e540b1c6970695a3161272737803  gdb/go-lang.h
 23e51b25e50614cfba06a52e405e2243  gdb/i386-windows-nat.c
-2c584ddaa6dbd0dd69f65912cb552075  gdb/po/gdb.pot
+fe0e652e40e0b55bfe90b7d97940101a  gdb/po/gdb.pot
 1851bff0653201a488dcae18dde7efad  gdb/po/gdbtext
 59a3face91a650ce0dcaa925ae89cb59  gdb/break-catch-syscall.c
 3688a736a34cf031d224e1e35d69b662  gdb/ada-lang.c
@@ -4919,7 +4923,7 @@ e6dc6366c95d38a7ac9ebb6ff31462df  gdb/ex
 32bb803ab1e68860f1402dbe7e2cb0f5  gdb/nbsd-nat.h
 83df4734061e07b644f77632819578cf  gdb/mipsread.c
 f5c872d4805a7ac039b4dfc840f4bb8a  gdb/amd64-darwin-tdep.c
-26c6148ec3accb2f87a008318bba76ad  gdb/ChangeLog
+634de9ecd900b7658b4dfdbe4c6f6e87  gdb/ChangeLog
 5a1dbe4837b41ee2b9cc7a35e0d20a61  gdb/go-typeprint.c
 3275c016926223eb629c4f65b64822df  gdb/score-tdep.c
 5a44fd4377f0804008a3697e72efbfe3  gdb/xml-support.h
@@ -5140,7 +5144,7 @@ b0cea923664c3efb97b385d1c2f29f37  gdb/gd
 a8b318ada418e233c4996535f60b132c  gdb/gdbserver/dll.h
 b59c8001ee1dcc7cd60f69b0b264117f  gdb/gdbserver/nto-x86-low.c
 1a769c4427c3a751f55e0ae9a90beb2d  gdb/gdbserver/target.h
-d7c488b7ef01decaeedd0823ed447025  gdb/gdbserver/linux-low.h
+4ff4dbefea42399d3afd43b234da75c6  gdb/gdbserver/linux-low.h
 fd2a628fae668ef78fe489121037c9da  gdb/gdbserver/linux-ia64-low.c
 c5b5c964f70a3c5ed89926675e8828ec  gdb/gdbserver/configure.srv
 fa54cc7bc30e4ed712bbcae5af85be40  gdb/gdbserver/linux-arm-low.c
@@ -5197,9 +5201,9 @@ c603ea99a252e4ca4b7152efe119fa4b  gdb/gd
 7f017910fc10864faa3886a248c0de44  gdb/gdbserver/aclocal.m4
 7b4b71a99687eda01b422ee78db96cc9  gdb/gdbserver/thread-db.c
 a713e728e699f380772910b1e8911321  gdb/gdbserver/linux-tile-low.c
-0e8feb1a06b0066e778af963c45c94c9  gdb/gdbserver/ChangeLog
+f5742b01d941607d0b58fc9540f542fa  gdb/gdbserver/ChangeLog
 cd1fc12df5787e83d2d67c203cb3d7b3  gdb/gdbserver/linux-ppc-low.c
-a74ac24ed79185e21c387b686b5acc4f  gdb/gdbserver/linux-low.c
+009b51e1e7bf8662711ce1386dc4bb21  gdb/gdbserver/linux-low.c
 31e072b4e9e5984e19662acc96a07f2e  gdb/gdbserver/proc-service.list
 8bd16fc2c52fd5fdfd5ec457547caefd  gdb/gdbserver/linux-s390-low.c
 29f787a14729e764f56e26257e1bb933  gdb/gdbserver/utils.h
