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.20150811/bfd/version.h ./bfd/version.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/bfd/version.h	2015-08-11 01:59:15.000000000 +0000
+++ ./bfd/version.h	2015-08-18 01:59:09.000000000 +0000
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20150811
+#define BFD_VERSION_DATE 20150818
 #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.20150811/djunpack.bat ./djunpack.bat
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/djunpack.bat	2015-08-11 02:02:15.000000000 +0000
+++ ./djunpack.bat	2015-08-18 02:02:07.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.20150811
-if "%GDBVER%"=="$package-7.9.90.20150811" GoTo EnvOk
+set GDBVER=$package-7.9.90.20150818
+if "%GDBVER%"=="$package-7.9.90.20150818" 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.20150811/gdb/amd64-tdep.c ./gdb/amd64-tdep.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/amd64-tdep.c	2015-08-11 01:59:17.000000000 +0000
+++ ./gdb/amd64-tdep.c	2015-08-18 01:59:10.000000000 +0000
@@ -1662,7 +1662,7 @@ amd64_displaced_step_fixup (struct gdbar
 
       regcache_cooked_read_unsigned (regs, AMD64_RSP_REGNUM, &rsp);
       retaddr = read_memory_unsigned_integer (rsp, retaddr_len, byte_order);
-      retaddr = (retaddr - insn_offset) & 0xffffffffUL;
+      retaddr = (retaddr - insn_offset) & 0xffffffffffffffffULL;
       write_memory_unsigned_integer (rsp, retaddr_len, byte_order, retaddr);
 
       if (debug_displaced)
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.20150811/gdb/breakpoint.c ./gdb/breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/breakpoint.c	2015-08-11 01:59:17.000000000 +0000
+++ ./gdb/breakpoint.c	2015-08-18 01:59:10.000000000 +0000
@@ -6921,14 +6921,14 @@ describe_other_breakpoints (struct gdbar
 
 
 /* Return true iff it is meaningful to use the address member of
-   BPT.  For some breakpoint types, the address member is irrelevant
-   and it makes no sense to attempt to compare it to other addresses
-   (or use it for any other purpose either).
+   BPT locations.  For some breakpoint types, the locations' address members
+   are irrelevant and it makes no sense to attempt to compare them to other
+   addresses (or use them for any other purpose either).
 
    More specifically, each of the following breakpoint types will
-   always have a zero valued address and we don't want to mark
+   always have a zero valued location address and we don't want to mark
    breakpoints of any of these types to be a duplicate of an actual
-   breakpoint at address zero:
+   breakpoint location at address zero:
 
       bp_watchpoint
       bp_catchpoint
@@ -8965,6 +8965,13 @@ bp_loc_is_permanent (struct bp_location 
 
   gdb_assert (loc != NULL);
 
+  /* If we have a catchpoint or a watchpoint, just return 0.  We should not
+     attempt to read from the addresses the locations of these breakpoint types
+     point to.  program_breakpoint_here_p, below, will attempt to read
+     memory.  */
+  if (!breakpoint_address_is_meaningful (loc->owner))
+    return 0;
+
   cleanup = save_current_space_and_thread ();
   switch_to_program_space_and_thread (loc->pspace);
 
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.20150811/gdb/ChangeLog ./gdb/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/ChangeLog	2015-08-11 01:59:17.000000000 +0000
+++ ./gdb/ChangeLog	2015-08-18 01:59:10.000000000 +0000
@@ -1,3 +1,14 @@
+2015-08-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* amd64-tdep.c (amd64_displaced_step_fixup): Fix the mask used to
+	compute RETADDR.
+
+2015-08-12  Luis Machado  <lgustavo@codesourcery.com>
+
+	* breakpoint.c (bp_loc_is_permanent): Return 0 when breakpoint
+	location address is not meaningful.
+	(breakpoint_address_is_meaningful): Update comment.
+
 2015-08-10  Doug Evans  <dje@google.com>
 	    Keith Seitz  <keiths@redhat.com>
 
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.20150811/gdb/doc/gcore.1 ./gdb/doc/gcore.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gcore.1	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gcore.1	2015-08-18 02:02:00.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GCORE 1"
-.TH GCORE 1 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
+.TH GCORE 1 "2015-08-18" "gdb-7.9.90.20150818-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.20150811/gdb/doc/gdb.1 ./gdb/doc/gdb.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.1	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.1	2015-08-18 02:01:59.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB 1"
-.TH GDB 1 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
+.TH GDB 1 "2015-08-18" "gdb-7.9.90.20150818-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.20150811/gdb/doc/gdb.info ./gdb/doc/gdb.info
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-1 ./gdb/doc/gdb.info-1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-1	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-1	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811-cvs.
+   This is the Tenth Edition, for GDB (GDB) Version 7.9.90.20150818-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.20150811-cvs, Copyright 1999 Free Software Foundation, Inc...
+     GDB 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-2 ./gdb/doc/gdb.info-2
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-2	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-2	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-3 ./gdb/doc/gdb.info-3
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-3	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-3	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-4 ./gdb/doc/gdb.info-4
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-4	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-4	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-5 ./gdb/doc/gdb.info-5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-5	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-5	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-6 ./gdb/doc/gdb.info-6
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-6	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-6	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811-cvs/gdb/gdb.info', and it refers to subordinate
+`gdb-7.9.90.20150818-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.20150811-cvs', in the case of version
-7.9.90.20150811-cvs), you can make the Info file by typing:
+source directory (`gdb-7.9.90.20150818-cvs', in the case of version
+7.9.90.20150818-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.20150811-cvs/gdb')
+main source directory (for example, to `gdb-7.9.90.20150818-cvs/gdb')
 and type:
 
      make gdb.dvi
@@ -114,8 +114,8 @@ and type:
 
    ---------- Footnotes ----------
 
-   (1) In `gdb-7.9.90.20150811-cvs/gdb/refcard.ps' of the version
-7.9.90.20150811-cvs release.
+   (1) In `gdb-7.9.90.20150818-cvs/gdb/refcard.ps' of the version
+7.9.90.20150818-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.20150811-cvs distribution is in
-the `gdb-7.9.90.20150811-cvs' directory.  That directory contains:
+   For example, the GDB version 7.9.90.20150818-cvs distribution is in
+the `gdb-7.9.90.20150818-cvs' directory.  That directory contains:
 
-`gdb-7.9.90.20150811-cvs/configure (and supporting files)'
+`gdb-7.9.90.20150818-cvs/configure (and supporting files)'
      script for configuring GDB and all its supporting libraries
 
-`gdb-7.9.90.20150811-cvs/gdb'
+`gdb-7.9.90.20150818-cvs/gdb'
      the source specific to GDB itself
 
-`gdb-7.9.90.20150811-cvs/bfd'
+`gdb-7.9.90.20150818-cvs/bfd'
      source for the Binary File Descriptor library
 
-`gdb-7.9.90.20150811-cvs/include'
+`gdb-7.9.90.20150818-cvs/include'
      GNU include files
 
-`gdb-7.9.90.20150811-cvs/libiberty'
+`gdb-7.9.90.20150818-cvs/libiberty'
      source for the `-liberty' free software library
 
-`gdb-7.9.90.20150811-cvs/opcodes'
+`gdb-7.9.90.20150818-cvs/opcodes'
      source for the library of opcode tables and disassemblers
 
-`gdb-7.9.90.20150811-cvs/readline'
+`gdb-7.9.90.20150818-cvs/readline'
      source for the GNU command-line interface
 
-`gdb-7.9.90.20150811-cvs/glob'
+`gdb-7.9.90.20150818-cvs/glob'
      source for the GNU filename pattern-matching subroutine
 
-`gdb-7.9.90.20150811-cvs/mmalloc'
+`gdb-7.9.90.20150818-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.20150811-cvs' directory.
+is the `gdb-7.9.90.20150818-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.20150811-cvs
+     cd gdb-7.9.90.20150818-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.20150811-cvs' source directory for version
-7.9.90.20150811-cvs, `configure' creates configuration files for every
+`gdb-7.9.90.20150818-cvs' source directory for version
+7.9.90.20150818-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.20150811-cvs, you can build GDB in a
+   For example, with version 7.9.90.20150818-cvs, you can build GDB in a
 separate directory for a Sun 4 like this:
 
-     cd gdb-7.9.90.20150811-cvs
+     cd gdb-7.9.90.20150818-cvs
      mkdir ../gdb-sun4
      cd ../gdb-sun4
-     ../gdb-7.9.90.20150811-cvs/configure sun4
+     ../gdb-7.9.90.20150818-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.20150811-cvs/gdb/configure', you are configuring only
+`../gdb-7.9.90.20150818-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.20150811-cvs' (or in a separate configured directory
-configured with `--srcdir=DIRNAME/gdb-7.9.90.20150811-cvs'), you will
+as `gdb-7.9.90.20150818-cvs' (or in a separate configured directory
+configured with `--srcdir=DIRNAME/gdb-7.9.90.20150818-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.20150811-cvs', for version 7.9.90.20150811-cvs).
+(`gdb-7.9.90.20150818-cvs', for version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-7 ./gdb/doc/gdb.info-7
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-7	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-7	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdb.info-8 ./gdb/doc/gdb.info-8
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdb.info-8	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdb.info-8	2015-08-18 02:01:59.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.20150811-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.9.90.20150818-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.20150811/gdb/doc/gdbinit.5 ./gdb/doc/gdbinit.5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdbinit.5	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdbinit.5	2015-08-18 02:02:00.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBINIT 5"
-.TH GDBINIT 5 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
+.TH GDBINIT 5 "2015-08-18" "gdb-7.9.90.20150818-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.20150811/gdb/doc/gdbserver.1 ./gdb/doc/gdbserver.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/doc/gdbserver.1	2015-08-11 02:02:06.000000000 +0000
+++ ./gdb/doc/gdbserver.1	2015-08-18 02:01:59.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBSERVER 1"
-.TH GDBSERVER 1 "2015-08-11" "gdb-7.9.90.20150811-cvs" "GNU Development Tools"
+.TH GDBSERVER 1 "2015-08-18" "gdb-7.9.90.20150818-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.20150811/gdb/po/gdb.pot ./gdb/po/gdb.pot
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/po/gdb.pot	2015-08-11 02:02:05.000000000 +0000
+++ ./gdb/po/gdb.pot	2015-08-18 02:01:58.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 02:02+0000\n"
+"POT-Creation-Date: 2015-08-18 02:01+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:9515
-#: breakpoint.c:11458 breakpoint.c:11602 breakpoint.c:11647 breakpoint.c:15161
+#: ada-lang.c:12882 break-catch-throw.c:478 breakpoint.c:9522
+#: breakpoint.c:11465 breakpoint.c:11609 breakpoint.c:11654 breakpoint.c:15168
 msgid "Junk at end of arguments."
 msgstr ""
 
@@ -3272,7 +3272,7 @@ msgid ""
 "defined for this breakpoint."
 msgstr ""
 
-#: breakpoint.c:1118 breakpoint.c:14361
+#: breakpoint.c:1118 breakpoint.c:14368
 #, possible-c-format
 msgid "No breakpoint number %d."
 msgstr ""
@@ -3520,238 +3520,238 @@ msgstr ""
 msgid "Catchpoint %d (exec)"
 msgstr ""
 
-#: breakpoint.c:8999 printcmd.c:2265
+#: breakpoint.c:9006 printcmd.c:2265
 msgid "Bad format string, missing '\"'."
 msgstr ""
 
-#: breakpoint.c:9006
+#: breakpoint.c:9013
 msgid "No function supplied for dprintf call"
 msgstr ""
 
-#: breakpoint.c:9024
+#: breakpoint.c:9031
 msgid "Target cannot run dprintf commands, falling back to GDB printf"
 msgstr ""
 
-#: breakpoint.c:9030
+#: breakpoint.c:9037
 msgid "Invalid dprintf style."
 msgstr ""
 
-#: breakpoint.c:9090 breakpoint.c:14579
+#: breakpoint.c:9097 breakpoint.c:14586
 msgid "No hardware breakpoint support in the target."
 msgstr ""
 
-#: breakpoint.c:9092 breakpoint.c:10222 breakpoint.c:14581
+#: breakpoint.c:9099 breakpoint.c:10229 breakpoint.c:14588
 msgid "Hardware breakpoints used exceeds limit."
 msgstr ""
 
-#: breakpoint.c:9147 breakpoint.c:9156
+#: breakpoint.c:9154 breakpoint.c:9163
 #, possible-c-format
 msgid "Probed static tracepoint marker \"%s\"\n"
 msgstr ""
 
-#: breakpoint.c:9161
+#: breakpoint.c:9168
 msgid "Couldn't determine the static tracepoint marker to probe"
 msgstr ""
 
-#: breakpoint.c:9181
+#: breakpoint.c:9188
 #, possible-c-format
 msgid "Garbage '%s' follows condition"
 msgstr ""
 
-#: breakpoint.c:9191 breakpoint.c:13361
+#: breakpoint.c:9198 breakpoint.c:13368
 msgid "Format string required"
 msgstr ""
 
-#: breakpoint.c:9194
+#: breakpoint.c:9201
 #, possible-c-format
 msgid "Garbage '%s' at end of command"
 msgstr ""
 
-#: breakpoint.c:9352
+#: breakpoint.c:9359
 msgid "No default breakpoint address now."
 msgstr ""
 
-#: breakpoint.c:9424
+#: breakpoint.c:9431
 #, possible-c-format
 msgid "May not have a fast tracepoint at 0x%s%s"
 msgstr ""
 
-#: breakpoint.c:9436 thread.c:1532
+#: breakpoint.c:9443 thread.c:1532
 #, possible-c-format
 msgid "Unknown thread %d."
 msgstr ""
 
-#: breakpoint.c:9492
+#: breakpoint.c:9499
 msgid "Junk after thread keyword."
 msgstr ""
 
-#: breakpoint.c:9504
+#: breakpoint.c:9511
 msgid "Junk after task keyword."
 msgstr ""
 
-#: breakpoint.c:9506
+#: breakpoint.c:9513
 #, possible-c-format
 msgid "Unknown task %d."
 msgstr ""
 
-#: breakpoint.c:9541
+#: breakpoint.c:9548
 #, possible-c-format
 msgid "No known static tracepoint marker named %s"
 msgstr ""
 
-#: breakpoint.c:9624
+#: breakpoint.c:9631
 #, possible-c-format
 msgid "Make %s pending on future shared library load? "
 msgstr ""
 
-#: breakpoint.c:9711
+#: breakpoint.c:9718
 #, possible-c-format
 msgid "Garbage '%s' at end of location"
 msgstr ""
 
-#: breakpoint.c:9788
+#: breakpoint.c:9795
 msgid ""
 "Multiple breakpoints were set.\n"
 "Use the \"delete\" command to delete unwanted breakpoints."
 msgstr ""
 
-#: breakpoint.c:9851 linespec.c:1997
+#: breakpoint.c:9858 linespec.c:1997
 #, possible-c-format
 msgid "No line %d in file \"%s\"."
 msgstr ""
 
-#: breakpoint.c:9927
+#: breakpoint.c:9934
 msgid ""
 "Specify the type of breakpoint to set.\n"
 "Usage: stop in <function | address>\n"
 "       stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:9960
+#: breakpoint.c:9967
 msgid "Usage: stop in <function | address>\n"
 msgstr ""
 
-#: breakpoint.c:9992
+#: breakpoint.c:9999
 msgid "Usage: stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:10021
+#: breakpoint.c:10028
 msgid "May only run agent-printf on the target"
 msgstr ""
 
-#: breakpoint.c:10149
+#: breakpoint.c:10156
 #, possible-c-format
 msgid "Hardware assisted ranged breakpoint %d from %s to %s."
 msgstr ""
 
-#: breakpoint.c:10190 breakpoint.c:10270
+#: breakpoint.c:10197 breakpoint.c:10277
 msgid "Could not find location of the end of the range."
 msgstr ""
 
-#: breakpoint.c:10215
+#: breakpoint.c:10222
 msgid "This target does not support hardware ranged breakpoints."
 msgstr ""
 
-#: breakpoint.c:10226
+#: breakpoint.c:10233
 msgid "No address range specified."
 msgstr ""
 
-#: breakpoint.c:10236
+#: breakpoint.c:10243
 msgid "Too few arguments."
 msgstr ""
 
-#: breakpoint.c:10238
+#: breakpoint.c:10245
 msgid "Could not find location of the beginning of the range."
 msgstr ""
 
-#: breakpoint.c:10244 breakpoint.c:10275
+#: breakpoint.c:10251 breakpoint.c:10282
 msgid "Cannot create a ranged breakpoint with multiple locations."
 msgstr ""
 
-#: breakpoint.c:10283
+#: breakpoint.c:10290
 msgid "Invalid address range, end precedes start."
 msgstr ""
 
 #. Length overflowed.
-#: breakpoint.c:10288
+#: breakpoint.c:10295
 msgid "Address range too large."
 msgstr ""
 
-#: breakpoint.c:10679 breakpoint.c:10816 breakpoint.c:10872 breakpoint.c:10903
+#: breakpoint.c:10686 breakpoint.c:10823 breakpoint.c:10879 breakpoint.c:10910
 msgid "Invalid hardware watchpoint type."
 msgstr ""
 
-#: breakpoint.c:10710
+#: breakpoint.c:10717
 msgid "Invalid watchpoint type."
 msgstr ""
 
-#: breakpoint.c:10820
+#: breakpoint.c:10827
 msgid ""
 "\n"
 "Check the underlying instruction at PC for the memory\n"
 "address and value which triggered this watchpoint.\n"
 msgstr ""
 
-#: breakpoint.c:10995
+#: breakpoint.c:11002
 msgid "You can specify only one thread."
 msgstr ""
 
-#: breakpoint.c:11003
+#: breakpoint.c:11010
 #, possible-c-format
 msgid "Invalid thread ID specification %s."
 msgstr ""
 
-#: breakpoint.c:11017
+#: breakpoint.c:11024
 msgid "You can specify only one mask."
 msgstr ""
 
-#: breakpoint.c:11061
+#: breakpoint.c:11068
 #, possible-c-format
 msgid "Cannot watch constant value `%.*s'."
 msgstr ""
 
-#: breakpoint.c:11088
+#: breakpoint.c:11095
 msgid "This target does not support masked watchpoints."
 msgstr ""
 
-#: breakpoint.c:11090
+#: breakpoint.c:11097
 msgid "Invalid mask or memory region."
 msgstr ""
 
-#: breakpoint.c:11116
+#: breakpoint.c:11123
 msgid "Junk at end of command."
 msgstr ""
 
-#: breakpoint.c:11452
+#: breakpoint.c:11459
 msgid "Couldn't get information on specified line."
 msgstr ""
 
-#: breakpoint.c:11619
+#: breakpoint.c:11626
 msgid "unsupported or unknown fork kind; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:11696 breakpoint.c:11703
+#: breakpoint.c:11703 breakpoint.c:11710
 msgid "Catch requires an event name."
 msgstr ""
 
-#: breakpoint.c:11762
+#: breakpoint.c:11769
 msgid "No source file specified."
 msgstr ""
 
-#: breakpoint.c:11860
+#: breakpoint.c:11867
 #, possible-c-format
 msgid "No breakpoint at %s."
 msgstr ""
 
-#: breakpoint.c:11862
+#: breakpoint.c:11869
 msgid "No breakpoint at this line."
 msgstr ""
 
-#: breakpoint.c:11885
+#: breakpoint.c:11892
 msgid "Deleted breakpoint "
 msgstr ""
 
-#: breakpoint.c:11887
+#: breakpoint.c:11894
 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:12315
+#: breakpoint.c:12322
 #, possible-c-format
 msgid "warning: Error removing breakpoint %d\n"
 msgstr ""
 
-#: breakpoint.c:12547
+#: breakpoint.c:12554
 #, possible-c-format
 msgid " (%s) pending."
 msgstr ""
 
-#: breakpoint.c:12903
+#: breakpoint.c:12910
 msgid "Temporary breakpoint"
 msgstr ""
 
-#: breakpoint.c:12905
+#: breakpoint.c:12912
 msgid "Breakpoint"
 msgstr ""
 
-#: breakpoint.c:12906 breakpoint.c:13244 breakpoint.c:13248 breakpoint.c:13252
+#: breakpoint.c:12913 breakpoint.c:13251 breakpoint.c:13255 breakpoint.c:13259
 #, possible-c-format
 msgid " %d"
 msgstr ""
 
-#: breakpoint.c:12908
+#: breakpoint.c:12915
 msgid " at gnu-indirect-function resolver"
 msgstr ""
 
-#: breakpoint.c:12911
+#: breakpoint.c:12918
 #, possible-c-format
 msgid "Hardware assisted breakpoint %d"
 msgstr ""
 
-#: breakpoint.c:12914
+#: breakpoint.c:12921
 #, possible-c-format
 msgid "Dprintf %d"
 msgstr ""
 
-#: breakpoint.c:12935
+#: breakpoint.c:12942
 #, 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:13041
+#: breakpoint.c:13048
 msgid "Thread Event Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. By analogy with the thread event, GDB should not stop for these.
-#: breakpoint.c:13046
+#: breakpoint.c:13053
 msgid "Overlay Event Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:13051
+#: breakpoint.c:13058
 msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:13056
+#: breakpoint.c:13063
 msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:13062
+#: breakpoint.c:13069
 msgid "Exception Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
-#: breakpoint.c:13197
+#: breakpoint.c:13204
 msgid "probe not found"
 msgstr ""
 
-#: breakpoint.c:13243
+#: breakpoint.c:13250
 msgid "Tracepoint"
 msgstr ""
 
-#: breakpoint.c:13247
+#: breakpoint.c:13254
 msgid "Fast tracepoint"
 msgstr ""
 
-#: breakpoint.c:13251
+#: breakpoint.c:13258
 msgid "Static tracepoint"
 msgstr ""
 
-#: breakpoint.c:13256 breakpoint.c:13275
+#: breakpoint.c:13263 breakpoint.c:13282
 #, possible-c-format
 msgid "unhandled tracepoint type %d"
 msgstr ""
 
-#: breakpoint.c:13517
+#: breakpoint.c:13524
 #, possible-c-format
 msgid "marker %s not found"
 msgstr ""
 
-#: breakpoint.c:13711
+#: breakpoint.c:13718
 msgid "Delete all breakpoints? "
 msgstr ""
 
-#: breakpoint.c:13817
+#: breakpoint.c:13824
 #, possible-c-format
 msgid "static tracepoint %d changed probed marker from %s to %s"
 msgstr ""
 
-#: breakpoint.c:13852
+#: breakpoint.c:13859
 #, possible-c-format
 msgid "marker for static tracepoint %d (%s) not found at previous line number"
 msgstr ""
 
-#: breakpoint.c:13945
+#: breakpoint.c:13952
 #, possible-c-format
 msgid "Could not reset ranged breakpoint %d: multiple locations found\n"
 msgstr ""
 
-#: breakpoint.c:13985
+#: breakpoint.c:13992
 #, possible-c-format
 msgid "failed to reevaluate condition for breakpoint %d: %s"
 msgstr ""
 
-#: breakpoint.c:14337
+#: breakpoint.c:14344
 #, possible-c-format
 msgid "Ignore count ignored for tracepoint %d."
 msgstr ""
 
-#: breakpoint.c:14346
+#: breakpoint.c:14353
 #, possible-c-format
 msgid "Will stop next time breakpoint %d is reached."
 msgstr ""
 
-#: breakpoint.c:14350
+#: breakpoint.c:14357
 #, possible-c-format
 msgid "Will ignore next crossing of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:14353
+#: breakpoint.c:14360
 #, possible-c-format
 msgid "Will ignore next %d crossings of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:14373
+#: breakpoint.c:14380
 msgid "a breakpoint number"
 msgstr ""
 
-#: breakpoint.c:14377
+#: breakpoint.c:14384
 #, possible-c-format
 msgid "bad breakpoint number: '%s'"
 msgstr ""
 
-#: breakpoint.c:14379
+#: breakpoint.c:14386
 msgid "Second argument (specified ignore-count) is missing."
 msgstr ""
 
-#: breakpoint.c:14402
+#: breakpoint.c:14409
 msgid "one or more breakpoint numbers"
 msgstr ""
 
-#: breakpoint.c:14415
+#: breakpoint.c:14422
 #, possible-c-format
 msgid "bad breakpoint number at or near '%s'"
 msgstr ""
 
-#: breakpoint.c:14427
+#: breakpoint.c:14434
 #, possible-c-format
 msgid "No breakpoint number %d.\n"
 msgstr ""
 
-#: breakpoint.c:14447 breakpoint.c:14456
+#: breakpoint.c:14454 breakpoint.c:14463
 #, possible-c-format
 msgid "Bad breakpoint number '%s'"
 msgstr ""
 
-#: breakpoint.c:14461 breakpoint.c:14468
+#: breakpoint.c:14468 breakpoint.c:14475
 #, possible-c-format
 msgid "Bad breakpoint location number '%s'"
 msgstr ""
 
-#: breakpoint.c:14600
+#: breakpoint.c:14607
 #, possible-c-format
 msgid "Cannot enable watchpoint %d: "
 msgstr ""
 
-#: breakpoint.c:14741
+#: breakpoint.c:14748
 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:14982
+#: breakpoint.c:14989
 #, possible-c-format
 msgid "Uploaded tracepoint %d has no source location, using raw address"
 msgstr ""
 
-#: breakpoint.c:14991
+#: breakpoint.c:14998
 #, possible-c-format
 msgid "Uploaded tracepoint %d condition has no source form, ignoring it"
 msgstr ""
 
-#: breakpoint.c:15039
+#: breakpoint.c:15046
 #, possible-c-format
 msgid "Uploaded tracepoint %d actions have no source form, ignoring them"
 msgstr ""
 
-#: breakpoint.c:15113
+#: breakpoint.c:15120
 msgid "Delete all tracepoints? "
 msgstr ""
 
-#: breakpoint.c:15132
+#: breakpoint.c:15139
 #, possible-c-format
 msgid "Setting tracepoint %d's passcount to %d\n"
 msgstr ""
 
-#: breakpoint.c:15149
+#: breakpoint.c:15156
 msgid "passcount command requires an argument (count + optional TP num)"
 msgstr ""
 
-#: breakpoint.c:15247
+#: breakpoint.c:15254
 #, possible-c-format
 msgid "bad tracepoint number at or near '%s'\n"
 msgstr ""
 
-#: breakpoint.c:15250
+#: breakpoint.c:15257
 msgid "No previous tracepoint\n"
 msgstr ""
 
-#: breakpoint.c:15292
+#: breakpoint.c:15299
 msgid "Argument required (file name in which to save)"
 msgstr ""
 
-#: breakpoint.c:15318
+#: breakpoint.c:15325
 msgid "Nothing to save."
 msgstr ""
 
-#: breakpoint.c:15326
+#: breakpoint.c:15333
 #, possible-c-format
 msgid "Unable to open file '%s' for saving (%s)"
 msgstr ""
 
-#: breakpoint.c:15398
+#: breakpoint.c:15405
 #, possible-c-format
 msgid "Saved to file '%s'.\n"
 msgstr ""
 
-#: breakpoint.c:15491
+#: breakpoint.c:15498
 msgid "\"save\" must be followed by the name of a save subcommand.\n"
 msgstr ""
 
-#: breakpoint.c:15772
+#: breakpoint.c:15779
 msgid ""
 "Set ignore-count of breakpoint number N to COUNT.\n"
 "Usage is `ignore N COUNT'."
 msgstr ""
 
-#: breakpoint.c:15776
+#: breakpoint.c:15783
 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:15785
+#: breakpoint.c:15792
 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:15791
+#: breakpoint.c:15798
 msgid ""
 "Set a temporary breakpoint.\n"
 "Like \"break\" except the breakpoint is only temporary,\n"
@@ -4043,7 +4043,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15800
+#: breakpoint.c:15807
 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:15808
+#: breakpoint.c:15815
 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:15816
+#: breakpoint.c:15823
 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:15826
+#: breakpoint.c:15833
 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:15833 breakpoint.c:15854
+#: breakpoint.c:15840 breakpoint.c:15861
 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:15838 breakpoint.c:15849
+#: breakpoint.c:15845 breakpoint.c:15856
 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:15843 breakpoint.c:15859
+#: breakpoint.c:15850 breakpoint.c:15866
 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:15865
+#: breakpoint.c:15872
 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:15874
+#: breakpoint.c:15881
 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:15882
+#: breakpoint.c:15889
 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:15893
+#: breakpoint.c:15900
 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:15900
+#: breakpoint.c:15907
 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:15913
+#: breakpoint.c:15920
 msgid "Set breakpoint at specified line or function.\n"
 msgstr ""
 
-#: breakpoint.c:15925
+#: breakpoint.c:15932
 msgid "Break in function/address or break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:15929
+#: breakpoint.c:15936
 msgid "Break in function or address."
 msgstr ""
 
-#: breakpoint.c:15931
+#: breakpoint.c:15938
 msgid "Break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:15932
+#: breakpoint.c:15939
 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:15949
+#: breakpoint.c:15956
 msgid ""
 "Status of specified breakpoints (all user-settable breakpoints if no "
 "argument).\n"
@@ -4206,7 +4206,7 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15967
+#: breakpoint.c:15974
 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:15988
+#: breakpoint.c:15995
 msgid "Set catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15993
+#: breakpoint.c:16000
 msgid "Set temporary catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15998
+#: breakpoint.c:16005
 msgid "Catch calls to fork."
 msgstr ""
 
-#: breakpoint.c:16003
+#: breakpoint.c:16010
 msgid "Catch calls to vfork."
 msgstr ""
 
-#: breakpoint.c:16008
+#: breakpoint.c:16015
 msgid "Catch calls to exec."
 msgstr ""
 
-#: breakpoint.c:16013
+#: breakpoint.c:16020
 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:16020
+#: breakpoint.c:16027
 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:16028
+#: breakpoint.c:16035
 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:16037
+#: breakpoint.c:16044
 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:16046
+#: breakpoint.c:16053
 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:16055
+#: breakpoint.c:16062
 msgid "Status of specified watchpoints (all watchpoints if no argument)."
 msgstr ""
 
-#: breakpoint.c:16061
+#: breakpoint.c:16068
 msgid "Set debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:16062
+#: breakpoint.c:16069
 msgid "Show debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:16063
+#: breakpoint.c:16070
 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:16076
+#: breakpoint.c:16083
 msgid ""
 "Set a tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:16088
+#: breakpoint.c:16095
 msgid ""
 "Set a fast tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:16095
+#: breakpoint.c:16102
 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:16121
+#: breakpoint.c:16128
 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:16128
+#: breakpoint.c:16135
 msgid ""
 "Delete specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means delete all tracepoints."
 msgstr ""
 
-#: breakpoint.c:16135
+#: breakpoint.c:16142
 msgid ""
 "Disable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means disable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:16142
+#: breakpoint.c:16149
 msgid ""
 "Enable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means enable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:16149
+#: breakpoint.c:16156
 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:16156
+#: breakpoint.c:16163
 msgid "Save breakpoint definitions as a script."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:16160
+#: breakpoint.c:16167
 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:16168
+#: breakpoint.c:16175
 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:16177 breakpoint.c:16183
+#: breakpoint.c:16184 breakpoint.c:16190
 msgid ""
 "Breakpoint specific settings\n"
 "Configure various breakpoint-specific variables such as\n"
 "pending breakpoint behavior"
 msgstr ""
 
-#: breakpoint.c:16191
+#: breakpoint.c:16198
 msgid "Set debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:16192
+#: breakpoint.c:16199
 msgid "Show debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:16193
+#: breakpoint.c:16200
 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:16206
+#: breakpoint.c:16213
 msgid "Set automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:16207
+#: breakpoint.c:16214
 msgid "Show automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:16208
+#: breakpoint.c:16215
 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:16218
+#: breakpoint.c:16225
 msgid "Set mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:16219
+#: breakpoint.c:16226
 msgid "Show mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:16220
+#: breakpoint.c:16227
 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:16233
+#: breakpoint.c:16240
 msgid "Set mode of breakpoint condition evaluation."
 msgstr ""
 
-#: breakpoint.c:16234
+#: breakpoint.c:16241
 msgid "Show mode of breakpoint condition evaluation."
 msgstr ""
 
-#: breakpoint.c:16235
+#: breakpoint.c:16242
 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:16248
+#: breakpoint.c:16255
 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:16264
+#: breakpoint.c:16271
 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:16273
+#: breakpoint.c:16280
 msgid "Set the style of usage for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:16274
+#: breakpoint.c:16281
 msgid "Show the style of usage for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:16275
+#: breakpoint.c:16282
 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:16287
+#: breakpoint.c:16294
 msgid "Set the function to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16288
+#: breakpoint.c:16295
 msgid "Show the function to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16295
+#: breakpoint.c:16302
 msgid "Set the channel to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16296
+#: breakpoint.c:16303
 msgid "Show the channel to use for dynamic printf"
 msgstr ""
 
-#: breakpoint.c:16302
+#: breakpoint.c:16309
 msgid "Set whether dprintf continues after GDB disconnects."
 msgstr ""
 
-#: breakpoint.c:16303
+#: breakpoint.c:16310
 msgid "Show whether dprintf continues after GDB disconnects."
 msgstr ""
 
-#: breakpoint.c:16304
+#: breakpoint.c:16311
 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:16311
+#: breakpoint.c:16318
 msgid ""
 "agent-printf \"printf format string\", arg1, arg2, arg3, ..., argn\n"
 "(target agent only) This is useful for formatted output in user-defined "
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.20150811/gdb/testsuite/ChangeLog ./gdb/testsuite/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/ChangeLog	2015-08-11 01:59:17.000000000 +0000
+++ ./gdb/testsuite/ChangeLog	2015-08-18 01:59:10.000000000 +0000
@@ -1,3 +1,18 @@
+2015-08-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.base/dso2dso.exp: Improve the testcase's documentation.
+
+2015-08-13  Keith Seitz  <keiths@redhat.com>
+
+	* gdb.base/dso2dso.exp: Pass basename of source file in call to
+	gdb_get_line_number.
+
+2015-08-13  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.base/dso2dso-dso2.c, gdb.base/dso2dso-dso2.h,
+	gdb.base/dso2dso-dso1.c, gdb.base/dso2dso-dso1.h, gdb.base/dso2dso.c,
+	gdb.base/dso2dso.exp: New files.
+
 2015-08-10  Doug Evans  <dje@google.com>
 	    Keith Seitz  <keiths@redhat.com>
 
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.20150811/gdb/testsuite/gdb.base/dso2dso.c ./gdb/testsuite/gdb.base/dso2dso.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/gdb.base/dso2dso.c	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.base/dso2dso.c	2015-08-18 01:59:11.000000000 +0000
@@ -0,0 +1,25 @@
+/* Copyright 2015 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "dso2dso-dso1.h"
+
+int
+main (void)
+{
+  int ignored = sub1 ();
+  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.20150811/gdb/testsuite/gdb.base/dso2dso-dso1.c ./gdb/testsuite/gdb.base/dso2dso-dso1.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/gdb.base/dso2dso-dso1.c	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.base/dso2dso-dso1.c	2015-08-18 01:59:11.000000000 +0000
@@ -0,0 +1,26 @@
+/* Copyright 2015 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "dso2dso-dso1.h"
+#include "dso2dso-dso2.h"
+
+int
+sub1 (void)
+{
+  sub2 ();  /* STOP HERE.  */
+  return 5;
+}
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.20150811/gdb/testsuite/gdb.base/dso2dso-dso1.h ./gdb/testsuite/gdb.base/dso2dso-dso1.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/gdb.base/dso2dso-dso1.h	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.base/dso2dso-dso1.h	2015-08-18 01:59:11.000000000 +0000
@@ -0,0 +1,23 @@
+/* Copyright 2015 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef DSO2DSO_DSO1_H
+#define DSO2DSO_DSO1_H
+
+extern int sub1 (void);
+
+#endif
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.20150811/gdb/testsuite/gdb.base/dso2dso-dso2.c ./gdb/testsuite/gdb.base/dso2dso-dso2.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/gdb.base/dso2dso-dso2.c	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.base/dso2dso-dso2.c	2015-08-18 01:59:11.000000000 +0000
@@ -0,0 +1,24 @@
+/* Copyright 2015 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "dso2dso-dso2.h"
+
+void
+sub2 (void)
+{
+  /* Do nothing.  */
+}
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.20150811/gdb/testsuite/gdb.base/dso2dso-dso2.h ./gdb/testsuite/gdb.base/dso2dso-dso2.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/gdb.base/dso2dso-dso2.h	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.base/dso2dso-dso2.h	2015-08-18 01:59:11.000000000 +0000
@@ -0,0 +1,23 @@
+/* Copyright 2015 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef DSO2DSO_DSO2_H
+#define DSO2DSO_DSO2_H
+
+extern void sub2 (void);
+
+#endif
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.20150811/gdb/testsuite/gdb.base/dso2dso.exp ./gdb/testsuite/gdb.base/dso2dso.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/gdb/testsuite/gdb.base/dso2dso.exp	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/gdb.base/dso2dso.exp	2015-08-18 01:59:11.000000000 +0000
@@ -0,0 +1,74 @@
+# 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/>.
+
+# The purpose of this testcase is to verify that we can "next" over
+# a call to a function provided by one shared library made from another
+# shared library, and that GDB stops at the expected location. In this
+# case, the call is made from sub1 (provided by libdso1) and we are
+# calling sub2 (provided by libdso2).
+#
+# Note that, while this is not the main purpose of this testcase, it
+# also happens to exercise an issue with displaced stepping on amd64
+# when libdso1 is mapped at an address greater than 0xffffffff.
+
+if { [skip_shlib_tests] } {
+    return 0
+}
+
+standard_testfile
+
+set output_dir [standard_output_file {}]
+
+set libdso2 $testfile-dso2
+set srcfile_libdso2 $srcdir/$subdir/$libdso2.c
+set binfile_libdso2 [standard_output_file $libdso2.so]
+
+set libdso1 $testfile-dso1
+set srcfile_libdso1 $srcdir/$subdir/$libdso1.c
+set binfile_libdso1 [standard_output_file $libdso1.so]
+
+if { [gdb_compile_shlib $srcfile_libdso2 $binfile_libdso2 \
+	[list debug additional_flags=-fPIC]] != "" } {
+  untested "Could not compile $binfile_libdso2."
+  return -1
+}
+
+if { [gdb_compile_shlib $srcfile_libdso1 $binfile_libdso1 \
+	[list debug additional_flags=-fPIC]] != "" } {
+  untested "Could not compile $binfile_libdso1."
+  return -1
+}
+
+if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable \
+	[list debug shlib=$binfile_libdso2 shlib=$binfile_libdso1]] != "" } {
+  return -1
+}
+
+clean_restart $binfile
+gdb_load_shlibs $binfile_libdso2 $binfile_libdso1
+
+if { ![runto_main] } {
+  return -1
+}
+
+set bp_location [gdb_get_line_number "STOP HERE" [file tail $srcfile_libdso1]]
+gdb_breakpoint ${srcfile_libdso1}:${bp_location}
+
+gdb_continue_to_breakpoint "at call to sub2" \
+    ".*sub2 ().*"
+
+gdb_test "next" \
+    ".*return 5;.*" \
+    "next over call to sub2"
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.20150811/md5.sum ./md5.sum
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.9.90.20150811/md5.sum	2015-08-11 02:02:15.000000000 +0000
+++ ./md5.sum	2015-08-18 02:02:07.000000000 +0000
@@ -38,7 +38,7 @@ f74f5720bf485dc971d7b4151b97318b  bfd/pe
 d714ee957aefa81619f03058d91b23cb  bfd/elfcore.h
 64f6bec36e44883df8ceae0157bb7a4e  bfd/elf64-mips.c
 57287cb3abe2dc7f66af4ab28aafebe9  bfd/cpu-m9s12x.c
-028ede5f0ce847f3c2c032ee136e9d61  bfd/version.h
+9da43c751bf3319c19b6e1af8c438dd3  bfd/version.h
 a107ac2f34a58b7629fbff59490f61f1  bfd/cpu-tilegx.c
 ceebc66a221f8f9297b660d643de9009  bfd/coff-mcore.c
 b33e0ba78cdd46c771e365ab8b48bfc1  bfd/cpu-avr.c
@@ -1177,7 +1177,7 @@ c67ab85253adf65a7d1090f7ea5af4dc  gdb/tr
 7e27645f119cb27c84aa755eda0b1689  gdb/cris-tdep.h
 69058c5046c9ad86965f26f779596dbd  gdb/target-delegates.c
 97197c0586c07b01485129ceb7e83a18  gdb/solib-frv.c
-1c60f37b863fc77d6827a68a9628da89  gdb/amd64-tdep.c
+810a1066802ed1b477d80e985811ae68  gdb/amd64-tdep.c
 7de9b8683c6369c5e155b9367e362014  gdb/nbsd-tdep.h
 cb029bf8ddbfd4dcce86204ba7a7948c  gdb/p-lang.c
 34f1da98b3a3900016d2dbf17ba05bec  gdb/aix-thread.c
@@ -2157,6 +2157,7 @@ fc6eeea0d4afe0e633c5e73c4f2ab9c6  gdb/te
 854f10afe4bd9f8244ceb4d4d86802fa  gdb/testsuite/gdb.base/sigall.c
 2cf6e7fcd78f9934f7c0402956953293  gdb/testsuite/gdb.base/so-indr-cl.c
 839197e61adc9ee9e7f7ac00555ed0e7  gdb/testsuite/gdb.base/condbreak.exp
+2aca83fd41e32484e28a05fbc54abaf2  gdb/testsuite/gdb.base/dso2dso-dso1.h
 d1b08b08f05f52fc135772b811f83319  gdb/testsuite/gdb.base/print-file-var.exp
 4dab83e639422e2efeccf16b8129c7f6  gdb/testsuite/gdb.base/testenv.exp
 3b3e3a9d75e0397ca908dba7828933ad  gdb/testsuite/gdb.base/break-probes-solib.c
@@ -2237,6 +2238,7 @@ f7aec7811932b17ea2e12b59c13e377e  gdb/te
 5e8b4040d958d51ffdd34c171bb3bc3b  gdb/testsuite/gdb.base/maint.exp
 beb7ddd8ac440e541b4ff7458987281f  gdb/testsuite/gdb.base/ovlymgr.h
 895e7c8264248369271e2a04fb4f7ee3  gdb/testsuite/gdb.base/symtab-search-order.c
+aec193e20b7eca13772c0754c898382d  gdb/testsuite/gdb.base/dso2dso.c
 eac82675666c7dd6c0a0bfda0ce1e509  gdb/testsuite/gdb.base/watchpoint-hw.exp
 ba670b72741d901419e15fa374cb813c  gdb/testsuite/gdb.base/setshow.c
 46b4c46217f2fcdabd1bba7e9afaf4bd  gdb/testsuite/gdb.base/ptype1.c
@@ -2306,6 +2308,7 @@ b4816e4b91e99aa3e905b5d44802e907  gdb/te
 93e084ab4c5f0d8e8f208ea6cb98cd56  gdb/testsuite/gdb.base/async.c
 b1b6d59c825a703bf431946954b45a3f  gdb/testsuite/gdb.base/break-idempotent.c
 ea394c7cd5e44a2173cc655a0076f0cf  gdb/testsuite/gdb.base/pc-fp.exp
+93018cd8d6091977fbb20829baa65b8d  gdb/testsuite/gdb.base/dso2dso-dso1.c
 a63fb26e7ca88a659c5e293c139e0415  gdb/testsuite/gdb.base/gdb1250.c
 f15dd4ea4c1c61db9acd9972bd70743e  gdb/testsuite/gdb.base/long_long.c
 1edab6cef79ccec9936fc9bf68f2301b  gdb/testsuite/gdb.base/prelink-lib.c
@@ -2333,6 +2336,7 @@ ee2a21616652161aebc7de7aab0eb47d  gdb/te
 e3f7f7fe2d3ddf880af22969d90b2752  gdb/testsuite/gdb.base/readline-ask.c
 055c12319ac1ccfac585442416a59b8c  gdb/testsuite/gdb.base/sect-cmd.exp
 efe34151d3657d4cd08d1345ab9ac03b  gdb/testsuite/gdb.base/find-unmapped.exp
+17d48b7f33c30a5451aa76ab936821b9  gdb/testsuite/gdb.base/dso2dso-dso2.c
 450a1da41a5c13ed23211a6f1b9a30bd  gdb/testsuite/gdb.base/list0.c
 51c2c9df9c0473d2ac1b824ebe013bd2  gdb/testsuite/gdb.base/catch-syscall.c
 211a8ff14509652a16cb81b0756e662b  gdb/testsuite/gdb.base/pending.c
@@ -2729,6 +2733,7 @@ d725a9bdd744f2f2a8ab5fafa97d4c3f  gdb/te
 0a3fe3f426599b517c45d4b52283a8e6  gdb/testsuite/gdb.base/siginfo-infcall.c
 5d607cc869d16e310f9792d8d5fb6de2  gdb/testsuite/gdb.base/anon.exp
 05261244f58f03b64d792b8159307bf0  gdb/testsuite/gdb.base/gnu_vector.c
+358781fedad4edcab00db77cb7b3a778  gdb/testsuite/gdb.base/dso2dso.exp
 debd599dc6645644a988689746654788  gdb/testsuite/gdb.base/nostdlib.exp
 defdbb900459283c00e5f6bd876a9605  gdb/testsuite/gdb.base/detach.exp
 362c166ca097de527884870a798faa95  gdb/testsuite/gdb.base/return.c
@@ -2805,6 +2810,7 @@ d402ea8c08866d797062e2a0006333d8  gdb/te
 eaa491a2d4ec7549b0ad30f2e87732de  gdb/testsuite/gdb.base/call-ar-st.exp
 76a20281b4fecc1e8f5d31ed2db11925  gdb/testsuite/gdb.base/foll-fork.exp
 93e964932ca3df9d696fb8d6ba8aba43  gdb/testsuite/gdb.base/siginfo-addr.c
+64ed2fb9d2c0e9abdc89dc0f3f03f98a  gdb/testsuite/gdb.base/dso2dso-dso2.h
 a3c4226af127a3556618bf258c5e76d7  gdb/testsuite/gdb.base/info-shared-solib2.c
 5b24729e9f0f14e700bf7313207d73a4  gdb/testsuite/gdb.base/async-shell.exp
 e2965f78646f3444f315ea67717c4117  gdb/testsuite/gdb.base/ctxobj-f.c
@@ -3778,7 +3784,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
-2718201d80109c1e0804e2e0594ffde8  gdb/testsuite/ChangeLog
+9eb9e4f501d685c3d83da2ab2d7cc73d  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
@@ -4391,43 +4397,43 @@ dc3fd52f6c7a3934f21054cf80ecd074  gdb/f-
 19a5a53a8dbef5372bd3113c323a2bf2  gdb/gdb_curses.h
 1bbdb3e7ea9ca53f9a8cf1a548dca9f5  gdb/jv-valprint.c
 8108dd8f906f2654fecc74958cf383db  gdb/doc/psrc.sed
-59ff17a5ac4a7e462e3646af0d3d6f2a  gdb/doc/gdb.info-3
-182b2d4a3f9aaed5d94050999f7a55a6  gdb/doc/gdb.info-4
+137e383c3b055d0ffbd403c706656a5b  gdb/doc/gdb.info-3
+6935ca2ec4e8589d56a5a73af0681fe2  gdb/doc/gdb.info-4
 ab0fe311032294b952da80585b8b90e7  gdb/doc/fdl.texi
 b28439f57122aec81b0ba8ee0479893d  gdb/doc/Makefile.in
-98b19958c7bea65745502699926d7288  gdb/doc/gdb.info-7
+5160147efad45c65ea373aeeb2e3ca21  gdb/doc/gdb.info-7
 65ee16c0a68d8954d5892092576beb66  gdb/doc/observer.texi
-78f73cc4cab5701109e9914da54c5e8a  gdb/doc/gdbserver.1
+e721a0e0b4f6ba4a7370f2f092902d92  gdb/doc/gdbserver.1
 e2d60785de02ac5252c6d40e24f4a7e4  gdb/doc/guile.texi
 f81a0e00e0cb9e41b078069fb9bedb07  gdb/doc/stack_frame.txt
 a63345597c2ea67a59b96a1159d50da7  gdb/doc/stabs.info
-5558ba9a1ae98383c077700cc5d1b877  gdb/doc/gdb.info-5
-434f3f5ddacae9016f70674f8b517cb9  gdb/doc/gdb.info-8
+219e674d2628db873e43b8a442628d64  gdb/doc/gdb.info-5
+a5d49ccaf49a08ddafb11c8fdb65fc3e  gdb/doc/gdb.info-8
 132df0593e237d8337cf0134804ca21e  gdb/doc/agentexpr.texi
-da52be00dfa1bc6f81d2b8c20ad88e41  gdb/doc/gdb.info-1
+2b7cc9a6c425555bff16d1ec084454cc  gdb/doc/gdb.info-1
 d5d06eaf9b4d44aa442a4a281aa9aea4  gdb/doc/a4rc.sed
-0ea83472b31f40c2796d2c8f8dbbcb4f  gdb/doc/gdb.info-6
+65c55fe309c7c8c1ffdc4582afcb4f36  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
-2065f2bf4b346ca9488acc27022b477e  gdb/doc/gdb.info-2
+dd3387ff70b00ba883e958f9cd6f73ee  gdb/doc/gdb.info-2
 df443225fa3e5719ca7e6925a7e633e0  gdb/doc/refcard.tex
 6076d300a46651562d4ecd0604442414  gdb/doc/stack_frame.png
-d59bb96927288076330ff3c4ef5a1969  gdb/doc/gdb.info
+c122f393a4583a8f379ae0c1ad4c6c11  gdb/doc/gdb.info
 51fe9bc8ae61f4c3f8d31c2a67998119  gdb/doc/python.texi
 0c6f6a14ac05e4293883f89b750804e3  gdb/doc/stabs.texinfo
 4b898436ab7b3497b414592e8c62e44e  gdb/doc/ChangeLog
-71bb0dfd75a3b0719fdfa4a958e352a7  gdb/doc/gdb.1
-6e40c67b66e57d32e2bc0cdcf246ccbe  gdb/doc/gcore.1
+49d3fcc91946c3196389d2e7c8f1b092  gdb/doc/gdb.1
+997c6e987888b280fe7464e2250a452a  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
-6fc72a521dbeb68f2dba72b4708f4a90  gdb/doc/gdbinit.5
+74424de2e23af7adf98d75a87b341acf  gdb/doc/gdbinit.5
 d606e873666ae0bc7bc7c84d6c9c2332  gdb/doc/Doxyfile-gdb-xref.in
 705bf0b3fb65b3f7e3db4cc5d9ae8eba  gdb/doc/annotate.texinfo
 79278fc2f5486809779a9a8f8883d401  gdb/doc/doxy-index.in
@@ -4814,7 +4820,7 @@ d99d990f736410d8846bf12606d92960  gdb/fe
 27017411a6f4e30bac937af3fe144dd3  gdb/solib-target.c
 a139eb01a2fe8bf3bf89308c6285f548  gdb/tilegx-tdep.c
 39ea2c70489bb412e91c1139c460c77e  gdb/c-lang.h
-081b9d4b0d6b2bb8f5899d4deeaadbce  gdb/breakpoint.c
+8ed3aa37fc0d7ca92e7ce830fd132ac2  gdb/breakpoint.c
 10c784bc31fe315e0fe28aafe664efc9  gdb/block.h
 a7d03261f30658bd7b02502575ed5fff  gdb/ax-gdb.c
 c529eab219d300d1f0e39c157d86ac1b  gdb/prologue-value.h
@@ -4896,7 +4902,7 @@ ac8cd5adb103f97f943cc1eec57e566b  gdb/co
 f1679b5d9950d66febb8259748700963  gdb/std-regs.c
 9da9e540b1c6970695a3161272737803  gdb/go-lang.h
 23e51b25e50614cfba06a52e405e2243  gdb/i386-windows-nat.c
-fe0e652e40e0b55bfe90b7d97940101a  gdb/po/gdb.pot
+7f9a8fe0250c022c626cc4fda64f9ceb  gdb/po/gdb.pot
 1851bff0653201a488dcae18dde7efad  gdb/po/gdbtext
 59a3face91a650ce0dcaa925ae89cb59  gdb/break-catch-syscall.c
 3688a736a34cf031d224e1e35d69b662  gdb/ada-lang.c
@@ -4923,7 +4929,7 @@ e6dc6366c95d38a7ac9ebb6ff31462df  gdb/ex
 32bb803ab1e68860f1402dbe7e2cb0f5  gdb/nbsd-nat.h
 83df4734061e07b644f77632819578cf  gdb/mipsread.c
 f5c872d4805a7ac039b4dfc840f4bb8a  gdb/amd64-darwin-tdep.c
-634de9ecd900b7658b4dfdbe4c6f6e87  gdb/ChangeLog
+7548f99c483e54734df57c285f50fbfc  gdb/ChangeLog
 5a1dbe4837b41ee2b9cc7a35e0d20a61  gdb/go-typeprint.c
 3275c016926223eb629c4f65b64822df  gdb/score-tdep.c
 5a44fd4377f0804008a3697e72efbfe3  gdb/xml-support.h
