diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/bfd/version.h ./bfd/version.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/bfd/version.h	2018-01-11 02:04:09.000000000 +0000
+++ ./bfd/version.h	2018-01-12 02:04:24.000000000 +0000
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20180111
+#define BFD_VERSION_DATE 20180112
 #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-8.0.90.20180111/djunpack.bat ./djunpack.bat
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/djunpack.bat	2018-01-11 02:08:08.000000000 +0000
+++ ./djunpack.bat	2018-01-12 02:08:28.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-8.0.90.20180111
-if "%GDBVER%"=="$package-8.0.90.20180111" GoTo EnvOk
+set GDBVER=$package-8.0.90.20180112
+if "%GDBVER%"=="$package-8.0.90.20180112" 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-8.0.90.20180111/gdb/ChangeLog ./gdb/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/ChangeLog	2018-01-11 02:04:10.000000000 +0000
+++ ./gdb/ChangeLog	2018-01-12 02:04:25.000000000 +0000
@@ -1,5 +1,12 @@
 2018-01-11  Pedro Alves  <palves@redhat.com>
 
+	PR gdb/22583
+	* infrun.c (resume): Rename to ...
+	(resume_1): ... this.
+	(resume): Reimplement as wrapper around resume_1.
+
+2018-01-11  Pedro Alves  <palves@redhat.com>
+
 	PR remote/22597
 	* remote.c (remote_parse_stop_reply): Default to the last-set
 	general thread instead of to 'magic_null_ptid'.
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gcore.1 ./gdb/doc/gcore.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gcore.1	2018-01-11 02:08:02.000000000 +0000
+++ ./gdb/doc/gcore.1	2018-01-12 02:08:19.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GCORE 1"
-.TH GCORE 1 "2018-01-11" "gdb-8.0.90.20180111-git" "GNU Development Tools"
+.TH GCORE 1 "2018-01-12" "gdb-8.0.90.20180112-git" "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-8.0.90.20180111/gdb/doc/gdb.1 ./gdb/doc/gdb.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.1	2018-01-11 02:08:02.000000000 +0000
+++ ./gdb/doc/gdb.1	2018-01-12 02:08:19.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB 1"
-.TH GDB 1 "2018-01-11" "gdb-8.0.90.20180111-git" "GNU Development Tools"
+.TH GDB 1 "2018-01-12" "gdb-8.0.90.20180112-git" "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-8.0.90.20180111/gdb/doc/gdb.info ./gdb/doc/gdb.info
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info	2018-01-11 02:07:59.000000000 +0000
+++ ./gdb/doc/gdb.info	2018-01-12 02:08:16.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 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-8.0.90.20180111/gdb/doc/gdb.info-1 ./gdb/doc/gdb.info-1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-1	2018-01-11 02:07:46.000000000 +0000
+++ ./gdb/doc/gdb.info-1	2018-01-12 02:08:03.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 Free Software Foundation, Inc.
 
@@ -44,7 +44,7 @@ Debugging with GDB
 
 This file describes GDB, the GNU symbolic debugger.
 
-   This is the Tenth Edition, for GDB (GDB) Version 8.0.90.20180111-git.
+   This is the Tenth Edition, for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 Free Software Foundation, Inc.
 
@@ -501,7 +501,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 8.0.90.20180111-git, Copyright 1999 Free Software Foundation, Inc...
+     GDB 8.0.90.20180112-git, 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-8.0.90.20180111/gdb/doc/gdb.info-2 ./gdb/doc/gdb.info-2
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-2	2018-01-11 02:07:48.000000000 +0000
+++ ./gdb/doc/gdb.info-2	2018-01-12 02:08:05.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 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-8.0.90.20180111/gdb/doc/gdb.info-3 ./gdb/doc/gdb.info-3
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-3	2018-01-11 02:07:50.000000000 +0000
+++ ./gdb/doc/gdb.info-3	2018-01-12 02:08:07.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 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-8.0.90.20180111/gdb/doc/gdb.info-4 ./gdb/doc/gdb.info-4
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-4	2018-01-11 02:07:53.000000000 +0000
+++ ./gdb/doc/gdb.info-4	2018-01-12 02:08:10.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 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-8.0.90.20180111/gdb/doc/gdb.info-5 ./gdb/doc/gdb.info-5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-5	2018-01-11 02:07:55.000000000 +0000
+++ ./gdb/doc/gdb.info-5	2018-01-12 02:08:12.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 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-8.0.90.20180111/gdb/doc/gdb.info-6 ./gdb/doc/gdb.info-6
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-6	2018-01-11 02:07:57.000000000 +0000
+++ ./gdb/doc/gdb.info-6	2018-01-12 02:08:14.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 Free Software Foundation, Inc.
 
@@ -1500,7 +1500,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-8.0.90.20180111-git/gdb/gdb.info', and it refers to subordinate
+'gdb-8.0.90.20180112-git/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 standalone 'info'
@@ -1510,8 +1510,8 @@ program, available as part of the GNU Te
 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-8.0.90.20180111-git', in the case of version
-8.0.90.20180111-git), you can make the Info file by typing:
+directory ('gdb-8.0.90.20180112-git', in the case of version
+8.0.90.20180112-git), you can make the Info file by typing:
 
      cd gdb
      make gdb.info
@@ -1536,7 +1536,7 @@ On its own, TeX cannot either read or ty
 
    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-8.0.90.20180111-git/gdb')
+main source directory (for example, to 'gdb-8.0.90.20180112-git/gdb')
 and type:
 
      make gdb.dvi
@@ -1545,8 +1545,8 @@ and type:
 
    ---------- Footnotes ----------
 
-   (1) In 'gdb-8.0.90.20180111-git/gdb/refcard.ps' of the version
-8.0.90.20180111-git release.
+   (1) In 'gdb-8.0.90.20180112-git/gdb/refcard.ps' of the version
+8.0.90.20180112-git release.
 
 
 File: gdb.info,  Node: Installing GDB,  Next: Maintenance Commands,  Prev: Formatting Documentation,  Up: Top
@@ -1664,39 +1664,39 @@ preparing GDB for installation; you can 
 a single directory, whose name is usually composed by appending the
 version number to 'gdb'.
 
-   For example, the GDB version 8.0.90.20180111-git distribution is in
-the 'gdb-8.0.90.20180111-git' directory.  That directory contains:
+   For example, the GDB version 8.0.90.20180112-git distribution is in
+the 'gdb-8.0.90.20180112-git' directory.  That directory contains:
 
-'gdb-8.0.90.20180111-git/configure (and supporting files)'
+'gdb-8.0.90.20180112-git/configure (and supporting files)'
      script for configuring GDB and all its supporting libraries
 
-'gdb-8.0.90.20180111-git/gdb'
+'gdb-8.0.90.20180112-git/gdb'
      the source specific to GDB itself
 
-'gdb-8.0.90.20180111-git/bfd'
+'gdb-8.0.90.20180112-git/bfd'
      source for the Binary File Descriptor library
 
-'gdb-8.0.90.20180111-git/include'
+'gdb-8.0.90.20180112-git/include'
      GNU include files
 
-'gdb-8.0.90.20180111-git/libiberty'
+'gdb-8.0.90.20180112-git/libiberty'
      source for the '-liberty' free software library
 
-'gdb-8.0.90.20180111-git/opcodes'
+'gdb-8.0.90.20180112-git/opcodes'
      source for the library of opcode tables and disassemblers
 
-'gdb-8.0.90.20180111-git/readline'
+'gdb-8.0.90.20180112-git/readline'
      source for the GNU command-line interface
 
-'gdb-8.0.90.20180111-git/glob'
+'gdb-8.0.90.20180112-git/glob'
      source for the GNU filename pattern-matching subroutine
 
-'gdb-8.0.90.20180111-git/mmalloc'
+'gdb-8.0.90.20180112-git/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-8.0.90.20180111-git' directory.
+the 'gdb-8.0.90.20180112-git' 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
@@ -1704,7 +1704,7 @@ platform on which GDB will run as an arg
 
    For example:
 
-     cd gdb-8.0.90.20180111-git
+     cd gdb-8.0.90.20180112-git
      ./configure HOST
      make
 
@@ -1726,8 +1726,8 @@ need to run 'sh' on it explicitly:
 
    If you run 'configure' from a directory that contains source
 directories for multiple libraries or programs, such as the
-'gdb-8.0.90.20180111-git' source directory for version
-8.0.90.20180111-git, 'configure' creates configuration files for every
+'gdb-8.0.90.20180112-git' source directory for version
+8.0.90.20180112-git, 'configure' creates configuration files for every
 directory level underneath (unless you tell it not to, with the
 '--norecursion' option).
 
@@ -1767,13 +1767,13 @@ to specify a path to find 'configure' it
 directory.  If the path to 'configure' would be the same as the argument
 to '--srcdir', you can leave out the '--srcdir' option; it is assumed.)
 
-   For example, with version 8.0.90.20180111-git, you can build GDB in a
+   For example, with version 8.0.90.20180112-git, you can build GDB in a
 separate directory for a Sun 4 like this:
 
-     cd gdb-8.0.90.20180111-git
+     cd gdb-8.0.90.20180112-git
      mkdir ../gdb-sun4
      cd ../gdb-sun4
-     ../gdb-8.0.90.20180111-git/configure sun4
+     ../gdb-8.0.90.20180112-git/configure sun4
      make
 
    When 'configure' builds a configuration using a remote source
@@ -1784,7 +1784,7 @@ the example, you'd find the Sun 4 librar
 
    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-8.0.90.20180111-git/gdb/configure', you are configuring only one
+'../gdb-8.0.90.20180112-git/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'.
 
@@ -1800,8 +1800,8 @@ a configured directory--whatever directo
 
    The 'Makefile' that 'configure' generates in each source directory
 also runs recursively.  If you type 'make' in a source directory such as
-'gdb-8.0.90.20180111-git' (or in a separate configured directory
-configured with '--srcdir=DIRNAME/gdb-8.0.90.20180111-git'), you will
+'gdb-8.0.90.20180112-git' (or in a separate configured directory
+configured with '--srcdir=DIRNAME/gdb-8.0.90.20180112-git'), you will
 build all the required libraries, and then build GDB.
 
    When you have multiple hosts or targets configured in separate
@@ -1846,7 +1846,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-8.0.90.20180111-git', for version 8.0.90.20180111-git).
+('gdb-8.0.90.20180112-git', for version 8.0.90.20180112-git).
 
 
 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-8.0.90.20180111/gdb/doc/gdb.info-7 ./gdb/doc/gdb.info-7
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdb.info-7	2018-01-11 02:07:59.000000000 +0000
+++ ./gdb/doc/gdb.info-7	2018-01-12 02:08:16.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    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 8.0.90.20180111-git.
+Source-Level Debugger' for GDB (GDB) Version 8.0.90.20180112-git.
 
    Copyright (C) 1988-2018 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-8.0.90.20180111/gdb/doc/gdbinit.5 ./gdb/doc/gdbinit.5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdbinit.5	2018-01-11 02:08:02.000000000 +0000
+++ ./gdb/doc/gdbinit.5	2018-01-12 02:08:19.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBINIT 5"
-.TH GDBINIT 5 "2018-01-11" "gdb-8.0.90.20180111-git" "GNU Development Tools"
+.TH GDBINIT 5 "2018-01-12" "gdb-8.0.90.20180112-git" "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-8.0.90.20180111/gdb/doc/gdbserver.1 ./gdb/doc/gdbserver.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/doc/gdbserver.1	2018-01-11 02:08:02.000000000 +0000
+++ ./gdb/doc/gdbserver.1	2018-01-12 02:08:19.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBSERVER 1"
-.TH GDBSERVER 1 "2018-01-11" "gdb-8.0.90.20180111-git" "GNU Development Tools"
+.TH GDBSERVER 1 "2018-01-12" "gdb-8.0.90.20180112-git" "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-8.0.90.20180111/gdb/infrun.c ./gdb/infrun.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/infrun.c	2018-01-11 02:04:11.000000000 +0000
+++ ./gdb/infrun.c	2018-01-12 02:04:25.000000000 +0000
@@ -2355,10 +2355,11 @@ do_target_resume (ptid_t resume_ptid, in
 }
 
 /* Resume the inferior.  SIG is the signal to give the inferior
-   (GDB_SIGNAL_0 for none).  */
+   (GDB_SIGNAL_0 for none).  Note: don't call this directly; instead
+   call 'resume', which handles exceptions.  */
 
-void
-resume (enum gdb_signal sig)
+static void
+resume_1 (enum gdb_signal sig)
 {
   struct regcache *regcache = get_current_regcache ();
   struct gdbarch *gdbarch = regcache->arch ();
@@ -2730,6 +2731,32 @@ resume (enum gdb_signal sig)
   do_target_resume (resume_ptid, step, sig);
   tp->resumed = 1;
 }
+
+/* Resume the inferior.  SIG is the signal to give the inferior
+   (GDB_SIGNAL_0 for none).  This is a wrapper around 'resume_1' that
+   rolls back state on error.  */
+
+void
+resume (gdb_signal sig)
+{
+  TRY
+    {
+      resume_1 (sig);
+    }
+  CATCH (ex, RETURN_MASK_ALL)
+    {
+      /* If resuming is being aborted for any reason, delete any
+	 single-step breakpoint resume_1 may have created, to avoid
+	 confusing the following resumption, and to avoid leaving
+	 single-step breakpoints perturbing other threads, in case
+	 we're running in non-stop mode.  */
+      if (inferior_ptid != null_ptid)
+	delete_single_step_breakpoints (inferior_thread ());
+      throw_exception (ex);
+    }
+  END_CATCH
+}
+
 
 /* Proceeding.  */
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/po/gdb.pot ./gdb/po/gdb.pot
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/gdb/po/gdb.pot	2018-01-11 02:07:36.000000000 +0000
+++ ./gdb/po/gdb.pot	2018-01-12 02:07:53.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 02:07+0000\n"
+"POT-Creation-Date: 2018-01-12 02:07+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"
@@ -15356,7 +15356,7 @@ msgstr ""
 msgid "disabling displaced stepping: %s"
 msgstr ""
 
-#: infrun.c:2140 infrun.c:3162 infrun.c:3172 utils.c:519
+#: infrun.c:2140 infrun.c:3189 infrun.c:3199 utils.c:519
 msgid "Command aborted."
 msgstr ""
 
@@ -15370,125 +15370,125 @@ msgstr ""
 msgid "Target '%s' cannot support this command."
 msgstr ""
 
-#: infrun.c:2403
+#: infrun.c:2404
 #, possible-c-format
 msgid "Couldn't deliver signal %s to %s."
 msgstr ""
 
-#: infrun.c:3658
+#: infrun.c:3685
 msgid "Program exited while detaching"
 msgstr ""
 
-#: infrun.c:3968
+#: infrun.c:3995
 msgid "completed.\n"
 msgstr ""
 
-#: infrun.c:4990
+#: infrun.c:5017
 #, possible-c-format
 msgid "unhandled stop_soon: %d"
 msgstr ""
 
-#: infrun.c:5074
+#: infrun.c:5101
 msgid "Cannot fill $_exitsignal with the correct signal number.\n"
 msgstr ""
 
-#: infrun.c:8001
+#: infrun.c:8028
 msgid "Unknown value."
 msgstr ""
 
-#: infrun.c:8055
+#: infrun.c:8082
 msgid ""
 "Cannot remove breakpoints because program is no longer writable.\n"
 "Further execution is probably impossible.\n"
 msgstr ""
 
-#: infrun.c:8212 linux-fork.c:397 linux-fork.c:429
+#: infrun.c:8239 linux-fork.c:397 linux-fork.c:429
 #, possible-c-format
 msgid "[Switching to %s]\n"
 msgstr ""
 
-#: infrun.c:8225
+#: infrun.c:8252
 msgid "No unwaited-for children left.\n"
 msgstr ""
 
-#: infrun.c:8415
+#: infrun.c:8442
 msgid "Signal        Stop\tPrint\tPass to program\tDescription\n"
 msgstr ""
 
-#: infrun.c:8450
+#: infrun.c:8477
 msgid "signal to handle"
 msgstr ""
 
 #. Not a number and not a recognized flag word => complain.
-#: infrun.c:8552
+#: infrun.c:8579
 #, possible-c-format
 msgid "Unrecognized or ambiguous flag word: \"%s\"."
 msgstr ""
 
-#: infrun.c:8567
+#: infrun.c:8594
 #, possible-c-format
 msgid ""
 "%s is used by the debugger.\n"
 "Are you sure you want to change it? "
 msgstr ""
 
-#: infrun.c:8575
+#: infrun.c:8602
 msgid "Not confirmed, unchanged.\n"
 msgstr ""
 
-#: infrun.c:8642
+#: infrun.c:8669
 msgid ""
 "Only signals 1-15 are valid as numeric signals.\n"
 "Use \"info signals\" for a list of symbolic signals."
 msgstr ""
 
-#: infrun.c:8685
+#: infrun.c:8712
 msgid ""
 "\n"
 "Use the \"handle\" command to change these tables.\n"
 msgstr ""
 
-#: infrun.c:8719
+#: infrun.c:8746
 msgid "Unable to read siginfo"
 msgstr ""
 
-#: infrun.c:8742
+#: infrun.c:8769
 msgid "Unable to write siginfo"
 msgstr ""
 
-#: infrun.c:8961 stack.c:1819 stack.c:2035
+#: infrun.c:8988 stack.c:1819 stack.c:2035
 msgid "Unable to restore previously selected frame."
 msgstr ""
 
-#: infrun.c:9084
+#: infrun.c:9111
 msgid "Target does not support this operation."
 msgstr ""
 
-#: infrun.c:9094
+#: infrun.c:9121
 msgid "Forward.\n"
 msgstr ""
 
-#: infrun.c:9097
+#: infrun.c:9124
 msgid "Reverse.\n"
 msgstr ""
 
-#: infrun.c:9101
+#: infrun.c:9128
 #, possible-c-format
 msgid "bogus execution_direction value: %d"
 msgstr ""
 
-#: infrun.c:9110
+#: infrun.c:9137
 #, possible-c-format
 msgid "Resuming the execution of threads of all processes is %s.\n"
 msgstr ""
 
-#: infrun.c:9143
+#: infrun.c:9170
 msgid ""
 "What debugger does when program gets various signals.\n"
 "Specify a signal as argument to print info on that signal only."
 msgstr ""
 
-#: infrun.c:9148
+#: infrun.c:9175
 msgid ""
 "Specify how to handle signals.\n"
 "Usage: handle SIGNAL [ACTIONS]\n"
@@ -15515,46 +15515,46 @@ msgid ""
 "all signals cumulatively specified."
 msgstr ""
 
-#: infrun.c:9176
+#: infrun.c:9203
 msgid ""
 "There is no `stop' command, but you can set a hook on `stop'.\n"
 "This allows you to set a list of commands to be run each time execution\n"
 "of the program stops."
 msgstr ""
 
-#: infrun.c:9181
+#: infrun.c:9208
 msgid "Set inferior debugging."
 msgstr ""
 
-#: infrun.c:9182
+#: infrun.c:9209
 msgid "Show inferior debugging."
 msgstr ""
 
-#: infrun.c:9183
+#: infrun.c:9210
 msgid "When non-zero, inferior specific debugging is enabled."
 msgstr ""
 
-#: infrun.c:9190
+#: infrun.c:9217
 msgid "Set displaced stepping debugging."
 msgstr ""
 
-#: infrun.c:9191
+#: infrun.c:9218
 msgid "Show displaced stepping debugging."
 msgstr ""
 
-#: infrun.c:9192
+#: infrun.c:9219
 msgid "When non-zero, displaced stepping specific debugging is enabled."
 msgstr ""
 
-#: infrun.c:9199
+#: infrun.c:9226
 msgid "Set whether gdb controls the inferior in non-stop mode."
 msgstr ""
 
-#: infrun.c:9200
+#: infrun.c:9227
 msgid "Show whether gdb controls the inferior in non-stop mode."
 msgstr ""
 
-#: infrun.c:9201
+#: infrun.c:9228
 msgid ""
 "When debugging a multi-threaded program and this setting is\n"
 "off (the default, also called all-stop mode), when one thread stops\n"
@@ -15569,30 +15569,30 @@ msgid ""
 "leave it stopped or free to run as needed."
 msgstr ""
 
-#: infrun.c:9285
+#: infrun.c:9312
 msgid "Set stopping for shared library events."
 msgstr ""
 
-#: infrun.c:9286
+#: infrun.c:9313
 msgid "Show stopping for shared library events."
 msgstr ""
 
-#: infrun.c:9287
+#: infrun.c:9314
 msgid ""
 "If nonzero, gdb will give control to the user when the dynamic linker\n"
 "notifies gdb of shared library events.  The most common event of interest\n"
 "to the user would be loading/unloading of a new library."
 msgstr ""
 
-#: infrun.c:9297
+#: infrun.c:9324
 msgid "Set debugger response to a program call of fork or vfork."
 msgstr ""
 
-#: infrun.c:9298
+#: infrun.c:9325
 msgid "Show debugger response to a program call of fork or vfork."
 msgstr ""
 
-#: infrun.c:9299
+#: infrun.c:9326
 msgid ""
 "A fork or vfork creates a new process.  follow-fork-mode can be:\n"
 "  parent  - the original process is debugged after a fork\n"
@@ -15601,15 +15601,15 @@ msgid ""
 "By default, the debugger will follow the parent process."
 msgstr ""
 
-#: infrun.c:9311
+#: infrun.c:9338
 msgid "Set debugger response to a program call of exec."
 msgstr ""
 
-#: infrun.c:9312
+#: infrun.c:9339
 msgid "Show debugger response to a program call of exec."
 msgstr ""
 
-#: infrun.c:9313
+#: infrun.c:9340
 msgid ""
 "An exec call replaces the program image of a process.\n"
 "\n"
@@ -15628,15 +15628,15 @@ msgid ""
 "By default, the debugger will use the same inferior."
 msgstr ""
 
-#: infrun.c:9334
+#: infrun.c:9361
 msgid "Set mode for locking scheduler during execution."
 msgstr ""
 
-#: infrun.c:9335
+#: infrun.c:9362
 msgid "Show mode for locking scheduler during execution."
 msgstr ""
 
-#: infrun.c:9336
+#: infrun.c:9363
 msgid ""
 "off    == no locking (threads may preempt at any time)\n"
 "on     == full locking (no thread except the current thread may run)\n"
@@ -15649,15 +15649,15 @@ msgid ""
 "execution."
 msgstr ""
 
-#: infrun.c:9348
+#: infrun.c:9375
 msgid "Set mode for resuming threads of all processes."
 msgstr ""
 
-#: infrun.c:9349
+#: infrun.c:9376
 msgid "Show mode for resuming threads of all processes."
 msgstr ""
 
-#: infrun.c:9350
+#: infrun.c:9377
 msgid ""
 "When on, execution commands (such as 'continue' or 'next') resume all\n"
 "threads of all processes.  When off (which is the default), execution\n"
@@ -15666,30 +15666,30 @@ msgid ""
 "mode (see help set scheduler-locking)."
 msgstr ""
 
-#: infrun.c:9360
+#: infrun.c:9387
 msgid "Set mode of the step operation."
 msgstr ""
 
-#: infrun.c:9361
+#: infrun.c:9388
 msgid "Show mode of the step operation."
 msgstr ""
 
-#: infrun.c:9362
+#: infrun.c:9389
 msgid ""
 "When set, doing a step over a function without debug line information\n"
 "will stop at the first instruction of that function. Otherwise, the\n"
 "function is skipped and the step command stops at a different source line."
 msgstr ""
 
-#: infrun.c:9371
+#: infrun.c:9398
 msgid "Set debugger's willingness to use displaced stepping."
 msgstr ""
 
-#: infrun.c:9372
+#: infrun.c:9399
 msgid "Show debugger's willingness to use displaced stepping."
 msgstr ""
 
-#: infrun.c:9373
+#: infrun.c:9400
 msgid ""
 "If on, gdb will use displaced stepping to step over breakpoints if it is\n"
 "supported by the target architecture.  If off, gdb will not use displaced\n"
@@ -15701,57 +15701,57 @@ msgid ""
 "use it in all-stop mode (see help set non-stop)."
 msgstr ""
 
-#: infrun.c:9385
+#: infrun.c:9412
 msgid ""
 "Set direction of execution.\n"
 "Options are 'forward' or 'reverse'."
 msgstr ""
 
-#: infrun.c:9387
+#: infrun.c:9414
 msgid "Show direction of execution (forward/reverse)."
 msgstr ""
 
-#: infrun.c:9388
+#: infrun.c:9415
 msgid "Tells gdb whether to execute forward or backward."
 msgstr ""
 
 #. Set/show detach-on-fork: user-settable mode.
-#: infrun.c:9394
+#: infrun.c:9421
 msgid "Set whether gdb will detach the child of a fork."
 msgstr ""
 
-#: infrun.c:9395
+#: infrun.c:9422
 msgid "Show whether gdb will detach the child of a fork."
 msgstr ""
 
-#: infrun.c:9396
+#: infrun.c:9423
 msgid "Tells gdb whether to detach the child of a fork."
 msgstr ""
 
-#: infrun.c:9403
+#: infrun.c:9430
 msgid "Set disabling of debuggee's virtual address space randomization."
 msgstr ""
 
-#: infrun.c:9404
+#: infrun.c:9431
 msgid "Show disabling of debuggee's virtual address space randomization."
 msgstr ""
 
-#: infrun.c:9405
+#: infrun.c:9432
 msgid ""
 "When this mode is on (which is the default), randomization of the virtual\n"
 "address space is disabled.  Standalone programs run with the randomization\n"
 "enabled by default on some platforms."
 msgstr ""
 
-#: infrun.c:9429
+#: infrun.c:9456
 msgid "Set whether gdb controls the inferior in observer mode."
 msgstr ""
 
-#: infrun.c:9430
+#: infrun.c:9457
 msgid "Show whether gdb controls the inferior in observer mode."
 msgstr ""
 
-#: infrun.c:9431
+#: infrun.c:9458
 msgid ""
 "In observer mode, GDB can get data from the inferior, but not\n"
 "affect its execution.  Registers and memory may not be changed,\n"
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/md5.sum ./md5.sum
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.0.90.20180111/md5.sum	2018-01-11 02:08:08.000000000 +0000
+++ ./md5.sum	2018-01-12 02:08:28.000000000 +0000
@@ -40,7 +40,7 @@ bb45f17458fbd361569bfb2067575c7f  bfd/cp
 f15e31835a8d7272e1acd59dc86ebc2a  bfd/wasm-module.c
 2f1d48da02b5ed6e94cb3beb7dae5d9c  bfd/elf64-mips.c
 32c1c2c183f56bd2b5af2fb9c3ca94af  bfd/cpu-m9s12x.c
-379df4478f269780ad52c323272e12d9  bfd/version.h
+a2a0c7751ab4cd8ec8b67361c58da0f1  bfd/version.h
 25cd4c1378787d5bb9fa74b13a55098a  bfd/cpu-tilegx.c
 15946361c2ae68e8133d7e10485f7ed4  bfd/coff-mcore.c
 836b9de6d0ea1914f82c0ec0fa0341ef  bfd/cpu-avr.c
@@ -1269,7 +1269,7 @@ c347954d4517f60d1220db4d30f00f92  gdb/me
 e72f95a062dec89349ea26e6c0a1c9db  gdb/windows-tdep.c
 ec376335a92bd9f2ea53ee7c6e2c0e46  gdb/coff-pe-read.h
 441a31b344150e2346e1c037eb914ceb  gdb/go-lang.c
-37706ec6bc6ecccc5b77f680fdbe1243  gdb/infrun.c
+73eba5b324d2026a52c4a86e4b6f890f  gdb/infrun.c
 7d51b19cde2dffc8abfcf10325efb630  gdb/ppc-fbsd-nat.c
 9f17d928e1ed3e8a6423ba556d65ed00  gdb/jit-reader.in
 947c0df035fbc979325b15491b3a9109  gdb/darwin-nat-info.c
@@ -4995,43 +4995,43 @@ d73a448e50a651ac6171a232b56ba1f1  gdb/te
 29209f0a84f981d84f100e8fc4c3a84b  gdb/f-valprint.c
 b6bbbfc248f90052ce30fda420c5916f  gdb/gdb_curses.h
 8108dd8f906f2654fecc74958cf383db  gdb/doc/psrc.sed
-a98a908eef4a0b5a976a00184f33f342  gdb/doc/gdb.info-3
-54888b79d77607a4b70d626f235d4bc9  gdb/doc/gdb.info-4
+41157232dfb42639585efe28f66fdb61  gdb/doc/gdb.info-3
+63a979a67c0d7856fcdb7e67f7896c7e  gdb/doc/gdb.info-4
 ab0fe311032294b952da80585b8b90e7  gdb/doc/fdl.texi
 667bef4de7567c069421a0aa4b2b42ce  gdb/doc/Makefile.in
-9b00ba6770b92d707d32d199841d3074  gdb/doc/gdb.info-7
+d38ed4559e08292660dc6320ee7913e2  gdb/doc/gdb.info-7
 ce238ebd8ad1da77806acf2ccd2a592e  gdb/doc/observer.texi
-a89c99cad7fb797bace6d9bd113ed844  gdb/doc/gdbserver.1
+8604ee4cc62f01e42535b6f255c4f5c6  gdb/doc/gdbserver.1
 8a3211e1c1b6c1a9ae823c3c469675e8  gdb/doc/guile.texi
 f81a0e00e0cb9e41b078069fb9bedb07  gdb/doc/stack_frame.txt
 319d74c658533df2b0bedcca97af4d94  gdb/doc/stabs.info
-bee5a21a8cf9df032aa2455cf63cdfa9  gdb/doc/gdb.info-5
+b379bd8ed81c0c90cd7768b0e3dc7ce1  gdb/doc/gdb.info-5
 19abe6cc6d5cc545f19b7c7703223589  gdb/doc/agentexpr.texi
 66674dc351ba95941f422dc18cae24bb  gdb/doc/.gitignore
-b611d2b4e13e0ad020740f40d623e05d  gdb/doc/gdb.info-1
+b9cf5d6836e243a7d52318ab6f32156d  gdb/doc/gdb.info-1
 d5d06eaf9b4d44aa442a4a281aa9aea4  gdb/doc/a4rc.sed
-bab76b27da886ff6f006c4e308b5155d  gdb/doc/gdb.info-6
+1dafa1c711e929e5efacb6129005b434  gdb/doc/gdb.info-6
 31cbdd8332ee2f91513670303f5c73d0  gdb/doc/gdb.texinfo
 553b7fe1bf4b5d8b96fdb8cd83503de1  gdb/doc/stack_frame.svg
 04c82b1da7e894a6555868e4f86225af  gdb/doc/filter-for-doxygen
 6eef6173ced7b929f5142c1577f2189a  gdb/doc/Doxyfile-gdb-api.in
 26a572acbe3a2b351c0d3c0a2790b07d  gdb/doc/annotate.info
-ef68da2c0e340975fb1869a230de0ff0  gdb/doc/gdb.info-2
+06a396fd57dabc969545987d90b39c61  gdb/doc/gdb.info-2
 0e44f6ffe6996c2827630e31909c3e1e  gdb/doc/refcard.tex
 6076d300a46651562d4ecd0604442414  gdb/doc/stack_frame.png
-56b9751d8fbe758dc0572898bfff3d76  gdb/doc/gdb.info
+16c40887fa2057c94b5080bd1193f810  gdb/doc/gdb.info
 792ace4c71224d2dab899da2b265c147  gdb/doc/python.texi
 c3feb7ddebdf77fd82e65fc406bc2f23  gdb/doc/stabs.texinfo
 59b9502ecb343b50bcf56cbe20865eb6  gdb/doc/ChangeLog
-4a5d8bf60c64523008cfc18bfd0046f0  gdb/doc/gdb.1
-ab9659e58fb9b0c57a5cc104d909d315  gdb/doc/gcore.1
+b5e5fafbafc2e93ddad47d1153441483  gdb/doc/gdb.1
+fd416aba1857cb239d2f16b373b5af01  gdb/doc/gcore.1
 d39233c86ed6a6dc9e853ae6a11fe03e  gdb/doc/stack_frame.pdf
 2ad37190a4e38a8186d90bc76fc4e551  gdb/doc/Doxyfile-base.in
 3e12b16a85438bdf1fd7355cd397282a  gdb/doc/all-cfg.texi
 bf96494e6e4d346175babd5ef9781882  gdb/doc/gpl.texi
 cd5e3faa9bd1b684a73c7d527cdb4988  gdb/doc/filter-params.pl
 7bfdb0765c5d050d204fbb30aeeba0d8  gdb/doc/stack_frame.eps
-f7e73509e5652009be9076df7c9a2829  gdb/doc/gdbinit.5
+0108bc51b30f51af5422d8b7b7cae160  gdb/doc/gdbinit.5
 78d7bd07699d6e1b53e552cc3a1c16ef  gdb/doc/Doxyfile-gdb-xref.in
 d398b8cec3d96f0f3267dac6b8fe64bb  gdb/doc/annotate.texinfo
 5863a78c1571978dc97dccb25e481134  gdb/doc/doxy-index.in
@@ -5525,7 +5525,7 @@ a9395d09415322faea2304f9a1d7d9e2  gdb/co
 c8ad35fbed9ae9f7955517bb9dfddaf3  gdb/std-regs.c
 94939358229d338905f052768534159b  gdb/go-lang.h
 08acbfe7a6b5373b372b4cbe252da59c  gdb/i386-windows-nat.c
-9c5e18234a342a7f3abdfc76d2fbaf2f  gdb/po/gdb.pot
+98d3493bf8c2c8481590bbf085d8cd15  gdb/po/gdb.pot
 1851bff0653201a488dcae18dde7efad  gdb/po/gdbtext
 e8b91e30ff3b4173fc9a5cfa9eda097f  gdb/break-catch-syscall.c
 de33c119605f9104ceecf43bcf8492ff  gdb/ada-lang.c
@@ -5555,7 +5555,7 @@ ff1c4ed48c7d2f16438d9d0db42e2b6d  gdb/ar
 6caec3f4ac5f65674e15355a60e14ecb  gdb/i386-fbsd-nat.c
 d5dd5836266ef25fc2ac5e704c1c0a09  gdb/mipsread.c
 1b4194bf7b4056dfa96ced19566459ad  gdb/amd64-darwin-tdep.c
-6c56ffa8771e17fad4ec4d14573d83f5  gdb/ChangeLog
+8668221f2b737307458d0d41b8ed7168  gdb/ChangeLog
 59570a0bc164919d36efd6a8d2ef0c89  gdb/go-typeprint.c
 fcd744f8bf7027eeddb24ddf43e290d1  gdb/score-tdep.c
 486e78403fa95b4893d415ec7e70766f  gdb/m88k-bsd-nat.c
