diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/bfd/doc/bfdver.texi ./bfd/doc/bfdver.texi
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/bfd/doc/bfdver.texi	2015-01-27 02:06:58.000000000 +0000
+++ ./bfd/doc/bfdver.texi	2015-02-03 01:59:55.000000000 +0000
@@ -1,4 +1,4 @@
 @set VERSION 2.25.51
 @set VERSION_PACKAGE (GNU Binutils) 
-@set UPDATED January 2015
+@set UPDATED February 2015
 @set BUGURL @uref{http://www.sourceware.org/bugzilla/}
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/bfd/version.h ./bfd/version.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/bfd/version.h	2015-01-27 02:05:11.000000000 +0000
+++ ./bfd/version.h	2015-02-03 01:58:30.000000000 +0000
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20150127
+#define BFD_VERSION_DATE 20150203
 #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.8.90.20150127/djunpack.bat ./djunpack.bat
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/djunpack.bat	2015-01-27 02:09:36.000000000 +0000
+++ ./djunpack.bat	2015-02-03 02:01:20.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.8.90.20150127
-if "%GDBVER%"=="$package-7.8.90.20150127" GoTo EnvOk
+set GDBVER=$package-7.8.90.20150203
+if "%GDBVER%"=="$package-7.8.90.20150203" 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.8.90.20150127/gdb/ada-lang.c ./gdb/ada-lang.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/ada-lang.c	2015-01-27 02:05:12.000000000 +0000
+++ ./gdb/ada-lang.c	2015-02-03 01:58:32.000000000 +0000
@@ -4393,15 +4393,14 @@ static struct ada_symbol_cache *
 ada_get_symbol_cache (struct program_space *pspace)
 {
   struct ada_pspace_data *pspace_data = get_ada_pspace_data (pspace);
-  struct ada_symbol_cache *sym_cache = pspace_data->sym_cache;
 
-  if (sym_cache == NULL)
+  if (pspace_data->sym_cache == NULL)
     {
-      sym_cache = XCNEW (struct ada_symbol_cache);
-      ada_init_symbol_cache (sym_cache);
+      pspace_data->sym_cache = XCNEW (struct ada_symbol_cache);
+      ada_init_symbol_cache (pspace_data->sym_cache);
     }
 
-  return sym_cache;
+  return pspace_data->sym_cache;
 }
 
 /* Clear all entries from the symbol cache.  */
@@ -5402,14 +5401,12 @@ ada_lookup_symbol_list_worker (const cha
   const struct block *block;
   const char *name;
   const int wild_match_p = should_use_wild_match (name0);
-  int cacheIfUnique;
+  int syms_from_global_search = 0;
   int ndefns;
 
   obstack_free (&symbol_list_obstack, NULL);
   obstack_init (&symbol_list_obstack);
 
-  cacheIfUnique = 0;
-
   /* Search specified block and its superiors.  */
 
   name = name0;
@@ -5453,7 +5450,6 @@ ada_lookup_symbol_list_worker (const cha
      already performed this search before.  If we have, then return
      the same result.  */
 
-  cacheIfUnique = 1;
   if (lookup_cached_symbol (name0, namespace, &sym, &block))
     {
       if (sym != NULL)
@@ -5461,6 +5457,8 @@ ada_lookup_symbol_list_worker (const cha
       goto done;
     }
 
+  syms_from_global_search = 1;
+
   /* Search symbols from all global blocks.  */
  
   add_nonlocal_symbols (&symbol_list_obstack, name, namespace, 1,
@@ -5479,10 +5477,10 @@ done:
 
   ndefns = remove_extra_symbols (*results, ndefns);
 
-  if (ndefns == 0 && full_search)
+  if (ndefns == 0 && full_search && syms_from_global_search)
     cache_symbol (name0, namespace, NULL, NULL);
 
-  if (ndefns == 1 && full_search && cacheIfUnique)
+  if (ndefns == 1 && full_search && syms_from_global_search)
     cache_symbol (name0, namespace, (*results)[0].sym, (*results)[0].block);
 
   ndefns = remove_irrelevant_renamings (*results, ndefns, block0);
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/ChangeLog ./gdb/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/ChangeLog	2015-01-27 02:05:12.000000000 +0000
+++ ./gdb/ChangeLog	2015-02-03 01:58:31.000000000 +0000
@@ -1,3 +1,36 @@
+2015-02-02  Joel Brobecker  <brobecker@adacore.com>
+
+	PR gdb/17856:
+	* ada-lang.c (ada_lookup_symbol_list_worker): Do not re-cache
+	results found in the cache.
+
+2015-02-02  Joel Brobecker  <brobecker@adacore.com>
+
+	PR gdb/17854:
+	* ada-lang.c (ada_get_symbol_cache): Set pspace_data->sym_cache
+	when allocating a new one.
+
+2015-01-31  Joel Brobecker  <brobecker@adacore.com>
+
+	PR symtab/17855
+	* symfile.c (clear_symtab_users): Move call to breakpoint_re_set
+	to end.
+
+2015-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* tui/tui-io.c (tui_expand_tabs): New function.
+	(tui_puts, tui_redisplay_readline): Expand TABs into the
+	appropriate number of spaces.
+	* tui/tui-regs.c: Include tui-io.h.
+	(tui_register_format): Call tui_expand_tabs to expand TABs into
+	the appropriate number of spaces.
+	* tui/tui-io.h: Add prototype for tui_expand_tabs.
+
+2015-01-29  Doug Evans  <dje@google.com>
+
+	PR symtab/17890
+	* dwarf2read.c (dwarf_decode_line_header): Punt if version > 4.
+
 2015-01-26  Wei-cheng Wang  <cole945@gmail.com>
 
 	Backport from mainline:
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gcore.1 ./gdb/doc/gcore.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gcore.1	2015-01-27 02:08:44.000000000 +0000
+++ ./gdb/doc/gcore.1	2015-02-03 02:01:13.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GCORE 1"
-.TH GCORE 1 "2015-01-27" "gdb-7.8.90.20150127-cvs" "GNU Development Tools"
+.TH GCORE 1 "2015-02-03" "gdb-7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.1 ./gdb/doc/gdb.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.1	2015-01-27 02:08:44.000000000 +0000
+++ ./gdb/doc/gdb.1	2015-02-03 02:01:13.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB 1"
-.TH GDB 1 "2015-01-27" "gdb-7.8.90.20150127-cvs" "GNU Development Tools"
+.TH GDB 1 "2015-02-03" "gdb-7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info ./gdb/doc/gdb.info
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-1 ./gdb/doc/gdb.info-1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-1	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-1	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127-cvs.
+   This is the Tenth Edition, for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127-cvs, Copyright 1999 Free Software Foundation, Inc...
+     GDB 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-2 ./gdb/doc/gdb.info-2
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-2	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-2	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-3 ./gdb/doc/gdb.info-3
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-3	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-3	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-4 ./gdb/doc/gdb.info-4
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-4	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-4	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-5 ./gdb/doc/gdb.info-5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-5	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-5	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-cvs.
 
    Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
@@ -8107,7 +8107,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.8.90.20150127-cvs/gdb/gdb.info', and it refers to subordinate
+`gdb-7.8.90.20150203-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
@@ -8118,8 +8118,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.8.90.20150127-cvs', in the case of version
-7.8.90.20150127-cvs), you can make the Info file by typing:
+source directory (`gdb-7.8.90.20150203-cvs', in the case of version
+7.8.90.20150203-cvs), you can make the Info file by typing:
 
      cd gdb
      make gdb.info
@@ -8144,7 +8144,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.8.90.20150127-cvs/gdb')
+main source directory (for example, to `gdb-7.8.90.20150203-cvs/gdb')
 and type:
 
      make gdb.dvi
@@ -8153,8 +8153,8 @@ and type:
 
    ---------- Footnotes ----------
 
-   (1) In `gdb-7.8.90.20150127-cvs/gdb/refcard.ps' of the version
-7.8.90.20150127-cvs release.
+   (1) In `gdb-7.8.90.20150203-cvs/gdb/refcard.ps' of the version
+7.8.90.20150203-cvs release.
 
 
 File: gdb.info,  Node: Installing GDB,  Next: Maintenance Commands,  Prev: Formatting Documentation,  Up: Top
@@ -8263,39 +8263,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.8.90.20150127-cvs distribution is in
-the `gdb-7.8.90.20150127-cvs' directory.  That directory contains:
+   For example, the GDB version 7.8.90.20150203-cvs distribution is in
+the `gdb-7.8.90.20150203-cvs' directory.  That directory contains:
 
-`gdb-7.8.90.20150127-cvs/configure (and supporting files)'
+`gdb-7.8.90.20150203-cvs/configure (and supporting files)'
      script for configuring GDB and all its supporting libraries
 
-`gdb-7.8.90.20150127-cvs/gdb'
+`gdb-7.8.90.20150203-cvs/gdb'
      the source specific to GDB itself
 
-`gdb-7.8.90.20150127-cvs/bfd'
+`gdb-7.8.90.20150203-cvs/bfd'
      source for the Binary File Descriptor library
 
-`gdb-7.8.90.20150127-cvs/include'
+`gdb-7.8.90.20150203-cvs/include'
      GNU include files
 
-`gdb-7.8.90.20150127-cvs/libiberty'
+`gdb-7.8.90.20150203-cvs/libiberty'
      source for the `-liberty' free software library
 
-`gdb-7.8.90.20150127-cvs/opcodes'
+`gdb-7.8.90.20150203-cvs/opcodes'
      source for the library of opcode tables and disassemblers
 
-`gdb-7.8.90.20150127-cvs/readline'
+`gdb-7.8.90.20150203-cvs/readline'
      source for the GNU command-line interface
 
-`gdb-7.8.90.20150127-cvs/glob'
+`gdb-7.8.90.20150203-cvs/glob'
      source for the GNU filename pattern-matching subroutine
 
-`gdb-7.8.90.20150127-cvs/mmalloc'
+`gdb-7.8.90.20150203-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.8.90.20150127-cvs' directory.
+is the `gdb-7.8.90.20150203-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
@@ -8303,7 +8303,7 @@ platform on which GDB will run as an arg
 
    For example:
 
-     cd gdb-7.8.90.20150127-cvs
+     cd gdb-7.8.90.20150203-cvs
      ./configure HOST
      make
 
@@ -8325,8 +8325,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.8.90.20150127-cvs' source directory for version
-7.8.90.20150127-cvs, `configure' creates configuration files for every
+`gdb-7.8.90.20150203-cvs' source directory for version
+7.8.90.20150203-cvs, `configure' creates configuration files for every
 directory level underneath (unless you tell it not to, with the
 `--norecursion' option).
 
@@ -8367,13 +8367,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.8.90.20150127-cvs, you can build GDB in a
+   For example, with version 7.8.90.20150203-cvs, you can build GDB in a
 separate directory for a Sun 4 like this:
 
-     cd gdb-7.8.90.20150127-cvs
+     cd gdb-7.8.90.20150203-cvs
      mkdir ../gdb-sun4
      cd ../gdb-sun4
-     ../gdb-7.8.90.20150127-cvs/configure sun4
+     ../gdb-7.8.90.20150203-cvs/configure sun4
      make
 
    When `configure' builds a configuration using a remote source
@@ -8384,7 +8384,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.8.90.20150127-cvs/gdb/configure', you are configuring only
+`../gdb-7.8.90.20150203-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'.
 
@@ -8400,8 +8400,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.8.90.20150127-cvs' (or in a separate configured directory
-configured with `--srcdir=DIRNAME/gdb-7.8.90.20150127-cvs'), you will
+as `gdb-7.8.90.20150203-cvs' (or in a separate configured directory
+configured with `--srcdir=DIRNAME/gdb-7.8.90.20150203-cvs'), you will
 build all the required libraries, and then build GDB.
 
    When you have multiple hosts or targets configured in separate
@@ -8446,7 +8446,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.8.90.20150127-cvs', for version 7.8.90.20150127-cvs).
+(`gdb-7.8.90.20150203-cvs', for version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-6 ./gdb/doc/gdb.info-6
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-6	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-6	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-7 ./gdb/doc/gdb.info-7
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-7	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-7	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdb.info-8 ./gdb/doc/gdb.info-8
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdb.info-8	2015-01-27 02:08:43.000000000 +0000
+++ ./gdb/doc/gdb.info-8	2015-02-03 02:01:12.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.8.90.20150127-cvs.
+Source-Level Debugger' for GDB (GDB) Version 7.8.90.20150203-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.8.90.20150127/gdb/doc/gdbinit.5 ./gdb/doc/gdbinit.5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdbinit.5	2015-01-27 02:08:44.000000000 +0000
+++ ./gdb/doc/gdbinit.5	2015-02-03 02:01:13.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBINIT 5"
-.TH GDBINIT 5 "2015-01-27" "gdb-7.8.90.20150127-cvs" "GNU Development Tools"
+.TH GDBINIT 5 "2015-02-03" "gdb-7.8.90.20150203-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.8.90.20150127/gdb/doc/gdbserver.1 ./gdb/doc/gdbserver.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/doc/gdbserver.1	2015-01-27 02:08:44.000000000 +0000
+++ ./gdb/doc/gdbserver.1	2015-02-03 02:01:13.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBSERVER 1"
-.TH GDBSERVER 1 "2015-01-27" "gdb-7.8.90.20150127-cvs" "GNU Development Tools"
+.TH GDBSERVER 1 "2015-02-03" "gdb-7.8.90.20150203-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.8.90.20150127/gdb/dwarf2read.c ./gdb/dwarf2read.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/dwarf2read.c	2015-01-27 02:05:12.000000000 +0000
+++ ./gdb/dwarf2read.c	2015-02-03 01:58:32.000000000 +0000
@@ -17117,6 +17117,8 @@ get_debug_line_section (struct dwarf2_cu
 /* Read the statement program header starting at OFFSET in
    .debug_line, or .debug_line.dwo.  Return a pointer
    to a struct line_header, allocated using xmalloc.
+   Returns NULL if there is a problem reading the header, e.g., if it
+   has a version we don't understand.
 
    NOTE: the strings in the include directory and file name tables of
    the returned object point into the dwarf line section buffer,
@@ -17181,6 +17183,14 @@ dwarf_decode_line_header (unsigned int o
   lh->statement_program_end = line_ptr + lh->total_length;
   lh->version = read_2_bytes (abfd, line_ptr);
   line_ptr += 2;
+  if (lh->version > 4)
+    {
+      /* This is a version we don't understand.  The format could have
+	 changed in ways we don't handle properly so just punt.  */
+      complaint (&symfile_complaints,
+		 _("unsupported version in .debug_line section"));
+      return NULL;
+    }
   lh->header_length = read_offset_1 (abfd, line_ptr, offset_size);
   line_ptr += offset_size;
   lh->minimum_instruction_length = read_1_byte (abfd, line_ptr);
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/po/gdb.pot ./gdb/po/gdb.pot
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/po/gdb.pot	2015-01-27 02:08:42.000000000 +0000
+++ ./gdb/po/gdb.pot	2015-02-03 02:01:12.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-27 02:08+0000\n"
+"POT-Creation-Date: 2015-02-03 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"
@@ -300,7 +300,7 @@ msgstr ""
 msgid "packed array index %ld out of bounds"
 msgstr ""
 
-#: ada-lang.c:2631 ada-lang.c:9541 valops.c:1000
+#: ada-lang.c:2631 ada-lang.c:9539 valops.c:1000
 msgid "Left operand of assignment is not a modifiable lvalue."
 msgstr ""
 
@@ -413,265 +413,265 @@ msgstr ""
 
 #. PNH: Do we ever get here?  See ada_search_struct_field,
 #. find_struct_field.
-#: ada-lang.c:7132
+#: ada-lang.c:7130
 msgid "Cannot assign this kind of variant record"
 msgstr ""
 
-#: ada-lang.c:7229 valops.c:2181
+#: ada-lang.c:7227 valops.c:2181
 #, possible-c-format
 msgid "There is no member named %s."
 msgstr ""
 
-#: ada-lang.c:7235
+#: ada-lang.c:7233
 msgid "Attempt to extract a component of a value that is not a record."
 msgstr ""
 
-#: ada-lang.c:7286
+#: ada-lang.c:7284
 msgid "Type (null) is not a structure or union type"
 msgstr ""
 
 #. XXX: type_sprint
-#: ada-lang.c:7290 ada-lang.c:7369 ada-lang.c:7376
+#: ada-lang.c:7288 ada-lang.c:7367 ada-lang.c:7374
 msgid "Type "
 msgstr ""
 
-#: ada-lang.c:7292
+#: ada-lang.c:7290
 msgid " is not a structure or union type"
 msgstr ""
 
-#: ada-lang.c:7371
+#: ada-lang.c:7369
 msgid " has no component named <null>"
 msgstr ""
 
-#: ada-lang.c:7378
+#: ada-lang.c:7376
 #, possible-c-format
 msgid " has no component named %s"
 msgstr ""
 
-#: ada-lang.c:7735
+#: ada-lang.c:7733
 msgid "unexpected null name on descriptive type"
 msgstr ""
 
-#: ada-lang.c:8114
+#: ada-lang.c:8112
 #, possible-c-format
 msgid "Invalid type size for `%s' detected: %d."
 msgstr ""
 
-#: ada-lang.c:8117
+#: ada-lang.c:8115
 #, possible-c-format
 msgid "Invalid type size for <unnamed> detected: %d."
 msgstr ""
 
-#: ada-lang.c:8128
+#: ada-lang.c:8126
 msgid "record type with dynamic size is larger than varsize-limit"
 msgstr ""
 
-#: ada-lang.c:8528
+#: ada-lang.c:8526
 msgid "array type with dynamic size is larger than varsize-limit"
 msgstr ""
 
-#: ada-lang.c:8898
+#: ada-lang.c:8896
 msgid "'POS only defined on discrete types"
 msgstr ""
 
-#: ada-lang.c:8910
+#: ada-lang.c:8908
 msgid "enumeration value is invalid: can't find 'POS"
 msgstr ""
 
-#: ada-lang.c:8928
+#: ada-lang.c:8926
 msgid "'VAL only defined on discrete types"
 msgstr ""
 
-#: ada-lang.c:8930
+#: ada-lang.c:8928
 msgid "'VAL requires integral argument"
 msgstr ""
 
-#: ada-lang.c:8937
+#: ada-lang.c:8935
 msgid "argument to 'VAL out of range"
 msgstr ""
 
-#: ada-lang.c:9259 ada-lang.c:9297
+#: ada-lang.c:9257 ada-lang.c:9295
 msgid "unable to determine array bounds"
 msgstr ""
 
-#: ada-lang.c:9338
+#: ada-lang.c:9336
 msgid "cannot assign arrays of different length"
 msgstr ""
 
-#: ada-lang.c:9352
+#: ada-lang.c:9350
 msgid "Incompatible types in assignment"
 msgstr ""
 
-#: ada-lang.c:9386
+#: ada-lang.c:9384
 #, possible-c-format
 msgid "second operand of %s must not be zero."
 msgstr ""
 
-#: ada-lang.c:9431
+#: ada-lang.c:9429
 msgid "Attempt to compare array with non-array"
 msgstr ""
 
-#: ada-lang.c:9557
+#: ada-lang.c:9555
 msgid "Left-hand side must be array or record."
 msgstr ""
 
-#: ada-lang.c:9582
+#: ada-lang.c:9580
 msgid "Misplaced 'others' clause"
 msgstr ""
 
-#: ada-lang.c:9587
+#: ada-lang.c:9585
 msgid "Internal error: bad aggregate clause"
 msgstr ""
 
-#: ada-lang.c:9609
+#: ada-lang.c:9607
 msgid "Extra components in aggregate ignored."
 msgstr ""
 
-#: ada-lang.c:9676
+#: ada-lang.c:9674
 msgid "Invalid record component association."
 msgstr ""
 
-#: ada-lang.c:9682
+#: ada-lang.c:9680
 #, possible-c-format
 msgid "Unknown component name: %s."
 msgstr ""
 
-#: ada-lang.c:9687
+#: ada-lang.c:9685
 msgid "Index in component association out of bounds."
 msgstr ""
 
-#: ada-lang.c:9763
+#: ada-lang.c:9761
 msgid "Internal error: miscounted aggregate components."
 msgstr ""
 
-#: ada-lang.c:10135
+#: ada-lang.c:10133
 msgid "Fixed-point values must be assigned to fixed-point variables"
 msgstr ""
 
-#: ada-lang.c:10156
+#: ada-lang.c:10154
 msgid "Operands of fixed-point addition must have the same type"
 msgstr ""
 
-#: ada-lang.c:10182
+#: ada-lang.c:10180
 msgid "Operands of fixed-point subtraction must have the same type"
 msgstr ""
 
 #. Only encountered when an unresolved symbol occurs in a
 #. context other than a function call, in which case, it is
 #. invalid.
-#: ada-lang.c:10285 ada-lang.c:10376
+#: ada-lang.c:10283 ada-lang.c:10374
 #, possible-c-format
 msgid "Unexpected unresolved symbol, %s, during evaluation"
 msgstr ""
 
-#: ada-lang.c:10425
+#: ada-lang.c:10423
 #, possible-c-format
 msgid "cannot subscript or call something of type `%s'"
 msgstr ""
 
-#: ada-lang.c:10461
+#: ada-lang.c:10459
 msgid "cannot subscript or call a record"
 msgstr ""
 
-#: ada-lang.c:10463
+#: ada-lang.c:10461
 #, possible-c-format
 msgid "wrong number of subscripts; expecting %d"
 msgstr ""
 
-#: ada-lang.c:10475 ada-lang.c:10489
+#: ada-lang.c:10473 ada-lang.c:10487
 msgid "element type of array unknown"
 msgstr ""
 
-#: ada-lang.c:10498
+#: ada-lang.c:10496
 msgid "Attempt to index or call something other than an array or function"
 msgstr ""
 
-#: ada-lang.c:10528
+#: ada-lang.c:10526
 msgid "cannot slice a packed array"
 msgstr ""
 
-#: ada-lang.c:10556 valops.c:3764
+#: ada-lang.c:10554 valops.c:3764
 msgid "cannot take slice of non-array"
 msgstr ""
 
-#: ada-lang.c:10595
+#: ada-lang.c:10593
 msgid "Membership test incompletely implemented; always returns true"
 msgstr ""
 
-#: ada-lang.c:10684
+#: ada-lang.c:10682
 #, possible-c-format
 msgid "Invalid operand to '%s"
 msgstr ""
 
 #. Should never happen.
-#: ada-lang.c:10714 ada-lang.c:10739 ada-lang.c:10774
+#: ada-lang.c:10712 ada-lang.c:10737 ada-lang.c:10772
 msgid "unexpected attribute encountered"
 msgstr ""
 
-#: ada-lang.c:10747
+#: ada-lang.c:10745
 msgid "the 'length attribute applies only to array types"
 msgstr ""
 
-#: ada-lang.c:10751
+#: ada-lang.c:10749
 msgid "unimplemented type attribute"
 msgstr ""
 
-#: ada-lang.c:10824
+#: ada-lang.c:10822
 msgid "'modulus must be applied to modular type"
 msgstr ""
 
-#: ada-lang.c:10921
+#: ada-lang.c:10919
 msgid "Attempt to dereference null array pointer."
 msgstr ""
 
-#: ada-lang.c:10965 eval.c:2510 eval.c:3011 valops.c:1580
+#: ada-lang.c:10963 eval.c:2510 eval.c:3011 valops.c:1580
 msgid "Attempt to take contents of a non-pointer value."
 msgstr ""
 
-#: ada-lang.c:11042 eval.c:2748
+#: ada-lang.c:11040 eval.c:2748
 msgid "Attempt to use a type name as an expression"
 msgstr ""
 
-#: ada-lang.c:11054
+#: ada-lang.c:11052
 #, possible-c-format
 msgid ""
 "Undefined name, ambiguous name, or renaming used in component association: %"
 "s."
 msgstr ""
 
-#: ada-lang.c:11057
+#: ada-lang.c:11055
 msgid "Aggregates only allowed on the right of an assignment"
 msgstr ""
 
-#: ada-lang.c:11060
+#: ada-lang.c:11058
 msgid "aggregate apparently mangled"
 msgstr ""
 
-#: ada-lang.c:11354
+#: ada-lang.c:11352
 msgid "Unknown lower bound, using 1."
 msgstr ""
 
-#: ada-lang.c:11373
+#: ada-lang.c:11371
 #, possible-c-format
 msgid "Unknown upper bound, using %ld."
 msgstr ""
 
-#: ada-lang.c:11554
+#: ada-lang.c:11552
 msgid ""
 "Your Ada runtime appears to be missing some debugging information.\n"
 "Cannot insert Ada exception catchpoint in this configuration."
 msgstr ""
 
-#: ada-lang.c:11564
+#: ada-lang.c:11562
 #, possible-c-format
 msgid "Symbol \"%s\" is not a function (class = %d)"
 msgstr ""
 
-#: ada-lang.c:11606
+#: ada-lang.c:11604
 msgid "Unable to insert catchpoint.  Is this an Ada main program?"
 msgstr ""
 
-#: ada-lang.c:11614
+#: ada-lang.c:11612
 msgid "Unable to insert catchpoint. Try to start the program first."
 msgstr ""
 
@@ -681,115 +681,115 @@ msgstr ""
 #. configurable run time mode, or that a-except as been optimized
 #. out by the linker...  In any case, at this point it is not worth
 #. supporting this feature.
-#: ada-lang.c:11623
+#: ada-lang.c:11621
 msgid "Cannot insert Ada exception catchpoints in this configuration."
 msgstr ""
 
-#: ada-lang.c:11796 ada-lang.c:12164 ada-lang.c:12208 ada-lang.c:12239
+#: ada-lang.c:11794 ada-lang.c:12162 ada-lang.c:12206 ada-lang.c:12237
 msgid "unexpected catchpoint type"
 msgstr ""
 
-#: ada-lang.c:11822
+#: ada-lang.c:11820
 #, possible-c-format
 msgid "failed to get exception name: %s"
 msgstr ""
 
-#: ada-lang.c:11935
+#: ada-lang.c:11933
 #, possible-c-format
 msgid "failed to reevaluate internal exception condition for catchpoint %d: %s"
 msgstr ""
 
-#: ada-lang.c:12034
+#: ada-lang.c:12032
 msgid "Error in testing exception condition:\n"
 msgstr ""
 
-#: ada-lang.c:12145 ada-lang.c:12189
+#: ada-lang.c:12143 ada-lang.c:12187
 #, possible-c-format
 msgid "`%s' Ada exception"
 msgstr ""
 
-#: ada-lang.c:12179 break-catch-throw.c:341
+#: ada-lang.c:12177 break-catch-throw.c:341
 msgid "Temporary catchpoint "
 msgstr ""
 
-#: ada-lang.c:12180 break-catch-throw.c:342
+#: ada-lang.c:12178 break-catch-throw.c:342
 msgid "Catchpoint "
 msgstr ""
 
-#: ada-lang.c:12196
+#: ada-lang.c:12194
 msgid "all Ada exceptions"
 msgstr ""
 
-#: ada-lang.c:12200
+#: ada-lang.c:12198
 msgid "unhandled Ada exceptions"
 msgstr ""
 
-#: ada-lang.c:12204
+#: ada-lang.c:12202
 msgid "failed Ada assertions"
 msgstr ""
 
-#: ada-lang.c:12476
+#: ada-lang.c:12474
 msgid "Condition missing after `if' keyword"
 msgstr ""
 
-#: ada-lang.c:12487 breakpoint.c:1000 breakpoint.c:1014
+#: ada-lang.c:12485 breakpoint.c:1000 breakpoint.c:1014
 msgid "Junk at end of expression"
 msgstr ""
 
-#: ada-lang.c:12535 ada-lang.c:12558
+#: ada-lang.c:12533 ada-lang.c:12556
 #, possible-c-format
 msgid "unexpected catchpoint kind (%d)"
 msgstr ""
 
-#: ada-lang.c:12736
+#: ada-lang.c:12734
 msgid "condition missing after `if' keyword"
 msgstr ""
 
-#: ada-lang.c:12743 break-catch-throw.c:471 breakpoint.c:9905
+#: ada-lang.c:12741 break-catch-throw.c:471 breakpoint.c:9905
 #: breakpoint.c:11846 breakpoint.c:11990 breakpoint.c:12035 breakpoint.c:15699
 msgid "Junk at end of arguments."
 msgstr ""
 
-#: ada-lang.c:13079
+#: ada-lang.c:13077
 msgid "invalid regular expression"
 msgstr ""
 
-#: ada-lang.c:13104
+#: ada-lang.c:13102
 #, possible-c-format
 msgid "All Ada exceptions matching regular expression \"%s\":\n"
 msgstr ""
 
-#: ada-lang.c:13106
+#: ada-lang.c:13104
 msgid "All defined Ada exceptions:\n"
 msgstr ""
 
 #. XXX: gdb_sprint_host_address, type_sprint
-#: ada-lang.c:13288
+#: ada-lang.c:13286
 msgid "Type @"
 msgstr ""
 
-#: ada-lang.c:13688
+#: ada-lang.c:13686
 msgid "\"set ada\" must be followed by the name of a setting.\n"
 msgstr ""
 
-#: ada-lang.c:13766
+#: ada-lang.c:13764
 msgid "Prefix command for changing Ada-specfic settings"
 msgstr ""
 
-#: ada-lang.c:13770
+#: ada-lang.c:13768
 msgid "Generic command for showing Ada-specific settings."
 msgstr ""
 
-#: ada-lang.c:13774
+#: ada-lang.c:13772
 msgid "Enable or disable an optimization trusting PAD types over XVS types"
 msgstr ""
 
-#: ada-lang.c:13775
+#: ada-lang.c:13773
 msgid ""
 "Show whether an optimization trusting PAD types over XVS types is activated"
 msgstr ""
 
-#: ada-lang.c:13777
+#: ada-lang.c:13775
 msgid ""
 "This is related to the encoding used by the GNAT compiler.  The debugger\n"
 "should normally trust the contents of PAD types, but certain older versions\n"
@@ -801,42 +801,42 @@ msgid ""
 "this option to \"off\" unless necessary."
 msgstr ""
 
-#: ada-lang.c:13787
+#: ada-lang.c:13785
 msgid ""
 "Catch Ada exceptions, when raised.\n"
 "With an argument, catch only exceptions with the given name."
 msgstr ""
 
-#: ada-lang.c:13794
+#: ada-lang.c:13792
 msgid ""
 "Catch failed Ada assertions, when raised.\n"
 "With an argument, catch only exceptions with the given name."
 msgstr ""
 
-#: ada-lang.c:13805
+#: ada-lang.c:13803
 msgid ""
 "List all Ada exception names.\n"
 "If a regular expression is passed as an argument, only those matching\n"
 "the regular expression are listed."
 msgstr ""
 
-#: ada-lang.c:13811
+#: ada-lang.c:13809
 msgid "Set Ada maintenance-related variables."
 msgstr ""
 
-#: ada-lang.c:13816
+#: ada-lang.c:13814
 msgid "Show Ada maintenance-related variables"
 msgstr ""
 
-#: ada-lang.c:13823
+#: ada-lang.c:13821
 msgid "Set whether descriptive types generated by GNAT should be ignored."
 msgstr ""
 
-#: ada-lang.c:13824
+#: ada-lang.c:13822
 msgid "Show whether descriptive types generated by GNAT should be ignored."
 msgstr ""
 
-#: ada-lang.c:13825
+#: ada-lang.c:13823
 msgid ""
 "When enabled, the debugger will stop using the DW_AT_GNAT_descriptive_type\n"
 "DWARF attribute."
@@ -9803,32 +9803,36 @@ msgid ""
 "lx [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:17142
+#: dwarf2read.c:17144
 msgid "missing .debug_line.dwo section"
 msgstr ""
 
-#: dwarf2read.c:17144
+#: dwarf2read.c:17146
 msgid "missing .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:17200
+#: dwarf2read.c:17191
+msgid "unsupported version in .debug_line section"
+msgstr ""
+
+#: dwarf2read.c:17210
 msgid "invalid maximum_ops_per_instruction in `.debug_line' section"
 msgstr ""
 
-#: dwarf2read.c:17250
+#: dwarf2read.c:17260
 msgid "line number info header doesn't fit in `.debug_line' section"
 msgstr ""
 
-#: dwarf2read.c:17572
+#: dwarf2read.c:17582
 #, possible-c-format
 msgid ".debug_line address at offset 0x%lx is 0 [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:17618 dwarf2read.c:17627
+#: dwarf2read.c:17628 dwarf2read.c:17637
 msgid "mangled .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:18064
+#: dwarf2read.c:18074
 msgid "file index out of range"
 msgstr ""
 
@@ -9836,364 +9840,364 @@ msgstr ""
 #. trash data, but since we must specifically ignore things
 #. we don't recognize, there is nothing else we should do at
 #. this point.
-#: dwarf2read.c:18358
+#: dwarf2read.c:18368
 #, possible-c-format
 msgid "unsupported tag: '%s'"
 msgstr ""
 
-#: dwarf2read.c:18523 dwarf2read.c:19929
+#: dwarf2read.c:18533 dwarf2read.c:19939
 #, possible-c-format
 msgid "unsupported const value attribute form: '%s'"
 msgstr ""
 
-#: dwarf2read.c:18642
+#: dwarf2read.c:18652
 #, possible-c-format
 msgid ""
 "Dwarf Error: Problem turning containing type into gdb type [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:18656
+#: dwarf2read.c:18666
 #, possible-c-format
 msgid "<unknown type in %s, CU 0x%x, DIE 0x%x>"
 msgstr ""
 
-#: dwarf2read.c:18708
+#: dwarf2read.c:18718
 #, possible-c-format
 msgid "Dwarf Error: Bad type attribute %s in DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:18831
+#: dwarf2read.c:18841
 #, possible-c-format
 msgid "unexpected tag in read_type_die: '%s'"
 msgstr ""
 
-#: dwarf2read.c:19047
+#: dwarf2read.c:19057
 #, possible-c-format
 msgid "template param type '%s' defined within parent '%s'"
 msgstr ""
 
-#: dwarf2read.c:19588
+#: dwarf2read.c:19598
 #, possible-c-format
 msgid "unsupported die ref attribute form: '%s'"
 msgstr ""
 
-#: dwarf2read.c:19610
+#: dwarf2read.c:19620
 #, possible-c-format
 msgid "Attribute value is not a constant (%s)"
 msgstr ""
 
-#: dwarf2read.c:19633
+#: dwarf2read.c:19643
 #, possible-c-format
 msgid "Dwarf Error: Expected reference attribute [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:19707
+#: dwarf2read.c:19717
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find DIE at 0x%x referenced from DIE at 0x%x [in module %"
 "s]"
 msgstr ""
 
-#: dwarf2read.c:19738 dwarf2read.c:19839
+#: dwarf2read.c:19748 dwarf2read.c:19849
 #, possible-c-format
 msgid "Dwarf Error: Cannot find DIE at 0x%x referenced in module %s"
 msgstr ""
 
-#: dwarf2read.c:19765
+#: dwarf2read.c:19775
 #, possible-c-format
 msgid ""
 "Dwarf Error: DIE at 0x%x referenced in module %s is neither DW_FORM_block* "
 "nor DW_FORM_exprloc"
 msgstr ""
 
-#: dwarf2read.c:20021 dwarf2read.c:20058
+#: dwarf2read.c:20031 dwarf2read.c:20068
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find signatured DIE %s referenced from DIE at 0x%x [in "
 "module %s]"
 msgstr ""
 
-#: dwarf2read.c:20031 dwarf2read.c:20090
+#: dwarf2read.c:20041 dwarf2read.c:20100
 #, possible-c-format
 msgid ""
 "Dwarf Error: Problem reading signatured DIE %s referenced from DIE at 0x%x "
 "[in module %s]"
 msgstr ""
 
-#: dwarf2read.c:20080
+#: dwarf2read.c:20090
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot build signatured type %s referenced from DIE at 0x%x [in "
 "module %s]"
 msgstr ""
 
-#: dwarf2read.c:20123
+#: dwarf2read.c:20133
 #, possible-c-format
 msgid ""
 "Dwarf Error: DW_AT_signature has bad form %s in DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:20442
+#: dwarf2read.c:20452
 #, possible-c-format
 msgid "unsupported stack op: '%s'"
 msgstr ""
 
-#: dwarf2read.c:20445
+#: dwarf2read.c:20455
 #, possible-c-format
 msgid "unsupported stack op: '%02x'"
 msgstr ""
 
-#: dwarf2read.c:20457
+#: dwarf2read.c:20467
 msgid "location description stack overflow"
 msgstr ""
 
-#: dwarf2read.c:20464
+#: dwarf2read.c:20474
 msgid "location description stack underflow"
 msgstr ""
 
-#: dwarf2read.c:20529
+#: dwarf2read.c:20539
 #, possible-c-format
 msgid "bad file number in macro information (%d)"
 msgstr ""
 
-#: dwarf2read.c:20605
+#: dwarf2read.c:20615
 #, possible-c-format
 msgid ""
 "macro definition contains spaces in formal argument list:\n"
 "`%s'"
 msgstr ""
 
-#: dwarf2read.c:20829
+#: dwarf2read.c:20839
 #, possible-c-format
 msgid "invalid form 0x%x in `%s'"
 msgstr ""
 
-#: dwarf2read.c:20857
+#: dwarf2read.c:20867
 #, possible-c-format
 msgid "unrecognized DW_MACFINO opcode 0x%x"
 msgstr ""
 
-#: dwarf2read.c:20902
+#: dwarf2read.c:20912
 #, possible-c-format
 msgid "unrecognized version `%d' in .debug_macro section"
 msgstr ""
 
-#: dwarf2read.c:21044
+#: dwarf2read.c:21054
 #, possible-c-format
 msgid "debug info with no main source gives macro %s on line %d: %s"
 msgstr ""
 
-#: dwarf2read.c:21046 dwarf2read.c:21055
+#: dwarf2read.c:21056 dwarf2read.c:21065
 msgid "definition"
 msgstr ""
 
-#: dwarf2read.c:21046 dwarf2read.c:21055
+#: dwarf2read.c:21056 dwarf2read.c:21065
 msgid "undefinition"
 msgstr ""
 
-#: dwarf2read.c:21053
+#: dwarf2read.c:21063
 #, possible-c-format
 msgid "debug info gives %s macro %s with %s line %d: %s"
 msgstr ""
 
-#: dwarf2read.c:21054 dwarf2read.c:21085
+#: dwarf2read.c:21064 dwarf2read.c:21095
 msgid "command-line"
 msgstr ""
 
-#: dwarf2read.c:21054
+#: dwarf2read.c:21064
 msgid "in-file"
 msgstr ""
 
-#: dwarf2read.c:21056 dwarf2read.c:21086
+#: dwarf2read.c:21066 dwarf2read.c:21096
 msgid "zero"
 msgstr ""
 
-#: dwarf2read.c:21056 dwarf2read.c:21086
+#: dwarf2read.c:21066 dwarf2read.c:21096
 msgid "non-zero"
 msgstr ""
 
-#: dwarf2read.c:21083
+#: dwarf2read.c:21093
 #, possible-c-format
 msgid "debug info gives source %d included from %s at %s line %d"
 msgstr ""
 
-#: dwarf2read.c:21085
+#: dwarf2read.c:21095
 msgid "file"
 msgstr ""
 
-#: dwarf2read.c:21102
+#: dwarf2read.c:21112
 msgid "macro debug info has an unmatched `close_file' directive"
 msgstr ""
 
-#: dwarf2read.c:21128
+#: dwarf2read.c:21138
 msgid "no terminating 0-type entry for macros in `.debug_macinfo' section"
 msgstr ""
 
-#: dwarf2read.c:21171
+#: dwarf2read.c:21181
 msgid "recursive DW_MACRO_GNU_transparent_include in .debug_macro section"
 msgstr ""
 
-#: dwarf2read.c:21263
+#: dwarf2read.c:21273
 #, possible-c-format
 msgid "missing %s section"
 msgstr ""
 
-#: dwarf2read.c:21543
+#: dwarf2read.c:21553
 msgid "Location list used without specifying the CU base address."
 msgstr ""
 
-#: dwarf2read.c:21711
+#: dwarf2read.c:21721
 #, possible-c-format
 msgid ""
 "Dwarf Error: could not find partial DIE containing offset 0x%lx [in module %"
 "s]"
 msgstr ""
 
-#: dwarf2read.c:21724
+#: dwarf2read.c:21734
 #, possible-c-format
 msgid "invalid dwarf2 offset %u"
 msgstr ""
 
-#: dwarf2read.c:22023
+#: dwarf2read.c:22033
 #, possible-c-format
 msgid "A problem internal to GDB: DIE 0x%x has type already set"
 msgstr ""
 
-#: dwarf2read.c:22762
+#: dwarf2read.c:22772
 msgid "Ada is not currently supported by the index"
 msgstr ""
 
-#: dwarf2read.c:22786
+#: dwarf2read.c:22796
 msgid "couldn't data write to file"
 msgstr ""
 
-#: dwarf2read.c:22895
+#: dwarf2read.c:22905
 msgid "Cannot use an index to create the index"
 msgstr ""
 
-#: dwarf2read.c:22898
+#: dwarf2read.c:22908
 msgid "Cannot make an index when the file has multiple .debug_types sections"
 msgstr ""
 
-#: dwarf2read.c:22912
+#: dwarf2read.c:22922
 #, possible-c-format
 msgid "Can't open `%s' for writing"
 msgstr ""
 
-#: dwarf2read.c:23073
+#: dwarf2read.c:23083
 msgid "usage: save gdb-index DIRECTORY"
 msgstr ""
 
-#: dwarf2read.c:23094
+#: dwarf2read.c:23104
 #, possible-c-format
 msgid "Error while writing index for `%s': "
 msgstr ""
 
-#: dwarf2read.c:23109
+#: dwarf2read.c:23119
 #, possible-c-format
 msgid "Whether to always disassemble DWARF expressions is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:23119
+#: dwarf2read.c:23129
 #, possible-c-format
 msgid "Whether to check \"physname\" is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:23133
+#: dwarf2read.c:23143
 msgid ""
 "Set DWARF 2 specific variables.\n"
 "Configure DWARF 2 variables such as the cache size"
 msgstr ""
 
 #. allow-unknown
-#: dwarf2read.c:23139
+#: dwarf2read.c:23149
 msgid ""
 "Show DWARF 2 specific variables\n"
 "Show DWARF 2 variables such as the cache size"
 msgstr ""
 
-#: dwarf2read.c:23146
+#: dwarf2read.c:23156
 msgid "Set the upper bound on the age of cached dwarf2 compilation units."
 msgstr ""
 
-#: dwarf2read.c:23147
+#: dwarf2read.c:23157
 msgid "Show the upper bound on the age of cached dwarf2 compilation units."
 msgstr ""
 
-#: dwarf2read.c:23148
+#: dwarf2read.c:23158
 msgid ""
 "A higher limit means that cached compilation units will be stored\n"
 "in memory longer, and more total memory will be used.  Zero disables\n"
 "caching, which can slow down startup."
 msgstr ""
 
-#: dwarf2read.c:23158
+#: dwarf2read.c:23168
 msgid "Set whether `info address' always disassembles DWARF expressions."
 msgstr ""
 
-#: dwarf2read.c:23159
+#: dwarf2read.c:23169
 msgid "Show whether `info address' always disassembles DWARF expressions."
 msgstr ""
 
-#: dwarf2read.c:23160
+#: dwarf2read.c:23170
 msgid ""
 "When enabled, DWARF expressions are always printed in an assembly-like\n"
 "syntax.  When disabled, expressions will be printed in a more\n"
 "conversational style, when possible."
 msgstr ""
 
-#: dwarf2read.c:23169
+#: dwarf2read.c:23179
 msgid "Set debugging of the dwarf2 reader."
 msgstr ""
 
-#: dwarf2read.c:23170
+#: dwarf2read.c:23180
 msgid "Show debugging of the dwarf2 reader."
 msgstr ""
 
-#: dwarf2read.c:23171
+#: dwarf2read.c:23181
 msgid ""
 "When enabled (non-zero), debugging messages are printed during dwarf2\n"
 "reading and symtab expansion.  A value of 1 (one) provides basic\n"
 "information.  A value greater than 1 provides more verbose information."
 msgstr ""
 
-#: dwarf2read.c:23179
+#: dwarf2read.c:23189
 msgid "Set debugging of the dwarf2 DIE reader."
 msgstr ""
 
-#: dwarf2read.c:23180
+#: dwarf2read.c:23190
 msgid "Show debugging of the dwarf2 DIE reader."
 msgstr ""
 
-#: dwarf2read.c:23181
+#: dwarf2read.c:23191
 msgid ""
 "When enabled (non-zero), DIEs are dumped after they are read in.\n"
 "The value is the maximum depth to print."
 msgstr ""
 
-#: dwarf2read.c:23188
+#: dwarf2read.c:23198
 msgid "Set cross-checking of \"physname\" code against demangler."
 msgstr ""
 
-#: dwarf2read.c:23189
+#: dwarf2read.c:23199
 msgid "Show cross-checking of \"physname\" code against demangler."
 msgstr ""
 
-#: dwarf2read.c:23190
+#: dwarf2read.c:23200
 msgid ""
 "When enabled, GDB's internal \"physname\" code is checked against\n"
 "the demangler."
 msgstr ""
 
-#: dwarf2read.c:23197
+#: dwarf2read.c:23207
 msgid "Set whether to use deprecated gdb_index sections."
 msgstr ""
 
-#: dwarf2read.c:23198
+#: dwarf2read.c:23208
 msgid "Show whether to use deprecated gdb_index sections."
 msgstr ""
 
-#: dwarf2read.c:23199
+#: dwarf2read.c:23209
 msgid ""
 "When enabled, deprecated .gdb_index sections are used anyway.\n"
 "Normally they are ignored either because of a missing feature or\n"
@@ -10201,7 +10205,7 @@ msgid ""
 "Warning: This option must be enabled before gdb reads the file."
 msgstr ""
 
-#: dwarf2read.c:23209
+#: dwarf2read.c:23219
 msgid ""
 "Save a gdb-index file.\n"
 "Usage: save gdb-index DIRECTORY"
@@ -25614,71 +25618,71 @@ msgstr ""
 msgid "Filename extensions and the languages they represent:"
 msgstr ""
 
-#: symfile.c:3387
+#: symfile.c:3389
 msgid "No sections are mapped.\n"
 msgstr ""
 
-#: symfile.c:3400 symfile.c:3445
+#: symfile.c:3402 symfile.c:3447
 msgid ""
 "Overlay debugging not enabled.  Use either the 'overlay auto' or\n"
 "the 'overlay manual' command."
 msgstr ""
 
-#: symfile.c:3405 symfile.c:3450
+#: symfile.c:3407 symfile.c:3452
 msgid "Argument required: name of an overlay section"
 msgstr ""
 
-#: symfile.c:3424
+#: symfile.c:3426
 #, possible-c-format
 msgid "Note: section %s unmapped by overlap\n"
 msgstr ""
 
-#: symfile.c:3431 symfile.c:3461
+#: symfile.c:3433 symfile.c:3463
 #, possible-c-format
 msgid "No overlay section called %s"
 msgstr ""
 
-#: symfile.c:3457
+#: symfile.c:3459
 #, possible-c-format
 msgid "Section %s is not mapped"
 msgstr ""
 
-#: symfile.c:3474
+#: symfile.c:3476
 msgid "Automatic overlay debugging enabled."
 msgstr ""
 
-#: symfile.c:3487
+#: symfile.c:3489
 msgid "Overlay debugging enabled."
 msgstr ""
 
-#: symfile.c:3500
+#: symfile.c:3502
 msgid "Overlay debugging disabled."
 msgstr ""
 
-#: symfile.c:3511
+#: symfile.c:3513
 msgid "This target does not know how to read its overlay state."
 msgstr ""
 
-#: symfile.c:3614
+#: symfile.c:3616
 msgid ""
 "Error reading inferior's overlay table: couldn't find `_novlys' variable\n"
 "in inferior.  Use `overlay manual' mode."
 msgstr ""
 
-#: symfile.c:3623 symfile.c:3709
+#: symfile.c:3625 symfile.c:3711
 msgid ""
 "Error reading inferior's overlay table: couldn't find `_ovly_table' array\n"
 "in inferior.  Use `overlay manual' mode."
 msgstr ""
 
-#: symfile.c:3981
+#: symfile.c:3983
 msgid ""
 "Load symbol table from executable file FILE.\n"
 "The `file' command can also load symbol tables, as well as setting the file\n"
 "to execute."
 msgstr ""
 
-#: symfile.c:3987
+#: symfile.c:3989
 msgid ""
 "Load symbols from FILE, assuming FILE has been dynamically loaded.\n"
 "Usage: add-symbol-file FILE ADDR [-s <SECT> <SECT_ADDR> -s <SECT> "
@@ -25689,7 +25693,7 @@ msgid ""
 "with the text.  SECT is a section name to be loaded at SECT_ADDR."
 msgstr ""
 
-#: symfile.c:3998
+#: symfile.c:4000
 msgid ""
 "Remove a symbol file added via the add-symbol-file command.\n"
 "Usage: remove-symbol-file FILENAME\n"
@@ -25698,84 +25702,84 @@ msgid ""
 "that lies within the boundaries of this symbol file in memory."
 msgstr ""
 
-#: symfile.c:4006
+#: symfile.c:4008
 msgid ""
 "Dynamically load FILE into the running program, and record its symbols\n"
 "for access from GDB.\n"
 "A load OFFSET may also be given."
 msgstr ""
 
-#: symfile.c:4013
+#: symfile.c:4015
 msgid "Commands for debugging overlays."
 msgstr ""
 
-#: symfile.c:4020
+#: symfile.c:4022
 msgid "Assert that an overlay section is mapped."
 msgstr ""
 
-#: symfile.c:4023
+#: symfile.c:4025
 msgid "Assert that an overlay section is unmapped."
 msgstr ""
 
-#: symfile.c:4026
+#: symfile.c:4028
 msgid "List mappings of overlay sections."
 msgstr ""
 
-#: symfile.c:4029
+#: symfile.c:4031
 msgid "Enable overlay debugging."
 msgstr ""
 
-#: symfile.c:4031
+#: symfile.c:4033
 msgid "Disable overlay debugging."
 msgstr ""
 
-#: symfile.c:4033
+#: symfile.c:4035
 msgid "Enable automatic overlay debugging."
 msgstr ""
 
-#: symfile.c:4035
+#: symfile.c:4037
 msgid "Read the overlay mapping state from the target."
 msgstr ""
 
-#: symfile.c:4040
+#: symfile.c:4042
 msgid "Set mapping between filename extension and source language."
 msgstr ""
 
-#: symfile.c:4041
+#: symfile.c:4043
 msgid "Show mapping between filename extension and source language."
 msgstr ""
 
-#: symfile.c:4042
+#: symfile.c:4044
 msgid "Usage: set extension-language .foo bar"
 msgstr ""
 
-#: symfile.c:4049
+#: symfile.c:4051
 msgid "All filename extensions associated with a source language."
 msgstr ""
 
-#: symfile.c:4052
+#: symfile.c:4054
 msgid "Set the directories where separate debug symbols are searched for."
 msgstr ""
 
-#: symfile.c:4053
+#: symfile.c:4055
 msgid "Show the directories where separate debug symbols are searched for."
 msgstr ""
 
-#: symfile.c:4054
+#: symfile.c:4056
 msgid ""
 "Separate debug symbols are first searched for in the same\n"
 "directory as the binary, then in the `"
 msgstr ""
 
-#: symfile.c:4065
+#: symfile.c:4067
 msgid "Set printing of symbol loading messages."
 msgstr ""
 
-#: symfile.c:4066
+#: symfile.c:4068
 msgid "Show printing of symbol loading messages."
 msgstr ""
 
-#: symfile.c:4067
+#: symfile.c:4069
 msgid ""
 "off   == turn all messages off\n"
 "brief == print messages for the executable,\n"
@@ -27886,11 +27890,11 @@ msgid ""
 "point.\n"
 msgstr ""
 
-#: tui/tui-io.c:622
+#: tui/tui-io.c:645
 msgid "Cannot create pipe for readline"
 msgstr ""
 
-#: tui/tui-io.c:626
+#: tui/tui-io.c:649
 msgid "Cannot redirect readline output"
 msgstr ""
 
@@ -27935,47 +27939,47 @@ msgstr ""
 msgid "tui_exec called"
 msgstr ""
 
-#: tui/tui-regs.c:607
+#: tui/tui-regs.c:608
 msgid "\"tui reg\" must be followed by the name of a tui reg command.\n"
 msgstr ""
 
-#: tui/tui-regs.c:623
+#: tui/tui-regs.c:624
 msgid "TUI commands to control the register window."
 msgstr ""
 
-#: tui/tui-regs.c:628
+#: tui/tui-regs.c:629
 msgid "Display only floating point registers."
 msgstr ""
 
-#: tui/tui-regs.c:631
+#: tui/tui-regs.c:632
 msgid "Display only general registers."
 msgstr ""
 
-#: tui/tui-regs.c:634
+#: tui/tui-regs.c:635
 msgid "Display only system registers."
 msgstr ""
 
-#: tui/tui-regs.c:637
+#: tui/tui-regs.c:638
 msgid "Display next register group."
 msgstr ""
 
-#: tui/tui-regs.c:643
+#: tui/tui-regs.c:644
 msgid "Display only floating point registers\n"
 msgstr ""
 
-#: tui/tui-regs.c:645
+#: tui/tui-regs.c:646
 msgid "Display only general registers\n"
 msgstr ""
 
-#: tui/tui-regs.c:647
+#: tui/tui-regs.c:648
 msgid "Display only special registers\n"
 msgstr ""
 
-#: tui/tui-regs.c:649
+#: tui/tui-regs.c:650
 msgid "Scroll the registers window forward\n"
 msgstr ""
 
-#: tui/tui-regs.c:651
+#: tui/tui-regs.c:652
 msgid "Scroll the register window backward\n"
 msgstr ""
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/symfile.c ./gdb/symfile.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/symfile.c	2015-01-27 02:05:13.000000000 +0000
+++ ./gdb/symfile.c	2015-02-03 01:58:32.000000000 +0000
@@ -3028,8 +3028,6 @@ clear_symtab_users (int add_flags)
   clear_current_source_symtab_and_line ();
 
   clear_displays ();
-  if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0)
-    breakpoint_re_set ();
   clear_last_displayed_sal ();
   clear_pc_function_cache ();
   observer_notify_new_objfile (NULL);
@@ -3043,6 +3041,10 @@ clear_symtab_users (int add_flags)
   /* Varobj may refer to old symbols, perform a cleanup.  */
   varobj_invalidate ();
 
+  /* Now that the various caches have been cleared, we can re_set
+     our breakpoints without risking it using stale data.  */
+  if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0)
+    breakpoint_re_set ();
 }
 
 static void
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/tui/tui-io.c ./gdb/tui/tui-io.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/tui/tui-io.c	2015-01-27 02:05:13.000000000 +0000
+++ ./gdb/tui/tui-io.c	2015-02-03 01:58:32.000000000 +0000
@@ -178,7 +178,20 @@ tui_puts (const char *string)
       else if (tui_skip_line != 1)
         {
           tui_skip_line = -1;
-          waddch (w, c);
+	  /* Expand TABs, since ncurses on MS-Windows doesn't.  */
+	  if (c == '\t')
+	    {
+	      int line, col;
+
+	      getyx (w, line, col);
+	      do
+		{
+		  waddch (w, ' ');
+		  col++;
+		} while ((col % 8) != 0);
+	    }
+	  else
+	    waddch (w, c);
         }
       else if (c == '\n')
         tui_skip_line = -1;
@@ -256,6 +269,16 @@ tui_redisplay_readline (void)
           waddch (w, '^');
           waddch (w, CTRL_CHAR (c) ? UNCTRL (c) : '?');
 	}
+      else if (c == '\t')
+	{
+	  /* Expand TABs, since ncurses on MS-Windows doesn't.  */
+	  getyx (w, line, col);
+	  do
+	    {
+	      waddch (w, ' ');
+	      col++;
+	    } while ((col % 8) != 0);
+	}
       else
 	{
           waddch (w, c);
@@ -724,6 +747,59 @@ tui_getc (FILE *fp)
   return ch;
 }
 
+/* Utility function to expand TABs in a STRING into spaces.  STRING
+   will be displayed starting at column COL, and is assumed to include
+   no newlines.  The returned expanded string is malloc'ed.  */
+
+char *
+tui_expand_tabs (const char *string, int col)
+{
+  int n_adjust;
+  const char *s;
+  char *ret, *q;
+
+  /* 1. How many additional characters do we need?  */
+  for (n_adjust = 0, s = string; s; )
+    {
+      s = strpbrk (s, "\t");
+      if (s)
+	{
+	  col += (s - string) + n_adjust;
+	  /* Adjustment for the next tab stop, minus one for the TAB
+	     we replace with spaces.  */
+	  n_adjust += 8 - (col % 8) - 1;
+	  s++;
+	}
+    }
+
+  /* Allocate the copy.  */
+  ret = q = xmalloc (strlen (string) + n_adjust + 1);
+
+  /* 2. Copy the original string while replacing TABs with spaces.  */
+  for (s = string; s; )
+    {
+      char *s1 = strpbrk (s, "\t");
+      if (s1)
+	{
+	  if (s1 > s)
+	    {
+	      strncpy (q, s, s1 - s);
+	      q += s1 - s;
+	      col += s1 - s;
+	    }
+	  do {
+	    *q++ = ' ';
+	    col++;
+	  } while ((col % 8) != 0);
+	  s1++;
+	}
+      else
+	strcpy (q, s);
+      s = s1;
+    }
+
+  return ret;
+}
 
 /* Cleanup when a resize has occured.
    Returns the character that must be processed.  */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/tui/tui-io.h ./gdb/tui/tui-io.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/tui/tui-io.h	2015-01-27 02:05:13.000000000 +0000
+++ ./gdb/tui/tui-io.h	2015-02-03 01:58:32.000000000 +0000
@@ -41,6 +41,9 @@ extern int tui_getc (FILE *);
    changed the edited text.  */
 extern void tui_redisplay_readline (void);
 
+/* Expand TABs into spaces.  */
+extern char *tui_expand_tabs (const char *, int);
+
 extern struct ui_out *tui_out;
 extern struct ui_out *tui_old_uiout;
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/tui/tui-regs.c ./gdb/tui/tui-regs.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/gdb/tui/tui-regs.c	2015-01-27 02:05:13.000000000 +0000
+++ ./gdb/tui/tui-regs.c	2015-02-03 01:58:32.000000000 +0000
@@ -36,6 +36,7 @@
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-file.h"
 #include "tui/tui-regs.h"
+#include "tui/tui-io.h"
 #include "reggroups.h"
 #include "valprint.h"
 
@@ -693,7 +694,9 @@ tui_register_format (struct frame_info *
   if (s && s[1] == 0)
     *s = 0;
 
-  ret = xstrdup (p);
+  /* Expand tabs into spaces, since ncurses on MS-Windows doesn't.  */
+  ret = tui_expand_tabs (p, 0);
+
   do_cleanups (cleanups);
 
   return ret;
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/md5.sum ./md5.sum
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-7.8.90.20150127/md5.sum	2015-01-27 02:09:36.000000000 +0000
+++ ./md5.sum	2015-02-03 02:01:20.000000000 +0000
@@ -38,7 +38,7 @@ f74f5720bf485dc971d7b4151b97318b  bfd/pe
 d714ee957aefa81619f03058d91b23cb  bfd/elfcore.h
 c81d65148831d8cdd82361f4e75ad0c2  bfd/elf64-mips.c
 57287cb3abe2dc7f66af4ab28aafebe9  bfd/cpu-m9s12x.c
-a27443e824211498a6d0ec69f391f91f  bfd/version.h
+283575a7a179ada90af4e90bb3e4d92e  bfd/version.h
 a107ac2f34a58b7629fbff59490f61f1  bfd/cpu-tilegx.c
 ceebc66a221f8f9297b660d643de9009  bfd/coff-mcore.c
 b33e0ba78cdd46c771e365ab8b48bfc1  bfd/cpu-avr.c
@@ -216,7 +216,7 @@ df585392717c30d973de1a223c137975  bfd/ho
 a11231531c5c3cd6e7babf06426a657e  bfd/doc/ChangeLog-9103
 d2b923f7732c26442570c16fd1dfac5a  bfd/doc/hash.texi
 2b2af4fc0532d1286cd9293d8bda2f1d  bfd/doc/syms.texi
-b181f70459e781568c8483853a0c3d96  bfd/doc/bfdver.texi
+844007a14a2fceb9f192dd697028f9c6  bfd/doc/bfdver.texi
 94d5f956ab010ebf90bfddbfc71d5d80  bfd/doc/coffcode.texi
 2889a82d7770c70fc338c8d7da42fce9  bfd/doc/makefile.vms
 b5585eb78baa7af639184ee8cc612918  bfd/doc/bfd.info
@@ -1003,7 +1003,7 @@ a8d8854bf856b98332256bb96b38d858  gdb/li
 cc1acd769ea7271fec38ee4788737ad9  gdb/sparc64-sol2-tdep.c
 4e5a2f9ad7d2ff12e0b1f04a9c2c188e  gdb/amd64-nat.c
 76531c5dfdc41bb233880c163fa14db5  gdb/ppc-ravenscar-thread.c
-882ce50499e889e532204264a27f4a7c  gdb/symfile.c
+076ef5f365c2a94056bccc4687fb8d45  gdb/symfile.c
 6f3c6b23272f15650268798d4746125a  gdb/auxv.c
 6d80739bf7dd2f5c2bf9c60636f6b2ee  gdb/bfin-linux-tdep.c
 893f920a6857cb5291388021fb372832  gdb/m2-lang.h
@@ -1301,12 +1301,12 @@ bd09c5481e9864eb233019724db56d2d  gdb/tu
 d9d3e09551367796dce2a17fa0a83c00  gdb/tui/tui-hooks.c
 7593b0534e4c161ea8b864a5b2956f6c  gdb/tui/tui.c
 9e2ac972187285592aa82c4fd045f840  gdb/tui/tui-disasm.c
-982017c72295a921a15aa81ff4c41c39  gdb/tui/tui-io.h
+b4ca7b9a82a92e88dcf91d8b354c4b4d  gdb/tui/tui-io.h
 a59256f94107464eb22244ac56488cd5  gdb/tui/tui-layout.h
 42572372e7df4a951513c1622b91b940  gdb/tui/tui-command.h
 a4b16b750f957df7f0461af20baf3d57  gdb/tui/tui-stack.c
 ed2f4d8bf00841dd3df0afa69b445ce1  gdb/tui/tui-source.c
-dab413be4329497525ecacf8d35a440b  gdb/tui/tui-io.c
+9bf20f78cbc245a5162d365e360dcfa0  gdb/tui/tui-io.c
 fbbdfe573b16a441c411cf79414d622c  gdb/tui/tui-layout.c
 d09de30673257a10d67adb2dc9b1824b  gdb/tui/tui-wingeneral.h
 b2ece8b901b20b1679c2d8ed4c36e58a  gdb/tui/tui-interp.c
@@ -1316,7 +1316,7 @@ b2ece8b901b20b1679c2d8ed4c36e58a  gdb/tu
 4dc3aae622817a9a37c20369f72a575a  gdb/tui/tui-windata.h
 adfaa06efee4ded8a840bc5f80bb3eec  gdb/tui/tui-data.c
 b294f1de9bc63c28e18bbfb18a2a3d62  gdb/tui/tui-regs.h
-667170649ede1ee738b27910b112f866  gdb/tui/tui-regs.c
+e0a514c017955744b458214c761926b8  gdb/tui/tui-regs.c
 70a191d9144703ba51933fc9057e64e8  gdb/tui/tui-file.c
 e4653b8164f49df138a7e01723576845  gdb/tui/tui-file.h
 0415f3bd7a379430b752618c1e8c7cd4  gdb/tui/ChangeLog-1998-2003
@@ -1358,7 +1358,7 @@ f3dd7931c957110e01b8216e37d8456c  gdb/ar
 420f08b084f6fedd40909294840ea324  gdb/cp-valprint.c
 75048731d244d7e05b05a9451fdfb842  gdb/gdb.h
 c7c1f809ddeba0bc097c96cd0f5e21bb  gdb/amd64fbsd-nat.c
-883de753e3f0dd75328e9a1dff6e09ad  gdb/dwarf2read.c
+19a6382244f9af0f31f3ba8e8bed7fa6  gdb/dwarf2read.c
 eb891b3302af5938339826cf5d63cc84  gdb/amd64-windows-tdep.c
 e4708e4b23e4e6ddd07c7245736d37b3  gdb/testsuite/config/cygmon.exp
 f9d2a2bbf2999a13c9beea756d293942  gdb/testsuite/config/default.exp
@@ -4296,43 +4296,43 @@ f5615bbb876f5d6b8ff495ea635f223d  gdb/f-
 e88f32d160934e36fa7d803d483a1e2e  gdb/gdb_curses.h
 1bbdb3e7ea9ca53f9a8cf1a548dca9f5  gdb/jv-valprint.c
 8108dd8f906f2654fecc74958cf383db  gdb/doc/psrc.sed
-1921804b924ea30b357ee2aa19874e35  gdb/doc/gdb.info-3
-a4f2310ad54f391d3239be047aa66f09  gdb/doc/gdb.info-4
+e6885941dbbd268c8de4123ca881bc10  gdb/doc/gdb.info-3
+4fd456d01a0d2bbe7536872eb7581937  gdb/doc/gdb.info-4
 ab0fe311032294b952da80585b8b90e7  gdb/doc/fdl.texi
 be5469929c58735017a3a1e083554ac7  gdb/doc/Makefile.in
-eddc5be8800d6d9b3495cc5599d13b0f  gdb/doc/gdb.info-7
+b34d3e013405c33753b33326057e99be  gdb/doc/gdb.info-7
 65ee16c0a68d8954d5892092576beb66  gdb/doc/observer.texi
-450235673389e0b5cf74b5166581ce86  gdb/doc/gdbserver.1
+acd57864f326e6c7d8a075e09d724ca9  gdb/doc/gdbserver.1
 669fb3191fafb1ca7da855243682fe4e  gdb/doc/guile.texi
 f81a0e00e0cb9e41b078069fb9bedb07  gdb/doc/stack_frame.txt
 ab34a4a36fd27cddd3c7838273cfb1dd  gdb/doc/stabs.info
-a7e6284532be0267cd395d4c330dc74e  gdb/doc/gdb.info-5
-f32c7f7ca84bc3ec24f5049ff8f30a80  gdb/doc/gdb.info-8
+fafe7b9bf616d9b4325c62b316947a65  gdb/doc/gdb.info-5
+d629f7399f9f50665fab7ae4c54efbfa  gdb/doc/gdb.info-8
 4fb6b0bb12bb47f2079a5e38f7dcdcf7  gdb/doc/agentexpr.texi
-96ed2a4dde8b2800255e2334d6c2bcb3  gdb/doc/gdb.info-1
+fef5dec31dd5f832953ec7dbf91bb62f  gdb/doc/gdb.info-1
 d5d06eaf9b4d44aa442a4a281aa9aea4  gdb/doc/a4rc.sed
-1432c386fca266b70c0e1a997b31eace  gdb/doc/gdb.info-6
+bc358fa95b8dfcdad43d6f37ae467c5e  gdb/doc/gdb.info-6
 85ce27a948be3709b3aa35643f9e6d15  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
-695e8d10faeee8895aae8d0d82168307  gdb/doc/gdb.info-2
+c02eb69965b5eac3a9249d92d868378b  gdb/doc/gdb.info-2
 df443225fa3e5719ca7e6925a7e633e0  gdb/doc/refcard.tex
 6076d300a46651562d4ecd0604442414  gdb/doc/stack_frame.png
-6653a0bc1062949ed352d54de5c2b487  gdb/doc/gdb.info
+f994f2f979577884b07f3e5e71296ea4  gdb/doc/gdb.info
 51f928aef51288aa002575df7e06ff0d  gdb/doc/python.texi
 fa1abec9272120122bf7638320e90d4c  gdb/doc/stabs.texinfo
 c10dfc4e1284c40d2aaa059b6d79ff1c  gdb/doc/ChangeLog
-fb1b3e322d68f3a3e848caf45a3cf12d  gdb/doc/gdb.1
-b87e6473f5f7931c0d8e8fdb00d97a3a  gdb/doc/gcore.1
+080b0a07001c4accd679c374db309116  gdb/doc/gdb.1
+ca8dbab10f4f8fcf37017ce4cfaf41ae  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
-f6a1214007a12be9ecac2940c5a2b081  gdb/doc/gdbinit.5
+2991f17c6067269a1f47f32a72c6f469  gdb/doc/gdbinit.5
 d606e873666ae0bc7bc7c84d6c9c2332  gdb/doc/Doxyfile-gdb-xref.in
 705bf0b3fb65b3f7e3db4cc5d9ae8eba  gdb/doc/annotate.texinfo
 79278fc2f5486809779a9a8f8883d401  gdb/doc/doxy-index.in
@@ -4794,9 +4794,9 @@ e5c081bec329720b4c0d37fb1bf8adae  gdb/p-
 f1679b5d9950d66febb8259748700963  gdb/std-regs.c
 9da9e540b1c6970695a3161272737803  gdb/go-lang.h
 23e51b25e50614cfba06a52e405e2243  gdb/i386-windows-nat.c
-e0c5b95bdacfc341861edee9c6761594  gdb/po/gdb.pot
+c6ba6f9d926937e48a79f7a2470e4122  gdb/po/gdb.pot
 1851bff0653201a488dcae18dde7efad  gdb/po/gdbtext
-495694b86df0970047c4df41742f606f  gdb/ada-lang.c
+30821c78a3fca620918958301a2f928c  gdb/ada-lang.c
 5e0c6b053fd9575dde3084e69835d9c3  gdb/dcache.h
 4f313de57f0ae77eaa0582b5a9cdcbe5  gdb/system-gdbinit/elinos.py
 115d39afda2aa424102200c160cb1516  gdb/system-gdbinit/wrs-linux.py
@@ -4820,7 +4820,7 @@ b21eb0affa9c0fa159d8dc3a1483410e  gdb/jv
 32bb803ab1e68860f1402dbe7e2cb0f5  gdb/nbsd-nat.h
 83df4734061e07b644f77632819578cf  gdb/mipsread.c
 f5c872d4805a7ac039b4dfc840f4bb8a  gdb/amd64-darwin-tdep.c
-93dc9360161f865cbbc43685ddeb11c0  gdb/ChangeLog
+c6b17ec87ea1686cfc3a135ccbc701fc  gdb/ChangeLog
 5a1dbe4837b41ee2b9cc7a35e0d20a61  gdb/go-typeprint.c
 c6de4736a691dfc690f55e7b69880511  gdb/score-tdep.c
 5a44fd4377f0804008a3697e72efbfe3  gdb/xml-support.h
