[gdb] Rebase to FSF GDB 7.5.50.20130215 (pre-7.6 snapshot).

Jan Kratochvil jankratochvil at fedoraproject.org
Mon Feb 18 17:14:13 UTC 2013


commit ab333d99388294fcc77befda7cd9b2e56fa9843f
Author: Jan Kratochvil <jan.kratochvil at redhat.com>
Date:   Mon Feb 18 18:14:00 2013 +0100

    Rebase to FSF GDB 7.5.50.20130215 (pre-7.6 snapshot).

 .gitignore                                         |    2 +-
 gdb-6.3-readnever-20050907.patch                   |   40 +-
 gdb-6.6-buildid-locate-rpm.patch                   |  104 ++--
 gdb-6.6-buildid-locate.patch                       |   82 ++--
 ....6-scheduler_locking-step-sw-watchpoints2.patch |   61 +-
 gdb-6.8-attach-signalled-detach-stopped.patch      |   32 +-
 gdb-6.8-bz254229-gcore-prpsinfo.patch              |  280 --------
 gdb-archer-pie-addons-keep-disabled.patch          |   26 +-
 gdb-archer.patch                                   |  248 ++++----
 gdb-attach-fail-reasons-5of5.patch                 |   61 +-
 gdb-commonblock-pie.patch                          |   99 ---
 gdb-dlopen-stap-probe-6of7.patch                   |  132 ++--
 gdb-minidebuginfo-crash.patch                      |  142 ----
 gdb-rhbz795424-bitpos-20of25.patch                 |  749 ++++++++++----------
 gdb-rhbz795424-bitpos-22of25.patch                 |  118 ++--
 gdb.spec                                           |   26 +-
 sources                                            |    2 +-
 17 files changed, 836 insertions(+), 1368 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d4f4b2..0dc5293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /gdb-libstdc++-v3-python-r155978.tar.bz2
-/gdb-7.5.50.20130118.tar.bz2
+/gdb-7.5.50.20130215.tar.bz2
diff --git a/gdb-6.3-readnever-20050907.patch b/gdb-6.3-readnever-20050907.patch
index 314be44..5fb51b2 100644
--- a/gdb-6.3-readnever-20050907.patch
+++ b/gdb-6.3-readnever-20050907.patch
@@ -11,10 +11,10 @@
 
         * gdb.texinfo (File Options): Document --readnever.
 
-Index: gdb-7.5.50.20130118/gdb/doc/gdb.texinfo
+Index: gdb-7.5.50.20130215/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/doc/gdb.texinfo	2013-01-18 22:54:22.521155527 +0100
-+++ gdb-7.5.50.20130118/gdb/doc/gdb.texinfo	2013-01-18 22:58:15.064596580 +0100
+--- gdb-7.5.50.20130215.orig/gdb/doc/gdb.texinfo	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/doc/gdb.texinfo	2013-02-15 22:34:22.381165443 +0100
 @@ -1026,6 +1026,12 @@ Read each symbol file's entire symbol ta
  the default, which is to read it incrementally as it is needed.
  This makes startup slower, but makes future operations faster.
@@ -28,11 +28,11 @@ Index: gdb-7.5.50.20130118/gdb/doc/gdb.texinfo
  @end table
  
  @node Mode Options
-Index: gdb-7.5.50.20130118/gdb/main.c
+Index: gdb-7.5.50.20130215/gdb/main.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/main.c	2013-01-18 22:54:22.523155531 +0100
-+++ gdb-7.5.50.20130118/gdb/main.c	2013-01-18 22:58:15.065596598 +0100
-@@ -445,6 +445,7 @@ captured_main (void *data)
+--- gdb-7.5.50.20130215.orig/gdb/main.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/main.c	2013-02-15 22:34:22.382165445 +0100
+@@ -447,6 +447,7 @@ captured_main (void *data)
        {"xdb", no_argument, &xdb_commands, 1},
        {"dbx", no_argument, &dbx_commands, 1},
        {"readnow", no_argument, &readnow_symbol_files, 1},
@@ -40,7 +40,7 @@ Index: gdb-7.5.50.20130118/gdb/main.c
        {"r", no_argument, &readnow_symbol_files, 1},
        {"quiet", no_argument, &quiet, 1},
        {"q", no_argument, &quiet, 1},
-@@ -1164,6 +1165,7 @@ Options:\n\n\
+@@ -1165,6 +1166,7 @@ Options:\n\n\
    fputs_unfiltered (_("\
    --quiet            Do not print version number on startup.\n\
    --readnow          Fully read symbol files on first access.\n\
@@ -48,10 +48,10 @@ Index: gdb-7.5.50.20130118/gdb/main.c
  "), stream);
    fputs_unfiltered (_("\
    --se=FILE          Use FILE as symbol file and executable file.\n\
-Index: gdb-7.5.50.20130118/gdb/symfile.c
+Index: gdb-7.5.50.20130215/gdb/symfile.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/symfile.c	2013-01-18 22:58:15.065596598 +0100
-+++ gdb-7.5.50.20130118/gdb/symfile.c	2013-01-18 22:58:31.249619597 +0100
+--- gdb-7.5.50.20130215.orig/gdb/symfile.c	2013-02-01 20:39:03.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/symfile.c	2013-02-15 22:34:22.383165447 +0100
 @@ -81,6 +81,7 @@ static void clear_symtab_users_cleanup (
  
  /* Global variables owned by this file.  */
@@ -60,19 +60,19 @@ Index: gdb-7.5.50.20130118/gdb/symfile.c
  
  /* Functions this file defines.  */
  
-Index: gdb-7.5.50.20130118/gdb/dwarf2read.c
+Index: gdb-7.5.50.20130215/gdb/dwarf2read.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/dwarf2read.c	2013-01-18 22:54:22.528155545 +0100
-+++ gdb-7.5.50.20130118/gdb/dwarf2read.c	2013-01-18 22:59:08.940674035 +0100
-@@ -67,6 +67,7 @@
- #include <ctype.h>
+--- gdb-7.5.50.20130215.orig/gdb/dwarf2read.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/dwarf2read.c	2013-02-15 22:34:34.479181584 +0100
+@@ -68,6 +68,7 @@
  #include "gdb_bfd.h"
  #include "f-lang.h"
+ #include "source.h"
 +#include "top.h"
  
  #include <fcntl.h>
  #include "gdb_string.h"
-@@ -1782,8 +1783,9 @@ dwarf2_has_info (struct objfile *objfile
+@@ -1793,8 +1794,9 @@ dwarf2_has_info (struct objfile *objfile
                               (void *) names);
        dwarf2_per_objfile->objfile = objfile;
      }
@@ -84,10 +84,10 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2read.c
  }
  
  /* When loading sections, we look either for uncompressed section or for
-Index: gdb-7.5.50.20130118/gdb/top.h
+Index: gdb-7.5.50.20130215/gdb/top.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/top.h	2013-01-18 22:54:22.528155545 +0100
-+++ gdb-7.5.50.20130118/gdb/top.h	2013-01-18 22:58:15.069596657 +0100
+--- gdb-7.5.50.20130215.orig/gdb/top.h	2013-01-07 17:40:36.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/top.h	2013-02-15 22:34:22.389165459 +0100
 @@ -58,6 +58,7 @@ extern void set_prompt (const char *s);
  
  /* From random places.  */
diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch
index f5553f1..0074db9 100644
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@@ -1,16 +1,16 @@
-Index: gdb-7.4.50.20120602/gdb/event-top.c
+Index: gdb-7.5.50.20130215/gdb/event-top.c
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/event-top.c	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/event-top.c	2012-06-02 21:08:23.479221885 +0200
+--- gdb-7.5.50.20130215.orig/gdb/event-top.c	2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/event-top.c	2013-02-15 22:36:11.217308539 +0100
 @@ -36,6 +36,7 @@
- #include "observer.h"
  #include "continuations.h"
  #include "gdbcmd.h"		/* for dont_repeat() */
+ #include "annotate.h"
 +#include "symfile.h"
  
  /* readline include files.  */
  #include "readline/readline.h"
-@@ -176,6 +177,8 @@ rl_callback_read_char_wrapper (gdb_clien
+@@ -170,6 +171,8 @@ rl_callback_read_char_wrapper (gdb_clien
  void
  cli_command_loop (void)
  {
@@ -19,7 +19,7 @@ Index: gdb-7.4.50.20120602/gdb/event-top.c
    display_gdb_prompt (0);
  
    /* Now it's time to start the event loop.  */
-@@ -241,6 +244,8 @@ display_gdb_prompt (char *new_prompt)
+@@ -237,6 +240,8 @@ display_gdb_prompt (char *new_prompt)
    /* Reset the nesting depth used when trace-commands is set.  */
    reset_command_nest_depth ();
  
@@ -28,11 +28,11 @@ Index: gdb-7.4.50.20120602/gdb/event-top.c
    /* Each interpreter has its own rules on displaying the command
       prompt.  */
    if (!current_interp_display_prompt_p ())
-Index: gdb-7.4.50.20120602/gdb/elfread.c
+Index: gdb-7.5.50.20130215/gdb/elfread.c
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/elfread.c	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/elfread.c	2012-06-02 21:08:23.482221882 +0200
-@@ -48,6 +48,7 @@
+--- gdb-7.5.50.20130215.orig/gdb/elfread.c	2013-02-15 22:35:36.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/elfread.c	2013-02-15 22:35:59.414292874 +0100
+@@ -49,6 +49,7 @@
  #include "gdbcore.h"
  #include "gdbcmd.h"
  #include "observer.h"
@@ -40,7 +40,7 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c
  #include <sys/stat.h>
  
  extern void _initialize_elfread (void);
-@@ -1647,8 +1648,361 @@ build_id_to_filename (struct build_id *b
+@@ -1649,8 +1650,361 @@ build_id_to_filename (struct build_id *b
    return retval;
  }
  
@@ -403,7 +403,7 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c
     avoidance.  */
  
  struct missing_filepair
-@@ -1702,11 +2056,17 @@ missing_filepair_change (void)
+@@ -1704,11 +2058,17 @@ missing_filepair_change (void)
        /* All their memory came just from missing_filepair_OBSTACK.  */
        missing_filepair_hash = NULL;
      }
@@ -421,7 +421,7 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c
    missing_filepair_change ();
  }
  
-@@ -1773,14 +2133,35 @@ debug_print_missing (const char *binary,
+@@ -1775,14 +2135,35 @@ debug_print_missing (const char *binary,
  
    *slot = missing_filepair;
  
@@ -464,11 +464,11 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c
  }
  
  static char *
-Index: gdb-7.4.50.20120602/gdb/symfile.h
+Index: gdb-7.5.50.20130215/gdb/symfile.h
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/symfile.h	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/symfile.h	2012-06-02 21:08:23.499221877 +0200
-@@ -621,6 +621,8 @@ extern struct build_id *build_id_addr_ge
+--- gdb-7.5.50.20130215.orig/gdb/symfile.h	2013-02-15 22:35:03.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/symfile.h	2013-02-15 22:35:59.414292874 +0100
+@@ -599,6 +599,8 @@ extern struct build_id *build_id_addr_ge
  extern char *build_id_to_filename (struct build_id *build_id,
  				   char **link_return, int add_debug_suffix);
  extern void debug_print_missing (const char *binary, const char *debug);
@@ -477,11 +477,11 @@ Index: gdb-7.4.50.20120602/gdb/symfile.h
  
  /* From dwarf2read.c */
  
-Index: gdb-7.4.50.20120602/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/testsuite/lib/gdb.exp	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/testsuite/lib/gdb.exp	2012-06-02 21:08:23.510221873 +0200
-@@ -1388,7 +1388,7 @@ proc default_gdb_start { } {
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/lib/gdb.exp	2013-02-15 22:35:03.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp	2013-02-15 22:35:59.415292878 +0100
+@@ -1482,7 +1482,7 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -490,11 +490,11 @@ Index: gdb-7.4.50.20120602/gdb/testsuite/lib/gdb.exp
      send_gdb "set build-id-verbose 0\n"
      gdb_expect 10 {
  	-re "$gdb_prompt $" {
-Index: gdb-7.4.50.20120602/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/testsuite/lib/mi-support.exp	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/testsuite/lib/mi-support.exp	2012-06-02 21:08:23.523221869 +0200
-@@ -213,7 +213,7 @@ proc default_mi_gdb_start { args } {
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/lib/mi-support.exp	2013-02-15 22:35:03.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp	2013-02-15 22:35:59.416292881 +0100
+@@ -212,7 +212,7 @@ proc default_mi_gdb_start { args } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -503,10 +503,10 @@ Index: gdb-7.4.50.20120602/gdb/testsuite/lib/mi-support.exp
      send_gdb "190-gdb-set build-id-verbose 0\n"
      gdb_expect 10 {
  	-re ".*190-gdb-set build-id-verbose 0\r\n190\\\^done\r\n$mi_gdb_prompt$" {
-Index: gdb-7.4.50.20120602/gdb/tui/tui-interp.c
+Index: gdb-7.5.50.20130215/gdb/tui/tui-interp.c
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/tui/tui-interp.c	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/tui/tui-interp.c	2012-06-02 21:08:23.524221869 +0200
+--- gdb-7.5.50.20130215.orig/gdb/tui/tui-interp.c	2013-01-01 07:41:30.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/tui/tui-interp.c	2013-02-15 22:35:59.416292881 +0100
 @@ -30,6 +30,7 @@
  #include "tui/tui.h"
  #include "tui/tui-io.h"
@@ -515,10 +515,10 @@ Index: gdb-7.4.50.20120602/gdb/tui/tui-interp.c
  
  /* Set to 1 when the TUI mode must be activated when we first start
     gdb.  */
-Index: gdb-7.4.50.20120602/gdb/aclocal.m4
+Index: gdb-7.5.50.20130215/gdb/aclocal.m4
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/aclocal.m4	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/aclocal.m4	2012-06-02 21:08:23.545221858 +0200
+--- gdb-7.5.50.20130215.orig/gdb/aclocal.m4	2013-01-17 12:06:26.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/aclocal.m4	2013-02-15 22:35:59.417292883 +0100
 @@ -11,6 +11,164 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -684,11 +684,11 @@ Index: gdb-7.4.50.20120602/gdb/aclocal.m4
  # AM_CONDITIONAL                                            -*- Autoconf -*-
  
  # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-Index: gdb-7.4.50.20120602/gdb/config.in
+Index: gdb-7.5.50.20130215/gdb/config.in
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/config.in	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/config.in	2012-06-02 21:08:23.546221859 +0200
-@@ -36,6 +36,9 @@
+--- gdb-7.5.50.20130215.orig/gdb/config.in	2012-12-09 19:39:58.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/config.in	2013-02-15 22:35:59.417292883 +0100
+@@ -33,6 +33,9 @@
  /* Define to BFD's default target vector. */
  #undef DEFAULT_BFD_VEC
  
@@ -698,7 +698,7 @@ Index: gdb-7.4.50.20120602/gdb/config.in
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
  #undef ENABLE_NLS
-@@ -216,6 +219,9 @@
+@@ -210,6 +213,9 @@
  /* Define if Python 2.7 is being used. */
  #undef HAVE_LIBPYTHON2_7
  
@@ -708,11 +708,11 @@ Index: gdb-7.4.50.20120602/gdb/config.in
  /* Define to 1 if you have the <libunwind-ia64.h> header file. */
  #undef HAVE_LIBUNWIND_IA64_H
  
-Index: gdb-7.4.50.20120602/gdb/configure
+Index: gdb-7.5.50.20130215/gdb/configure
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/configure	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/configure	2012-06-02 21:20:53.245838121 +0200
-@@ -680,6 +680,11 @@ REPORT_BUGS_TO
+--- gdb-7.5.50.20130215.orig/gdb/configure	2013-01-09 18:21:33.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/configure	2013-02-15 22:35:59.422292893 +0100
+@@ -683,6 +683,11 @@ REPORT_BUGS_TO
  PKGVERSION
  TARGET_OBS
  subdirs
@@ -724,7 +724,7 @@ Index: gdb-7.4.50.20120602/gdb/configure
  GDB_DATADIR
  DEBUGDIR
  MAKEINFO_EXTRA_FLAGS
-@@ -780,6 +785,7 @@ with_gdb_datadir
+@@ -783,6 +788,7 @@ with_gdb_datadir
  with_relocated_sources
  with_auto_load_dir
  with_auto_load_safe_path
@@ -732,7 +732,7 @@ Index: gdb-7.4.50.20120602/gdb/configure
  enable_targets
  enable_64_bit_bfd
  enable_gdbcli
-@@ -825,6 +831,11 @@ CPPFLAGS
+@@ -831,6 +837,11 @@ CPPFLAGS
  CPP
  MAKEINFO
  MAKEINFOFLAGS
@@ -744,7 +744,7 @@ Index: gdb-7.4.50.20120602/gdb/configure
  YACC
  YFLAGS
  XMKMF'
-@@ -1494,6 +1505,8 @@ Optional Packages:
+@@ -1501,6 +1512,8 @@ Optional Packages:
                            [--with-auto-load-dir]
    --without-auto-load-safe-path
                            do not restrict auto-loaded files locations
@@ -753,7 +753,7 @@ Index: gdb-7.4.50.20120602/gdb/configure
    --with-libunwind-ia64   use libunwind frame unwinding for ia64 targets
    --with-curses           use the curses library instead of the termcap
                            library
-@@ -1535,6 +1548,13 @@ Some influential environment variables:
+@@ -1545,6 +1558,13 @@ Some influential environment variables:
    MAKEINFO    Parent configure detects if it is of sufficient version.
    MAKEINFOFLAGS
                Parameters for MAKEINFO.
@@ -767,7 +767,7 @@ Index: gdb-7.4.50.20120602/gdb/configure
    YACC        The `Yet Another C Compiler' implementation to use. Defaults to
                the first program found out of: `bison -y', `byacc', `yacc'.
    YFLAGS      The list of arguments that will be passed by default to $YACC.
-@@ -5015,6 +5035,491 @@ _ACEOF
+@@ -5030,6 +5050,491 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5
  $as_echo "$with_auto_load_safe_path" >&6; }
  
@@ -1259,10 +1259,10 @@ Index: gdb-7.4.50.20120602/gdb/configure
  
  
  subdirs="$subdirs testsuite"
-Index: gdb-7.4.50.20120602/gdb/configure.ac
+Index: gdb-7.5.50.20130215/gdb/configure.ac
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/configure.ac	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/configure.ac	2012-06-02 21:08:23.560221855 +0200
+--- gdb-7.5.50.20130215.orig/gdb/configure.ac	2013-01-09 18:21:35.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/configure.ac	2013-02-15 22:35:59.423292895 +0100
 @@ -166,6 +166,199 @@ AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escap
  	      [Directories safe to hold auto-loaded files.])
  AC_MSG_RESULT([$with_auto_load_safe_path])
@@ -1463,11 +1463,11 @@ Index: gdb-7.4.50.20120602/gdb/configure.ac
  AC_CONFIG_SUBDIRS(testsuite)
  
  # Check whether to support alternative target configurations
-Index: gdb-7.4.50.20120602/gdb/corelow.c
+Index: gdb-7.5.50.20130215/gdb/corelow.c
 ===================================================================
---- gdb-7.4.50.20120602.orig/gdb/corelow.c	2012-06-02 21:08:08.651227347 +0200
-+++ gdb-7.4.50.20120602/gdb/corelow.c	2012-06-02 21:08:23.561221855 +0200
-@@ -317,7 +317,7 @@ build_id_locate_exec (int from_tty)
+--- gdb-7.5.50.20130215.orig/gdb/corelow.c	2013-02-15 22:35:03.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/corelow.c	2013-02-15 22:35:59.423292895 +0100
+@@ -313,7 +313,7 @@ build_id_locate_exec (int from_tty)
          symfile_objfile->flags |= OBJF_BUILD_ID_CORE_LOADED;
      }
    else
diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch
index d6f5735..b4ca895 100644
--- a/gdb-6.6-buildid-locate.patch
+++ b/gdb-6.6-buildid-locate.patch
@@ -1,8 +1,8 @@
-Index: gdb-7.4.91.20120801/gdb/corelow.c
+Index: gdb-7.5.50.20130215/gdb/corelow.c
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/corelow.c	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/corelow.c	2012-08-01 18:37:44.584925750 +0200
-@@ -47,6 +47,9 @@
+--- gdb-7.5.50.20130215.orig/gdb/corelow.c	2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/corelow.c	2013-02-15 22:35:03.278219844 +0100
+@@ -46,6 +46,9 @@
  #include "progspace.h"
  #include "objfiles.h"
  #include "gdb_bfd.h"
@@ -12,7 +12,7 @@ Index: gdb-7.4.91.20120801/gdb/corelow.c
  
  #ifndef O_LARGEFILE
  #define O_LARGEFILE 0
-@@ -274,6 +277,52 @@ add_to_thread_list (bfd *abfd, asection
+@@ -271,6 +274,52 @@ add_to_thread_list (bfd *abfd, asection
      inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
@@ -65,7 +65,7 @@ Index: gdb-7.4.91.20120801/gdb/corelow.c
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -418,6 +467,14 @@ core_open (char *filename, int from_tty)
+@@ -409,6 +458,14 @@ core_open (char *filename, int from_tty)
  	switch_to_thread (thread->ptid);
      }
  
@@ -80,7 +80,7 @@ Index: gdb-7.4.91.20120801/gdb/corelow.c
    post_create_inferior (&core_ops, from_tty);
  
    /* Now go through the target stack looking for threads since there
-@@ -939,4 +996,11 @@ _initialize_corelow (void)
+@@ -978,4 +1035,11 @@ _initialize_corelow (void)
    init_core_ops ();
  
    add_target (&core_ops);
@@ -92,11 +92,11 @@ Index: gdb-7.4.91.20120801/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-7.4.91.20120801/gdb/doc/gdb.texinfo
+Index: gdb-7.5.50.20130215/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/doc/gdb.texinfo	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/doc/gdb.texinfo	2012-08-01 18:37:44.598925672 +0200
-@@ -16530,6 +16530,27 @@ information files.
+--- gdb-7.5.50.20130215.orig/gdb/doc/gdb.texinfo	2013-02-15 22:34:22.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/doc/gdb.texinfo	2013-02-15 22:35:03.287219863 +0100
+@@ -16662,6 +16662,27 @@ information files.
  
  @end table
  
@@ -124,11 +124,11 @@ Index: gdb-7.4.91.20120801/gdb/doc/gdb.texinfo
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-Index: gdb-7.4.91.20120801/gdb/solib-svr4.c
+Index: gdb-7.5.50.20130215/gdb/solib-svr4.c
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/solib-svr4.c	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/solib-svr4.c	2012-08-01 18:37:44.599925667 +0200
-@@ -1228,9 +1228,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
+--- gdb-7.5.50.20130215.orig/gdb/solib-svr4.c	2013-01-31 14:52:52.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/solib-svr4.c	2013-02-15 22:35:03.287219863 +0100
+@@ -1224,9 +1224,52 @@ svr4_read_so_list (CORE_ADDR lm, struct
  	  continue;
  	}
  
@@ -184,10 +184,10 @@ Index: gdb-7.4.91.20120801/gdb/solib-svr4.c
        xfree (buffer);
  
        /* If this entry has no name, or its name matches the name
-Index: gdb-7.4.91.20120801/gdb/elfread.c
+Index: gdb-7.5.50.20130215/gdb/elfread.c
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/elfread.c	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/elfread.c	2012-08-01 18:38:08.956790879 +0200
+--- gdb-7.5.50.20130215.orig/gdb/elfread.c	2013-02-01 20:39:03.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/elfread.c	2013-02-15 22:35:36.826263354 +0100
 @@ -45,6 +45,11 @@
  #include "regcache.h"
  #include "bcache.h"
@@ -919,9 +919,9 @@ Index: gdb-7.4.91.20120801/gdb/elfread.c
      }
    return NULL;
  }
-@@ -1436,9 +2038,10 @@ elf_symfile_read (struct objfile *objfil
-      `.note.gnu.build-id'.  */
-   else if (!objfile_has_partial_symbols (objfile))
+@@ -1444,9 +2046,10 @@ elf_symfile_read (struct objfile *objfil
+ 	   && objfile->separate_debug_objfile == NULL
+ 	   && objfile->separate_debug_objfile_backlink == NULL)
      {
 -      char *debugfile;
 +      char *debugfile, *build_id_filename;
@@ -932,7 +932,7 @@ Index: gdb-7.4.91.20120801/gdb/elfread.c
  
        if (debugfile == NULL)
  	debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1452,6 +2055,12 @@ elf_symfile_read (struct objfile *objfil
+@@ -1460,6 +2063,12 @@ elf_symfile_read (struct objfile *objfil
  	  symbol_file_add_separate (abfd, symfile_flags, objfile);
  	  do_cleanups (cleanup);
  	}
@@ -945,7 +945,7 @@ Index: gdb-7.4.91.20120801/gdb/elfread.c
      }
  
    if (symtab_create_debug)
-@@ -1784,4 +2393,16 @@ _initialize_elfread (void)
+@@ -1782,4 +2391,16 @@ _initialize_elfread (void)
  
    elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
    gnu_ifunc_fns_p = &elf_gnu_ifunc_fns;
@@ -962,11 +962,11 @@ Index: gdb-7.4.91.20120801/gdb/elfread.c
 +
 +  observer_attach_executable_changed (debug_print_executable_changed);
  }
-Index: gdb-7.4.91.20120801/gdb/symfile.h
+Index: gdb-7.5.50.20130215/gdb/symfile.h
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/symfile.h	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/symfile.h	2012-08-01 18:37:44.600925662 +0200
-@@ -615,6 +615,13 @@ void free_symfile_segment_data (struct s
+--- gdb-7.5.50.20130215.orig/gdb/symfile.h	2013-02-03 17:20:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/symfile.h	2013-02-15 22:35:03.288219867 +0100
+@@ -593,6 +593,13 @@ void free_symfile_segment_data (struct s
  
  extern struct cleanup *increment_reading_symtab (void);
  
@@ -980,11 +980,11 @@ Index: gdb-7.4.91.20120801/gdb/symfile.h
  /* From dwarf2read.c */
  
  /* Names for a dwarf2 debugging section.  The field NORMAL is the normal
-Index: gdb-7.4.91.20120801/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/testsuite/lib/gdb.exp	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/testsuite/lib/gdb.exp	2012-08-01 18:37:44.601925656 +0200
-@@ -1388,6 +1388,16 @@ proc default_gdb_start { } {
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/lib/gdb.exp	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/lib/gdb.exp	2013-02-15 22:35:03.289219870 +0100
+@@ -1482,6 +1482,16 @@ proc default_gdb_start { } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -1001,11 +1001,11 @@ Index: gdb-7.4.91.20120801/gdb/testsuite/lib/gdb.exp
      return 0;
  }
  
-Index: gdb-7.4.91.20120801/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/testsuite/lib/mi-support.exp	2012-07-25 22:35:30.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/testsuite/lib/mi-support.exp	2012-08-01 18:37:44.601925656 +0200
-@@ -213,6 +213,16 @@ proc default_mi_gdb_start { args } {
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/lib/mi-support.exp	2013-01-22 00:57:59.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/lib/mi-support.exp	2013-02-15 22:35:03.289219870 +0100
+@@ -212,6 +212,16 @@ proc default_mi_gdb_start { args } {
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -1022,10 +1022,10 @@ Index: gdb-7.4.91.20120801/gdb/testsuite/lib/mi-support.exp
      # If allowing the inferior to have its own PTY then assign the inferior
      # its own terminal device here.
      if { $separate_inferior_pty } {
-Index: gdb-7.4.91.20120801/gdb/objfiles.h
+Index: gdb-7.5.50.20130215/gdb/objfiles.h
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/objfiles.h	2012-08-01 18:36:51.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/objfiles.h	2012-08-01 18:37:44.601925656 +0200
+--- gdb-7.5.50.20130215.orig/gdb/objfiles.h	2013-01-01 07:32:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/objfiles.h	2013-02-15 22:35:03.290219872 +0100
 @@ -432,6 +432,10 @@ struct objfile
  
  #define OBJF_MAINLINE (1 << 5)
@@ -1037,10 +1037,10 @@ Index: gdb-7.4.91.20120801/gdb/objfiles.h
  /* The object file that contains the runtime common minimal symbols
     for SunOS4.  Note that this objfile has no associated BFD.  */
  
-Index: gdb-7.4.91.20120801/gdb/testsuite/gdb.base/corefile.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/corefile.exp
 ===================================================================
---- gdb-7.4.91.20120801.orig/gdb/testsuite/gdb.base/corefile.exp	2012-06-21 22:46:21.000000000 +0200
-+++ gdb-7.4.91.20120801/gdb/testsuite/gdb.base/corefile.exp	2012-08-01 18:37:44.602925650 +0200
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/gdb.base/corefile.exp	2013-01-01 07:33:25.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/corefile.exp	2013-02-15 22:35:03.290219872 +0100
 @@ -256,3 +256,33 @@ if ![is_remote target] {
  
      gdb_exit
diff --git a/gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch b/gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
index 36b10a5..4d4fd6b 100644
--- a/gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
+++ b/gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
@@ -21,11 +21,11 @@
 
 	Port to GDB-6.8pre.
 
-Index: gdb-7.4.50.20120714/gdb/inferior.h
+Index: gdb-7.5.50.20130215/gdb/inferior.h
 ===================================================================
---- gdb-7.4.50.20120714.orig/gdb/inferior.h	2012-06-13 20:15:05.000000000 +0200
-+++ gdb-7.4.50.20120714/gdb/inferior.h	2012-07-14 23:21:01.795161794 +0200
-@@ -159,7 +159,15 @@ extern void reopen_exec_file (void);
+--- gdb-7.5.50.20130215.orig/gdb/inferior.h	2013-01-16 18:31:38.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/inferior.h	2013-02-15 22:31:42.993944957 +0100
+@@ -160,7 +160,15 @@ extern void reopen_exec_file (void);
  /* The `resume' routine should only be called in special circumstances.
     Normally, use `proceed', which handles a lot of bookkeeping.  */
  
@@ -42,11 +42,11 @@ Index: gdb-7.4.50.20120714/gdb/inferior.h
  
  extern ptid_t user_visible_resume_ptid (int step);
  
-Index: gdb-7.4.50.20120714/gdb/infrun.c
+Index: gdb-7.5.50.20130215/gdb/infrun.c
 ===================================================================
---- gdb-7.4.50.20120714.orig/gdb/infrun.c	2012-07-01 12:37:04.000000000 +0200
-+++ gdb-7.4.50.20120714/gdb/infrun.c	2012-07-14 23:21:01.800161767 +0200
-@@ -79,7 +79,7 @@ static int follow_fork (void);
+--- gdb-7.5.50.20130215.orig/gdb/infrun.c	2013-01-31 20:18:58.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/infrun.c	2013-02-15 22:34:07.132144519 +0100
+@@ -81,7 +81,7 @@ static int follow_fork (void);
  static void set_schedlock_func (char *args, int from_tty,
  				struct cmd_list_element *c);
  
@@ -55,7 +55,7 @@ Index: gdb-7.4.50.20120714/gdb/infrun.c
  
  static int currently_stepping_or_nexting_callback (struct thread_info *tp,
  						   void *data);
-@@ -1672,7 +1672,8 @@ user_visible_resume_ptid (int step)
+@@ -1709,7 +1709,8 @@ user_visible_resume_ptid (int step)
      }
    else if ((scheduler_mode == schedlock_on)
  	   || (scheduler_mode == schedlock_step
@@ -65,7 +65,7 @@ Index: gdb-7.4.50.20120714/gdb/infrun.c
      {
        /* User-settable 'scheduler' mode requires solo thread resume.  */
        resume_ptid = inferior_ptid;
-@@ -1690,7 +1691,7 @@ user_visible_resume_ptid (int step)
+@@ -1727,7 +1728,7 @@ user_visible_resume_ptid (int step)
     STEP nonzero if we should step (zero to continue instead).
     SIG is the signal to give the inferior (zero for none).  */
  void
@@ -74,7 +74,7 @@ Index: gdb-7.4.50.20120714/gdb/infrun.c
  {
    int should_resume = 1;
    struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
-@@ -1723,9 +1724,13 @@ resume (int step, enum gdb_signal sig)
+@@ -1760,9 +1761,13 @@ resume (int step, enum gdb_signal sig)
  
    if (debug_infrun)
      fprintf_unfiltered (gdb_stdlog,
@@ -90,48 +90,48 @@ Index: gdb-7.4.50.20120714/gdb/infrun.c
  			target_pid_to_str (inferior_ptid),
  			paddress (gdbarch, pc));
  
-@@ -2102,7 +2107,7 @@ proceed (CORE_ADDR addr, enum gdb_signal
-   struct thread_info *tp;
+@@ -2140,7 +2145,7 @@ proceed (CORE_ADDR addr, enum gdb_signal
    CORE_ADDR pc;
    struct address_space *aspace;
--  int oneproc = 0;
+   /* GDB may force the inferior to step due to various reasons.  */
+-  int force_step = 0;
 +  enum resume_step resume_step = RESUME_STEP_CONTINUE;
  
    /* If we're stopped at a fork/vfork, follow the branch set by the
       "set follow-fork-mode" command; otherwise, we'll just proceed
-@@ -2142,13 +2147,13 @@ proceed (CORE_ADDR addr, enum gdb_signal
+@@ -2180,13 +2185,13 @@ proceed (CORE_ADDR addr, enum gdb_signal
  	   actually be executing the breakpoint insn anyway.
  	   We'll be (un-)executing the previous instruction.  */
  
--	oneproc = 1;
+-	force_step = 1;
 +	resume_step = RESUME_STEP_USER;
        else if (gdbarch_single_step_through_delay_p (gdbarch)
  	       && gdbarch_single_step_through_delay (gdbarch,
  						     get_current_frame ()))
  	/* We stepped onto an instruction that needs to be stepped
  	   again before re-inserting the breakpoint, do so.  */
--	oneproc = 1;
+-	force_step = 1;
 +	resume_step = RESUME_STEP_USER;
      }
    else
      {
-@@ -2179,13 +2184,13 @@ proceed (CORE_ADDR addr, enum gdb_signal
+@@ -2217,13 +2222,13 @@ proceed (CORE_ADDR addr, enum gdb_signal
  	 is required it returns TRUE and sets the current thread to
  	 the old thread.  */
        if (prepare_to_proceed (step))
--	oneproc = 1;
+-	force_step = 1;
 +	resume_step = RESUME_STEP_USER;
      }
  
    /* prepare_to_proceed may change the current thread.  */
    tp = inferior_thread ();
  
--  if (oneproc)
+-  if (force_step)
 +  if (resume_step == RESUME_STEP_USER)
      {
        tp->control.trap_expected = 1;
        /* If displaced stepping is enabled, we can step over the
-@@ -2272,8 +2277,13 @@ proceed (CORE_ADDR addr, enum gdb_signal
+@@ -2310,9 +2315,13 @@ proceed (CORE_ADDR addr, enum gdb_signal
    /* Reset to normal state.  */
    init_infwait_state ();
  
@@ -141,12 +141,13 @@ Index: gdb-7.4.50.20120714/gdb/infrun.c
 +    resume_step = RESUME_STEP_NEEDED;
 +
    /* Resume inferior.  */
--  resume (oneproc || step || bpstat_should_step (), tp->suspend.stop_signal);
+-  resume (force_step || step || bpstat_should_step (),
+-	  tp->suspend.stop_signal);
 +  resume (resume_step, tp->suspend.stop_signal);
  
    /* Wait for it to stop (if not standalone)
       and in any case decode why it stopped, and act accordingly.  */
-@@ -5205,13 +5215,18 @@ process_event_stop_test:
+@@ -5247,13 +5256,18 @@ process_event_stop_test:
  
  /* Is thread TP in the middle of single-stepping?  */
  
@@ -170,11 +171,11 @@ Index: gdb-7.4.50.20120714/gdb/infrun.c
  }
  
  /* Returns true if any thread *but* the one passed in "data" is in the
-Index: gdb-7.4.50.20120714/gdb/linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/linux-nat.c
 ===================================================================
---- gdb-7.4.50.20120714.orig/gdb/linux-nat.c	2012-07-07 14:13:56.000000000 +0200
-+++ gdb-7.4.50.20120714/gdb/linux-nat.c	2012-07-14 23:21:01.803161750 +0200
-@@ -2982,7 +2982,11 @@ static int
+--- gdb-7.5.50.20130215.orig/gdb/linux-nat.c	2013-02-13 15:59:49.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/linux-nat.c	2013-02-15 22:31:42.997944967 +0100
+@@ -2971,7 +2971,11 @@ static int
  select_singlestep_lwp_callback (struct lwp_info *lp, void *data)
  {
    if (lp->last_resume_kind == resume_step
@@ -187,10 +188,10 @@ Index: gdb-7.4.50.20120714/gdb/linux-nat.c
      return 1;
    else
      return 0;
-Index: gdb-7.4.50.20120714/gdb/linux-nat.h
+Index: gdb-7.5.50.20130215/gdb/linux-nat.h
 ===================================================================
---- gdb-7.4.50.20120714.orig/gdb/linux-nat.h	2012-07-06 18:52:20.000000000 +0200
-+++ gdb-7.4.50.20120714/gdb/linux-nat.h	2012-07-14 23:21:17.414075355 +0200
+--- gdb-7.5.50.20130215.orig/gdb/linux-nat.h	2013-02-13 15:59:49.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/linux-nat.h	2013-02-15 22:31:42.998944969 +0100
 @@ -73,8 +73,8 @@ struct lwp_info
    /* If non-zero, a pending wait status.  */
    int status;
diff --git a/gdb-6.8-attach-signalled-detach-stopped.patch b/gdb-6.8-attach-signalled-detach-stopped.patch
index 13966f2..b98e2f3 100644
--- a/gdb-6.8-attach-signalled-detach-stopped.patch
+++ b/gdb-6.8-attach-signalled-detach-stopped.patch
@@ -1,8 +1,8 @@
-Index: gdb-7.4.50.20120703/gdb/linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/linux-nat.c
 ===================================================================
---- gdb-7.4.50.20120703.orig/gdb/linux-nat.c	2012-07-03 17:46:55.000000000 +0200
-+++ gdb-7.4.50.20120703/gdb/linux-nat.c	2012-07-03 17:57:29.608734933 +0200
-@@ -180,6 +180,9 @@ blocked.  */
+--- gdb-7.5.50.20130215.orig/gdb/linux-nat.c	2013-02-15 22:38:05.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/linux-nat.c	2013-02-15 22:44:59.638985719 +0100
+@@ -181,6 +181,9 @@ blocked.  */
  static struct target_ops *linux_ops;
  static struct target_ops linux_ops_saved;
  
@@ -12,7 +12,7 @@ Index: gdb-7.4.50.20120703/gdb/linux-nat.c
  /* The method to call, if any, when a new thread is attached.  */
  static void (*linux_nat_new_thread) (struct lwp_info *);
  
-@@ -909,7 +912,14 @@ holding the child stopped.  Try \"set de
+@@ -914,7 +917,14 @@ holding the child stopped.  Try \"set de
  	  parent_inf->waiting_for_vfork_done = 0;
  	}
        else if (detach_fork)
@@ -28,7 +28,7 @@ Index: gdb-7.4.50.20120703/gdb/linux-nat.c
  
        /* Note that the detach above makes PARENT_INF dangling.  */
  
-@@ -1377,6 +1387,7 @@ linux_nat_post_attach_wait (ptid_t ptid,
+@@ -1362,6 +1372,7 @@ linux_nat_post_attach_wait (ptid_t ptid,
        if (debug_linux_nat)
  	fprintf_unfiltered (gdb_stdlog,
  			    "LNPAW: Attaching to a stopped process\n");
@@ -36,7 +36,7 @@ Index: gdb-7.4.50.20120703/gdb/linux-nat.c
  
        /* The process is definitely stopped.  It is in a job control
  	 stop, unless the kernel predates the TASK_STOPPED /
-@@ -1805,6 +1816,9 @@ get_pending_status (struct lwp_info *lp,
+@@ -1790,6 +1801,9 @@ get_pending_status (struct lwp_info *lp,
  			    gdb_signal_to_string (signo));
      }
  
@@ -46,7 +46,7 @@ Index: gdb-7.4.50.20120703/gdb/linux-nat.c
    return 0;
  }
  
-@@ -1918,6 +1932,8 @@ linux_nat_detach (struct target_ops *ops
+@@ -1900,6 +1914,8 @@ linux_nat_detach (struct target_ops *ops
      }
    else
      linux_ops->to_detach (ops, args, from_tty);
@@ -55,7 +55,7 @@ Index: gdb-7.4.50.20120703/gdb/linux-nat.c
  }
  
  /* Resume LP.  */
-@@ -2104,6 +2120,14 @@ linux_nat_resume (struct target_ops *ops
+@@ -2086,6 +2102,14 @@ linux_nat_resume (struct target_ops *ops
       linux_nat_resume_callback.  */
    lp->stopped = 0;
  
@@ -70,19 +70,19 @@ Index: gdb-7.4.50.20120703/gdb/linux-nat.c
    if (resume_many)
      iterate_over_lwps (ptid, linux_nat_resume_callback, NULL);
  
-@@ -4129,6 +4153,8 @@ linux_nat_mourn_inferior (struct target_
-        there are other viable forks to debug.  Delete the exiting
-        one and context-switch to the first available.  */
-     linux_fork_mourn_inferior ();
+@@ -4137,6 +4161,8 @@ linux_nat_mourn_inferior (struct target_
+ 
+   /* Let the arch-specific native code know this process is gone.  */
+   linux_nat_forget_process (pid);
 +
 +  pid_was_stopped = 0;
  }
  
  /* Convert a native/host siginfo object, into/from the siginfo in the
-Index: gdb-7.4.50.20120703/gdb/testsuite/gdb.threads/attach-stopped.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.threads/attach-stopped.exp
 ===================================================================
---- gdb-7.4.50.20120703.orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2012-06-26 21:23:20.000000000 +0200
-+++ gdb-7.4.50.20120703/gdb/testsuite/gdb.threads/attach-stopped.exp	2012-07-03 17:56:43.797790120 +0200
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/gdb.threads/attach-stopped.exp	2013-01-01 07:41:27.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.threads/attach-stopped.exp	2013-02-15 22:44:23.262930312 +0100
 @@ -61,7 +61,65 @@ proc corefunc { threadtype } {
      gdb_reinitialize_dir $srcdir/$subdir
      gdb_load ${binfile}
diff --git a/gdb-archer-pie-addons-keep-disabled.patch b/gdb-archer-pie-addons-keep-disabled.patch
index e6ad356..e67c336 100644
--- a/gdb-archer-pie-addons-keep-disabled.patch
+++ b/gdb-archer-pie-addons-keep-disabled.patch
@@ -1,8 +1,8 @@
-Index: gdb-7.5.50.20130118/gdb/breakpoint.c
+Index: gdb-7.5.50.20130215/gdb/breakpoint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/breakpoint.c	2013-01-18 23:09:53.727597584 +0100
-+++ gdb-7.5.50.20130118/gdb/breakpoint.c	2013-01-18 23:10:20.158635065 +0100
-@@ -15993,6 +15993,50 @@ initialize_breakpoint_ops (void)
+--- gdb-7.5.50.20130215.orig/gdb/breakpoint.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/breakpoint.c	2013-02-15 22:37:08.216381988 +0100
+@@ -16020,6 +16020,50 @@ initialize_breakpoint_ops (void)
  static struct cmd_list_element *enablebreaklist = NULL;
  
  void
@@ -53,23 +53,23 @@ Index: gdb-7.5.50.20130118/gdb/breakpoint.c
  _initialize_breakpoint (void)
  {
    struct cmd_list_element *c;
-Index: gdb-7.5.50.20130118/gdb/breakpoint.h
+Index: gdb-7.5.50.20130215/gdb/breakpoint.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/breakpoint.h	2013-01-18 23:09:51.671594585 +0100
-+++ gdb-7.5.50.20130118/gdb/breakpoint.h	2013-01-18 23:09:53.728597586 +0100
-@@ -1550,4 +1550,7 @@ extern struct gdbarch *get_sal_arch (str
+--- gdb-7.5.50.20130215.orig/gdb/breakpoint.h	2013-02-03 16:57:06.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/breakpoint.h	2013-02-15 22:37:19.025395693 +0100
+@@ -1556,4 +1556,7 @@ extern void handle_solib_event (void);
  
- extern void handle_solib_event (void);
+ extern void breakpoint_free_objfile (struct objfile *objfile);
  
 +extern void breakpoints_relocate (struct objfile *objfile,
 +				  struct section_offsets *delta);
 +
  #endif /* !defined (BREAKPOINT_H) */
-Index: gdb-7.5.50.20130118/gdb/objfiles.c
+Index: gdb-7.5.50.20130215/gdb/objfiles.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/objfiles.c	2013-01-18 23:09:51.671594585 +0100
-+++ gdb-7.5.50.20130118/gdb/objfiles.c	2013-01-18 23:09:53.729597588 +0100
-@@ -826,6 +826,11 @@ objfile_relocate1 (struct objfile *objfi
+--- gdb-7.5.50.20130215.orig/gdb/objfiles.c	2013-02-03 16:57:07.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/objfiles.c	2013-02-15 22:37:08.217381990 +0100
+@@ -831,6 +831,11 @@ objfile_relocate1 (struct objfile *objfi
      objfile->sf->sym_probe_fns->sym_relocate_probe (objfile,
  						    new_offsets, delta);
  
diff --git a/gdb-archer.patch b/gdb-archer.patch
index d04ac2e..fd2862b 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectArcher
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit f1f762361e5e8a4fabdab16463ecb1fd9ba1e5e9
+commit e72ce29f8e339fc6fffd73e9ff4b854b6f2f1452
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-vla
@@ -10,10 +10,10 @@ archer-tromey-python
 
 
 diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index 7305e6d..fff8cb2 100644
+index ed30db5..4356be7 100644
 --- a/gdb/Makefile.in
 +++ b/gdb/Makefile.in
-@@ -1308,6 +1308,12 @@ stamp-h: $(srcdir)/config.in config.status
+@@ -1313,6 +1313,12 @@ stamp-h: $(srcdir)/config.in config.status
  	  CONFIG_LINKS= \
  	  $(SHELL) config.status
  
@@ -27,10 +27,10 @@ index 7305e6d..fff8cb2 100644
  	$(SHELL) config.status --recheck
  
 diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
-index b4849a9..a6e6ca2 100644
+index 634e761..60276dc 100644
 --- a/gdb/ada-lang.c
 +++ b/gdb/ada-lang.c
-@@ -12263,6 +12263,7 @@ ada_operator_length (const struct expression *exp, int pc, int *oplenp,
+@@ -12262,6 +12262,7 @@ ada_operator_length (const struct expression *exp, int pc, int *oplenp,
  
  static int
  ada_operator_check (struct expression *exp, int pos,
@@ -38,7 +38,7 @@ index b4849a9..a6e6ca2 100644
  		    int (*objfile_func) (struct objfile *objfile, void *data),
  		    void *data)
  {
-@@ -12277,12 +12278,15 @@ ada_operator_check (struct expression *exp, int pos,
+@@ -12276,12 +12277,15 @@ ada_operator_check (struct expression *exp, int pos,
  	break;
  
        default:
@@ -94,10 +94,10 @@ index 02e7e8b..2931401 100644
 +
  #endif /* BLOCK_H */
 diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
-index 3ad9885..e28b44e 100644
+index fb57a57..5c03b1c 100644
 --- a/gdb/breakpoint.c
 +++ b/gdb/breakpoint.c
-@@ -15641,6 +15641,24 @@ all_tracepoints (void)
+@@ -15656,6 +15656,24 @@ all_tracepoints (void)
    return tp_vec;
  }
  
@@ -122,7 +122,7 @@ index 3ad9885..e28b44e 100644
  
  /* This help string is used for the break, hbreak, tbreak and thbreak
     commands.  It is defined as a macro to prevent duplication.
-@@ -16612,4 +16630,7 @@ agent-printf \"printf format string\", arg1, arg2, arg3, ..., argn\n\
+@@ -16639,4 +16657,7 @@ agent-printf \"printf format string\", arg1, arg2, arg3, ..., argn\n\
    automatic_hardware_breakpoints = 1;
  
    observer_attach_about_to_proceed (breakpoint_about_to_proceed);
@@ -131,10 +131,10 @@ index 3ad9885..e28b44e 100644
 +#endif
  }
 diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
-index a6db162..ddfc6a9 100644
+index ca8d89b..811ad72 100644
 --- a/gdb/c-typeprint.c
 +++ b/gdb/c-typeprint.c
-@@ -692,7 +692,13 @@ c_type_print_varspec_suffix (struct type *type,
+@@ -689,7 +689,13 @@ c_type_print_varspec_suffix (struct type *type,
  
  	fprintf_filtered (stream, (is_vector ?
  				   " __attribute__ ((vector_size(" : "["));
@@ -187,7 +187,7 @@ index d98ac77..e248399 100644
  FLAGS_TO_PASS = \
  	"prefix=$(prefix)" \
 diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
-index 728e44b..3659139 100644
+index e8ac8c5..b18ccd6 100644
 --- a/gdb/doc/gdb.texinfo
 +++ b/gdb/doc/gdb.texinfo
 @@ -1217,6 +1217,16 @@ for remote debugging.
@@ -207,7 +207,7 @@ index 728e44b..3659139 100644
  @c resolve the situation of these eventually
  @item -tui
  @cindex @code{--tui}
-@@ -22738,8 +22748,6 @@ containing @code{end}.  For example:
+@@ -22786,8 +22796,6 @@ containing @code{end}.  For example:
  
  @smallexample
  (@value{GDBP}) python
@@ -216,7 +216,7 @@ index 728e44b..3659139 100644
  >print 23
  >end
  23
-@@ -22753,6 +22761,14 @@ controlled using @code{set python print-stack}: if @code{full}, then
+@@ -22801,6 +22809,14 @@ controlled using @code{set python print-stack}: if @code{full}, then
  full Python stack printing is enabled; if @code{none}, then Python stack
  and message printing is disabled; if @code{message}, the default, only
  the message component of the error is printed.
@@ -231,7 +231,7 @@ index 728e44b..3659139 100644
  @end table
  
  It is also possible to execute a Python script from the @value{GDBN}
-@@ -22774,6 +22790,14 @@ and thus is always available.
+@@ -22822,6 +22838,14 @@ and thus is always available.
  @cindex python api
  @cindex programming in python
  
@@ -376,11 +376,11 @@ index 4a75c26..91446fe 100644
  
  @node Language Support
 diff --git a/gdb/doc/observer.texi b/gdb/doc/observer.texi
-index 87c08e1..cc8f498 100644
+index adb7085..5ec5b5a 100644
 --- a/gdb/doc/observer.texi
 +++ b/gdb/doc/observer.texi
-@@ -246,6 +246,11 @@ The trace state variable @var{name} is deleted.  If @var{name} is
- @code{NULL}, all trace state variables are deleted.
+@@ -249,6 +249,11 @@ The trace state variable @var{tsv} is deleted.  If @var{tsv} is
+ The trace state value @var{tsv} is modified.
  @end deftypefun
  
 + at c @deftypefun void mark_used (void)
@@ -428,10 +428,10 @@ index e85486a..e7ac799 100644
  
  /* The location of a value.  */
 diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
-index 2282feb..13e7bbc 100644
+index 002387e..2e0e722 100644
 --- a/gdb/dwarf2loc.c
 +++ b/gdb/dwarf2loc.c
-@@ -293,6 +293,9 @@ struct dwarf_expr_baton
+@@ -298,6 +298,9 @@ struct dwarf_expr_baton
  {
    struct frame_info *frame;
    struct dwarf2_per_cu_data *per_cu;
@@ -441,7 +441,7 @@ index 2282feb..13e7bbc 100644
  };
  
  /* Helper functions for dwarf2_evaluate_loc_desc.  */
-@@ -356,16 +359,14 @@ static void
+@@ -361,16 +364,14 @@ static void
  dwarf_expr_frame_base_1 (struct symbol *framefunc, CORE_ADDR pc,
  			 const gdb_byte **start, size_t *length)
  {
@@ -460,7 +460,7 @@ index 2282feb..13e7bbc 100644
      {
        struct dwarf2_locexpr_baton *symbaton;
  
-@@ -378,10 +379,23 @@ dwarf_expr_frame_base_1 (struct symbol *framefunc, CORE_ADDR pc,
+@@ -383,10 +384,23 @@ dwarf_expr_frame_base_1 (struct symbol *framefunc, CORE_ADDR pc,
        else
  	*length = 0;
      }
@@ -485,7 +485,7 @@ index 2282feb..13e7bbc 100644
  }
  
  /* Helper function for dwarf2_evaluate_loc_desc.  Computes the CFA for
-@@ -448,6 +462,85 @@ dwarf_expr_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset)
+@@ -453,6 +467,85 @@ dwarf_expr_dwarf_call (struct dwarf_expr_context *ctx, cu_offset die_offset)
  		     ctx->funcs->get_frame_pc, ctx->baton);
  }
  
@@ -571,7 +571,7 @@ index 2282feb..13e7bbc 100644
  /* Callback function for dwarf2_evaluate_loc_desc.  */
  
  static struct type *
-@@ -1150,10 +1243,12 @@ dwarf_expr_push_dwarf_reg_entry_value (struct dwarf_expr_context *ctx,
+@@ -1155,10 +1248,12 @@ dwarf_expr_push_dwarf_reg_entry_value (struct dwarf_expr_context *ctx,
  
    saved_ctx.gdbarch = ctx->gdbarch;
    saved_ctx.addr_size = ctx->addr_size;
@@ -584,7 +584,7 @@ index 2282feb..13e7bbc 100644
    ctx->offset = dwarf2_per_cu_text_offset (baton_local.per_cu);
    ctx->baton = &baton_local;
  
-@@ -1161,10 +1256,95 @@ dwarf_expr_push_dwarf_reg_entry_value (struct dwarf_expr_context *ctx,
+@@ -1166,10 +1261,95 @@ dwarf_expr_push_dwarf_reg_entry_value (struct dwarf_expr_context *ctx,
  
    ctx->gdbarch = saved_ctx.gdbarch;
    ctx->addr_size = saved_ctx.addr_size;
@@ -680,7 +680,7 @@ index 2282feb..13e7bbc 100644
  /* Callback function for dwarf2_evaluate_loc_desc.
     Fetch the address indexed by DW_OP_GNU_addr_index.  */
  
-@@ -2100,22 +2280,6 @@ invalid_synthetic_pointer (void)
+@@ -2105,22 +2285,6 @@ invalid_synthetic_pointer (void)
  	   "referenced via synthetic pointer"));
  }
  
@@ -703,7 +703,7 @@ index 2282feb..13e7bbc 100644
  /* Evaluate a location description, starting at DATA and with length
     SIZE, to find the current location of variable of TYPE in the
     context of FRAME.  BYTE_OFFSET is applied after the contents are
-@@ -2128,7 +2292,6 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
+@@ -2133,7 +2297,6 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
  			       LONGEST byte_offset)
  {
    struct value *retval;
@@ -711,7 +711,7 @@ index 2282feb..13e7bbc 100644
    struct dwarf_expr_context *ctx;
    struct cleanup *old_chain, *value_chain;
    struct objfile *objfile = dwarf2_per_cu_objfile (per_cu);
-@@ -2140,29 +2303,18 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
+@@ -2145,29 +2308,18 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
    if (size == 0)
      return allocate_optimized_out_value (type);
  
@@ -742,7 +742,7 @@ index 2282feb..13e7bbc 100644
  	  retval = allocate_value (type);
  	  mark_value_bytes_unavailable (retval, 0, TYPE_LENGTH (type));
  	  return retval;
-@@ -2226,6 +2378,16 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
+@@ -2231,6 +2383,16 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
  	    int in_stack_memory = dwarf_expr_fetch_in_stack_memory (ctx, 0);
  
  	    do_cleanups (value_chain);
@@ -759,7 +759,7 @@ index 2282feb..13e7bbc 100644
  	    retval = allocate_value_lazy (type);
  	    VALUE_LVAL (retval) = lval_memory;
  	    if (in_stack_memory)
-@@ -4143,8 +4305,7 @@ loclist_tracepoint_var_ref (struct symbol *symbol, struct gdbarch *gdbarch,
+@@ -4147,8 +4309,7 @@ loclist_tracepoint_var_ref (struct symbol *symbol, struct gdbarch *gdbarch,
  			       dlbaton->per_cu);
  }
  
@@ -769,7 +769,7 @@ index 2282feb..13e7bbc 100644
  const struct symbol_computed_ops dwarf2_loclist_funcs = {
    loclist_read_variable,
    loclist_read_variable_at_entry,
-@@ -4153,6 +4314,48 @@ const struct symbol_computed_ops dwarf2_loclist_funcs = {
+@@ -4157,6 +4318,48 @@ const struct symbol_computed_ops dwarf2_loclist_funcs = {
    loclist_tracepoint_var_ref
  };
  
@@ -839,10 +839,10 @@ index 36641b3..1394578 100644
  /* Compile a DWARF location expression to an agent expression.
     
 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
-index 7a58c45..98aebad 100644
+index d26e7c8..9fbe61e 100644
 --- a/gdb/dwarf2read.c
 +++ b/gdb/dwarf2read.c
-@@ -1613,6 +1613,9 @@ static void fill_in_loclist_baton (struct dwarf2_cu *cu,
+@@ -1624,6 +1624,9 @@ static void fill_in_loclist_baton (struct dwarf2_cu *cu,
  				   struct dwarf2_loclist_baton *baton,
  				   struct attribute *attr);
  
@@ -852,7 +852,7 @@ index 7a58c45..98aebad 100644
  static void dwarf2_symbol_mark_computed (struct attribute *attr,
  					 struct symbol *sym,
  					 struct dwarf2_cu *cu);
-@@ -1645,6 +1648,9 @@ static void age_cached_comp_units (void);
+@@ -1656,6 +1659,9 @@ static void age_cached_comp_units (void);
  
  static void free_one_cached_comp_unit (struct dwarf2_per_cu_data *);
  
@@ -862,7 +862,7 @@ index 7a58c45..98aebad 100644
  static struct type *set_die_type (struct die_info *, struct type *,
  				  struct dwarf2_cu *);
  
-@@ -1673,6 +1679,9 @@ static struct type *get_die_type_at_offset (sect_offset,
+@@ -1684,6 +1690,9 @@ static struct type *get_die_type_at_offset (sect_offset,
  
  static struct type *get_die_type (struct die_info *die, struct dwarf2_cu *cu);
  
@@ -872,7 +872,7 @@ index 7a58c45..98aebad 100644
  static void dwarf2_release_queue (void *dummy);
  
  static void queue_comp_unit (struct dwarf2_per_cu_data *per_cu,
-@@ -11677,6 +11686,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
+@@ -11702,6 +11711,29 @@ process_enumeration_scope (struct die_info *die, struct dwarf2_cu *cu)
    new_symbol (die, this_type, cu);
  }
  
@@ -902,16 +902,16 @@ index 7a58c45..98aebad 100644
  /* Extract all information from a DW_TAG_array_type DIE and put it in
     the DIE's type field.  For now, this only handles one dimensional
     arrays.  */
-@@ -11690,7 +11722,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -11715,7 +11747,7 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *element_type, *range_type, *index_type;
    struct type **range_types = NULL;
    struct attribute *attr;
 -  int ndim = 0;
 +  int ndim = 0, i;
    struct cleanup *back_to;
-   char *name;
+   const char *name;
  
-@@ -11743,17 +11775,19 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -11768,17 +11800,19 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu)
    type = element_type;
  
    if (read_array_order (die, cu) == DW_ORD_col_major)
@@ -942,7 +942,7 @@ index 7a58c45..98aebad 100644
  
    /* Understand Dwarf2 support for vector types (like they occur on
       the PowerPC w/ AltiVec).  Gcc just adds another attribute to the
-@@ -12379,29 +12413,114 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -12413,29 +12447,114 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu)
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
    struct type *type, *range_type, *index_type, *char_type;
    struct attribute *attr;
@@ -1070,16 +1070,16 @@ index 7a58c45..98aebad 100644
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -12705,7 +12824,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -12739,7 +12858,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
    struct type *base_type;
    struct type *range_type;
    struct attribute *attr;
 -  LONGEST low, high;
 +  LONGEST low;
    int low_default_is_valid;
-   char *name;
+   const char *name;
    LONGEST negative_mask;
-@@ -12761,42 +12880,6 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -12795,42 +12914,6 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  				      "- DIE at 0x%x [in module %s]"),
  	       die->offset.sect_off, cu->objfile->name);
  
@@ -1122,7 +1122,7 @@ index 7a58c45..98aebad 100644
    /* Dwarf-2 specifications explicitly allows to create subrange types
       without specifying a base type.
       In that case, the base type must be set to the type of
-@@ -12835,24 +12918,163 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
+@@ -12869,24 +12952,163 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu)
  	}
      }
  
@@ -1300,7 +1300,7 @@ index 7a58c45..98aebad 100644
  
    name = dwarf2_name (die, cu);
    if (name)
-@@ -15712,10 +15934,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
+@@ -15746,10 +15968,12 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
       (i.e. when the value of a register or memory location is
       referenced, or a thread-local block, etc.).  Then again, it might
       not be worthwhile.  I'm assuming that it isn't unless performance
@@ -1315,7 +1315,7 @@ index 7a58c45..98aebad 100644
  
    if (SYMBOL_COMPUTED_OPS (sym) == &dwarf2_loclist_funcs)
      cu->has_loclist = 1;
-@@ -15756,6 +15980,8 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+@@ -15790,6 +16014,8 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
        else
  	sym = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct symbol);
        OBJSTAT (objfile, n_syms++);
@@ -1324,7 +1324,7 @@ index 7a58c45..98aebad 100644
  
        /* Cache this symbol's name and the name's demangled form (if any).  */
        SYMBOL_SET_LANGUAGE (sym, cu->language);
-@@ -16565,6 +16791,9 @@ read_type_die_1 (struct die_info *die, struct dwarf2_cu *cu)
+@@ -16599,6 +16825,9 @@ read_type_die_1 (struct die_info *die, struct dwarf2_cu *cu)
        break;
      }
  
@@ -1334,7 +1334,7 @@ index 7a58c45..98aebad 100644
    return this_type;
  }
  
-@@ -18999,62 +19228,100 @@ fill_in_loclist_baton (struct dwarf2_cu *cu,
+@@ -19043,62 +19272,100 @@ fill_in_loclist_baton (struct dwarf2_cu *cu,
    baton->from_dwo = cu->dwo_unit != NULL;
  }
  
@@ -1473,7 +1473,7 @@ index 7a58c45..98aebad 100644
      }
  }
  
-@@ -19425,6 +19692,25 @@ per_cu_offset_and_type_eq (const void *item_lhs, const void *item_rhs)
+@@ -19469,6 +19736,25 @@ per_cu_offset_and_type_eq (const void *item_lhs, const void *item_rhs)
  	  && ofs_lhs->offset.sect_off == ofs_rhs->offset.sect_off);
  }
  
@@ -1499,7 +1499,7 @@ index 7a58c45..98aebad 100644
  /* Set the type associated with DIE to TYPE.  Save it in CU's hash
     table if necessary.  For convenience, return TYPE.
  
-@@ -19449,6 +19735,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
+@@ -19493,6 +19779,8 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
    struct dwarf2_per_cu_offset_and_type **slot, ofs;
    struct objfile *objfile = cu->objfile;
  
@@ -1509,7 +1509,7 @@ index 7a58c45..98aebad 100644
       initialized (if not already set).  There are a few types where
       we should not be doing so, because the type-specific area is
 diff --git a/gdb/eval.c b/gdb/eval.c
-index c9630df..b797189 100644
+index d7f80e2..8eca4c8 100644
 --- a/gdb/eval.c
 +++ b/gdb/eval.c
 @@ -41,6 +41,7 @@
@@ -1762,7 +1762,7 @@ index c9630df..b797189 100644
  
    pc = (*pos)++;
    op = exp->elts[pc].opcode;
-@@ -1779,6 +1971,8 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1776,6 +1968,8 @@ evaluate_subexp_standard (struct type *expect_type,
  
        /* First determine the type code we are dealing with.  */
        arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
@@ -1771,7 +1771,7 @@ index c9630df..b797189 100644
        type = check_typedef (value_type (arg1));
        code = TYPE_CODE (type);
  
-@@ -1799,23 +1993,13 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -1796,23 +1990,13 @@ evaluate_subexp_standard (struct type *expect_type,
  	      code = TYPE_CODE (type);
  	    }
  	} 
@@ -1797,7 +1797,7 @@ index c9630df..b797189 100644
  
  	case TYPE_CODE_PTR:
  	case TYPE_CODE_FUNC:
-@@ -2242,49 +2426,6 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2239,49 +2423,6 @@ evaluate_subexp_standard (struct type *expect_type,
  	}
        return (arg1);
  
@@ -1847,7 +1847,7 @@ index c9630df..b797189 100644
      case BINOP_LOGICAL_AND:
        arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
        if (noside == EVAL_SKIP)
-@@ -2516,15 +2657,23 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2513,15 +2654,23 @@ evaluate_subexp_standard (struct type *expect_type,
        if (expect_type && TYPE_CODE (expect_type) == TYPE_CODE_PTR)
  	expect_type = TYPE_TARGET_TYPE (check_typedef (expect_type));
        arg1 = evaluate_subexp (expect_type, exp, pos, noside);
@@ -1873,7 +1873,7 @@ index c9630df..b797189 100644
        else if (noside == EVAL_AVOID_SIDE_EFFECTS)
  	{
  	  type = check_typedef (value_type (arg1));
-@@ -2533,12 +2682,18 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2530,12 +2679,18 @@ evaluate_subexp_standard (struct type *expect_type,
  	  /* In C you can dereference an array to get the 1st elt.  */
  	      || TYPE_CODE (type) == TYPE_CODE_ARRAY
  	    )
@@ -1897,7 +1897,7 @@ index c9630df..b797189 100644
  	  else
  	    error (_("Attempt to take contents of a non-pointer value."));
  	}
-@@ -2548,9 +2703,14 @@ evaluate_subexp_standard (struct type *expect_type,
+@@ -2545,9 +2700,14 @@ evaluate_subexp_standard (struct type *expect_type,
  	 do.  "long long" variables are rare enough that
  	 BUILTIN_TYPE_LONGEST would seem to be a mistake.  */
        if (TYPE_CODE (type) == TYPE_CODE_INT)
@@ -1915,7 +1915,7 @@ index c9630df..b797189 100644
  
      case UNOP_ADDR:
        /* C++: check for and handle pointer to members.  */
-@@ -2963,7 +3123,7 @@ evaluate_subexp_with_coercion (struct expression *exp,
+@@ -2960,7 +3120,7 @@ evaluate_subexp_with_coercion (struct expression *exp,
  {
    enum exp_opcode op;
    int pc;
@@ -1924,7 +1924,7 @@ index c9630df..b797189 100644
    struct symbol *var;
    struct type *type;
  
-@@ -2974,13 +3134,18 @@ evaluate_subexp_with_coercion (struct expression *exp,
+@@ -2971,13 +3131,18 @@ evaluate_subexp_with_coercion (struct expression *exp,
      {
      case OP_VAR_VALUE:
        var = exp->elts[pc + 2].symbol;
@@ -1944,7 +1944,7 @@ index c9630df..b797189 100644
  	  return value_cast (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
  			     val);
  	}
-@@ -3038,9 +3203,13 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
+@@ -3035,9 +3200,13 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
  
      case OP_VAR_VALUE:
        (*pos) += 4;
@@ -1961,7 +1961,7 @@ index c9630df..b797189 100644
  
      default:
        val = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
-@@ -3071,18 +3240,25 @@ parse_and_eval_type (char *p, int length)
+@@ -3068,18 +3237,25 @@ parse_and_eval_type (char *p, int length)
  int
  calc_f77_array_dims (struct type *array_type)
  {
@@ -2096,7 +2096,7 @@ index aa33231..df998c4 100644
      {
      case TYPE_CODE_ARRAY:
 diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
-index 22cca83..b2a2cc3 100644
+index d01d6ec..8a21149 100644
 --- a/gdb/f-valprint.c
 +++ b/gdb/f-valprint.c
 @@ -51,15 +51,17 @@ int f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];
@@ -2382,7 +2382,7 @@ index ffb7f53..a2e7e94 100644
  
  b internal_error
 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
-index 5885241..a3db66a 100644
+index 12730d7..5a614e0 100644
 --- a/gdb/gdbtypes.c
 +++ b/gdb/gdbtypes.c
 @@ -37,6 +37,9 @@
@@ -2709,7 +2709,7 @@ index 5885241..a3db66a 100644
      }
  
    type = make_qualified_type (type, instance_flags, NULL);
-@@ -3387,33 +3522,42 @@ type_pair_eq (const void *item_lhs, const void *item_rhs)
+@@ -3384,33 +3519,42 @@ type_pair_eq (const void *item_lhs, const void *item_rhs)
  }
  
  /* Allocate the hash table used by copy_type_recursive to walk
@@ -2767,7 +2767,7 @@ index 5885241..a3db66a 100644
      return type;
  
    /* This type shouldn't be pointing to any types in other objfiles;
-@@ -3428,9 +3572,10 @@ copy_type_recursive (struct objfile *objfile,
+@@ -3425,9 +3569,10 @@ copy_type_recursive (struct objfile *objfile,
    new_type = alloc_type_arch (get_type_arch (type));
  
    /* We must add the new type to the hash table immediately, in case
@@ -2781,7 +2781,7 @@ index 5885241..a3db66a 100644
    stored->old = type;
    stored->new = new_type;
    *slot = stored;
-@@ -3441,6 +3586,21 @@ copy_type_recursive (struct objfile *objfile,
+@@ -3438,6 +3583,21 @@ copy_type_recursive (struct objfile *objfile,
    TYPE_OBJFILE_OWNED (new_type) = 0;
    TYPE_OWNER (new_type).gdbarch = get_type_arch (type);
  
@@ -2803,7 +2803,7 @@ index 5885241..a3db66a 100644
    if (TYPE_NAME (type))
      TYPE_NAME (new_type) = xstrdup (TYPE_NAME (type));
    if (TYPE_TAG_NAME (type))
-@@ -3449,12 +3609,48 @@ copy_type_recursive (struct objfile *objfile,
+@@ -3446,12 +3606,48 @@ copy_type_recursive (struct objfile *objfile,
    TYPE_INSTANCE_FLAGS (new_type) = TYPE_INSTANCE_FLAGS (type);
    TYPE_LENGTH (new_type) = TYPE_LENGTH (type);
  
@@ -2852,7 +2852,7 @@ index 5885241..a3db66a 100644
        TYPE_FIELDS (new_type) = XCALLOC (nfields, struct field);
        for (i = 0; i < nfields; i++)
  	{
-@@ -3463,8 +3659,8 @@ copy_type_recursive (struct objfile *objfile,
+@@ -3460,8 +3656,8 @@ copy_type_recursive (struct objfile *objfile,
  	  TYPE_FIELD_BITSIZE (new_type, i) = TYPE_FIELD_BITSIZE (type, i);
  	  if (TYPE_FIELD_TYPE (type, i))
  	    TYPE_FIELD_TYPE (new_type, i)
@@ -2863,7 +2863,7 @@ index 5885241..a3db66a 100644
  	  if (TYPE_FIELD_NAME (type, i))
  	    TYPE_FIELD_NAME (new_type, i) = 
  	      xstrdup (TYPE_FIELD_NAME (type, i));
-@@ -3495,24 +3691,184 @@ copy_type_recursive (struct objfile *objfile,
+@@ -3492,24 +3688,184 @@ copy_type_recursive (struct objfile *objfile,
  	}
      }
  
@@ -3055,7 +3055,7 @@ index 5885241..a3db66a 100644
    /* Maybe copy the type_specific bits.
  
       NOTE drow/2005-12-09: We do not copy the C++-specific bits like
-@@ -3529,6 +3885,17 @@ copy_type_recursive (struct objfile *objfile,
+@@ -3526,6 +3882,17 @@ copy_type_recursive (struct objfile *objfile,
    return new_type;
  }
  
@@ -3073,7 +3073,7 @@ index 5885241..a3db66a 100644
  /* Make a copy of the given TYPE, except that the pointer & reference
     types are not preserved.
     
-@@ -4093,6 +4460,13 @@ void
+@@ -4090,6 +4457,13 @@ void
  _initialize_gdbtypes (void)
  {
    gdbtypes_data = gdbarch_data_register_post_init (gdbtypes_post_init);
@@ -3088,7 +3088,7 @@ index 5885241..a3db66a 100644
  
    add_setshow_zuinteger_cmd ("overload", no_class, &overload_debug,
 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
-index 8b340a3..aea1c96 100644
+index 0ca7a87..c6029dc 100644
 --- a/gdb/gdbtypes.h
 +++ b/gdb/gdbtypes.h
 @@ -226,6 +226,11 @@ enum type_instance_flag_value
@@ -3320,7 +3320,7 @@ index 8b340a3..aea1c96 100644
  
  extern struct type *copy_type (const struct type *type);
 diff --git a/gdb/main.c b/gdb/main.c
-index c9439bb..6c4acc4 100644
+index 06f3feb..141a01b 100644
 --- a/gdb/main.c
 +++ b/gdb/main.c
 @@ -37,6 +37,7 @@
@@ -3340,7 +3340,7 @@ index c9439bb..6c4acc4 100644
    /* These are static so that we can take their address in an
       initializer.  */
    static int print_help;
-@@ -502,10 +505,14 @@ captured_main (void *data)
+@@ -504,10 +507,14 @@ captured_main (void *data)
        {"args", no_argument, &set_args, 1},
        {"l", required_argument, 0, 'l'},
        {"return-child-result", no_argument, &return_child_result, 1},
@@ -3356,7 +3356,7 @@ index c9439bb..6c4acc4 100644
        {
  	int option_index;
  
-@@ -523,6 +530,9 @@ captured_main (void *data)
+@@ -525,6 +532,9 @@ captured_main (void *data)
  	  case 0:
  	    /* Long option that just sets a flag.  */
  	    break;
@@ -3366,7 +3366,7 @@ index c9439bb..6c4acc4 100644
  	  case OPT_SE:
  	    symarg = optarg;
  	    execarg = optarg;
-@@ -731,7 +741,31 @@ captured_main (void *data)
+@@ -733,7 +743,31 @@ captured_main (void *data)
  
    /* Now that gdb_init has created the initial inferior, we're in
       position to set args for that inferior.  */
@@ -3399,7 +3399,7 @@ index c9439bb..6c4acc4 100644
      {
        /* The remaining options are the command-line options for the
  	 inferior.  The first one is the sym/exec file, and the rest
-@@ -1011,7 +1045,8 @@ captured_main (void *data)
+@@ -1013,7 +1047,8 @@ captured_main (void *data)
  
    /* Read in the old history after all the command files have been
       read.  */
@@ -3409,7 +3409,7 @@ index c9439bb..6c4acc4 100644
  
    if (batch_flag)
      {
-@@ -1022,13 +1057,25 @@ captured_main (void *data)
+@@ -1024,13 +1059,25 @@ captured_main (void *data)
    /* Show time and/or space usage.  */
    do_cleanups (pre_stat_chain);
  
@@ -3441,7 +3441,7 @@ index c9439bb..6c4acc4 100644
      }
    /* No exit -- exit is through quit_command.  */
  }
-@@ -1060,7 +1107,12 @@ print_gdb_help (struct ui_file *stream)
+@@ -1062,7 +1109,12 @@ print_gdb_help (struct ui_file *stream)
    fputs_unfiltered (_("\
  This is the GNU debugger.  Usage:\n\n\
      gdb [options] [executable-file [core-file or process-id]]\n\
@@ -3455,7 +3455,7 @@ index c9439bb..6c4acc4 100644
  Options:\n\n\
  "), stream);
    fputs_unfiltered (_("\
-@@ -1103,7 +1155,13 @@ Options:\n\n\
+@@ -1104,7 +1156,13 @@ Options:\n\n\
    fputs_unfiltered (_(" files.\n\
    --nh               Do not read "), stream);
    fputs_unfiltered (gdbinit, stream);
@@ -3681,18 +3681,18 @@ index 8d25311..233ed46 100644
  						void *data),
  			   void *data);
 diff --git a/gdb/printcmd.c b/gdb/printcmd.c
-index a576d88..273a5e1 100644
+index 155703d..545a615 100644
 --- a/gdb/printcmd.c
 +++ b/gdb/printcmd.c
-@@ -50,6 +50,7 @@
- #include "arch-utils.h"
+@@ -51,6 +51,7 @@
  #include "cli/cli-utils.h"
  #include "format.h"
+ #include "source.h"
 +#include "dwarf2loc.h"
  
  #ifdef TUI
  #include "tui/tui.h"		/* For tui_active et al.   */
-@@ -966,6 +967,11 @@ print_command_1 (char *exp, int voidprint)
+@@ -967,6 +968,11 @@ print_command_1 (char *exp, int voidprint)
    else
      val = access_value_history (0);
  
@@ -3704,7 +3704,7 @@ index a576d88..273a5e1 100644
    if (voidprint || (val && value_type (val) &&
  		    TYPE_CODE (value_type (val)) != TYPE_CODE_VOID))
      {
-@@ -1038,6 +1044,9 @@ output_command (char *exp, int from_tty)
+@@ -1039,6 +1045,9 @@ output_command (char *exp, int from_tty)
  
    val = evaluate_expression (expr);
  
@@ -3714,7 +3714,7 @@ index a576d88..273a5e1 100644
    annotate_value_begin (value_type (val));
  
    get_formatted_print_options (&opts, format);
-@@ -1466,6 +1475,24 @@ x_command (char *exp, int from_tty)
+@@ -1467,6 +1476,24 @@ x_command (char *exp, int from_tty)
  	set_internalvar (lookup_internalvar ("__"), last_examine_value);
      }
  }
@@ -3739,7 +3739,7 @@ index a576d88..273a5e1 100644
  
  
  /* Add an expression to the auto-display chain.
-@@ -1963,6 +1990,10 @@ print_variable_and_value (const char *name, struct symbol *var,
+@@ -1964,6 +1991,10 @@ print_variable_and_value (const char *name, struct symbol *var,
        struct value_print_options opts;
  
        val = read_var_value (var, frame);
@@ -3750,7 +3750,7 @@ index a576d88..273a5e1 100644
        get_user_print_options (&opts);
        opts.deref_ref = 1;
        common_val_print (val, stream, indent, &opts, current_language);
-@@ -2602,4 +2633,8 @@ Show printing of source filename and line number with <symbol>."), NULL,
+@@ -2613,4 +2644,8 @@ Show printing of source filename and line number with <symbol>."), NULL,
    add_com ("eval", no_class, eval_command, _("\
  Convert \"printf format string\", arg1, arg2, arg3, ..., argn to\n\
  a command line, and call it."));
@@ -4522,7 +4522,7 @@ index 0000000..debb3bb
 +
 +InScope ()
 diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
-index 31b7776..56085d1 100644
+index 051cff0..e2f2ebe 100644
 --- a/gdb/python/py-type.c
 +++ b/gdb/python/py-type.c
 @@ -31,6 +31,8 @@
@@ -4762,7 +4762,7 @@ index 11cc038..ef238f6 100644
  
  
 diff --git a/gdb/python/python.c b/gdb/python/python.c
-index b0f71a2..d2248c1 100644
+index 8dd65a1..82c6c86 100644
 --- a/gdb/python/python.c
 +++ b/gdb/python/python.c
 @@ -66,6 +66,8 @@ static const char *gdbpy_should_print_stack = python_excp_message;
@@ -4828,7 +4828,7 @@ index b0f71a2..d2248c1 100644
  
  static PyObject *
  gdbpy_get_current_progspace (PyObject *unused1, PyObject *unused2)
-@@ -1734,6 +1783,8 @@ static PyMethodDef GdbMethods[] =
+@@ -1733,6 +1782,8 @@ static PyMethodDef GdbMethods[] =
      "Get a value from history" },
    { "execute", (PyCFunction) execute_gdb_command, METH_VARARGS | METH_KEYWORDS,
      "Execute a gdb command" },
@@ -4851,10 +4851,10 @@ index 24e3077..0443087 100644
  			      int embedded_offset, CORE_ADDR address,
  			      struct ui_file *stream, int recurse,
 diff --git a/gdb/stack.c b/gdb/stack.c
-index a9dabb5..6c78436 100644
+index 147d815..51115cf 100644
 --- a/gdb/stack.c
 +++ b/gdb/stack.c
-@@ -510,6 +510,10 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
+@@ -508,6 +508,10 @@ print_frame_args (struct symbol *func, struct frame_info *frame,
    stb = mem_fileopen ();
    old_chain = make_cleanup_ui_file_delete (stb);
  
@@ -7929,7 +7929,7 @@ index 0000000..4747ea9
 +  write (*,*) a                 ! break-static
 +end
 diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
-index 351fa87..0b5db6e 100644
+index 55e13cf..441c28b 100644
 --- a/gdb/testsuite/gdb.gdb/selftest.exp
 +++ b/gdb/testsuite/gdb.gdb/selftest.exp
 @@ -91,6 +91,10 @@ proc do_steps_and_nexts {} {
@@ -7977,7 +7977,7 @@ index 0000000..ebced3c
 +}
 diff --git a/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp b/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 new file mode 100644
-index 0000000..74a104e
+index 0000000..99b6cc7
 --- /dev/null
 +++ b/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 @@ -0,0 +1,57 @@
@@ -8027,7 +8027,7 @@ index 0000000..74a104e
 +set func "main"
 +
 +mi_gdb_test "-break-insert -t $srcfile:$line" \
-+  "\\^done,bkpt=\{number=\"\[0-9\]+\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"$func\(\\\(.*\\\)\)?\",file=\".*\",line=\"$line\",times=\"0\",original-location=\".*\"\}" \
++  "\\^done,bkpt=\{number=\"\[0-9\]+\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"$func\(\\\(.*\\\)\)?\",file=\".*\",fullname=\".*\",line=\"$line\",\[^\r\n\]*,original-location=\".*\"\}" \
 +  "breakpoint at $func"
 +
 +if { [mi_run_cmd] < 0 } {
@@ -8338,10 +8338,10 @@ index 0000000..295602d
 +  writeln(s); { set breakpoint 2 here }
 +end.
 diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
-index aa4d937..60d2cc8 100644
+index 806da94..b22231a 100644
 --- a/gdb/testsuite/gdb.python/py-frame.exp
 +++ b/gdb/testsuite/gdb.python/py-frame.exp
-@@ -90,3 +90,5 @@ gdb_test "python print ('result = %s' % f0.read_var ('variable_which_surely_does
+@@ -94,3 +94,5 @@ gdb_test "python print ('result = %s' % f0.read_var ('variable_which_surely_does
  gdb_test "python print ('result = %s' % f0.read_var ('a'))" " = 1" "test Frame.read_var - success"
  
  gdb_test "python print ('result = %s' % (gdb.selected_frame () == f1))" " = True" "test gdb.selected_frame"
@@ -8427,7 +8427,7 @@ index 569fb02..cacecf4 100644
      set pascal_init_done 1
  }   
 diff --git a/gdb/top.c b/gdb/top.c
-index e9d6c1c..7fe6ad1 100644
+index e9a40fc..de051c8 100644
 --- a/gdb/top.c
 +++ b/gdb/top.c
 @@ -350,6 +350,9 @@ prepare_execute_command (void)
@@ -8479,10 +8479,10 @@ index 2d5a6af..5251e3f 100644
  
    get_user_print_options (&opts);
 diff --git a/gdb/utils.c b/gdb/utils.c
-index 8bae4eb..6eb5877 100644
+index eb99f4b..2e17e8e 100644
 --- a/gdb/utils.c
 +++ b/gdb/utils.c
-@@ -1821,6 +1821,36 @@ set_batch_flag_and_make_cleanup_restore_page_info (void)
+@@ -1804,6 +1804,36 @@ set_batch_flag_and_make_cleanup_restore_page_info (void)
    return back_to;
  }
  
@@ -8520,10 +8520,10 @@ index 8bae4eb..6eb5877 100644
  
  static void
 diff --git a/gdb/utils.h b/gdb/utils.h
-index 6983a53..0efa553 100644
+index 52bcaff..6ab417b 100644
 --- a/gdb/utils.h
 +++ b/gdb/utils.h
-@@ -380,4 +380,6 @@ extern int myread (int, char *, int);
+@@ -375,4 +375,6 @@ extern int myread (int, char *, int);
  extern ULONGEST align_up (ULONGEST v, int n);
  extern ULONGEST align_down (ULONGEST v, int n);
  
@@ -8531,7 +8531,7 @@ index 6983a53..0efa553 100644
 +
  #endif /* UTILS_H */
 diff --git a/gdb/valarith.c b/gdb/valarith.c
-index 074cf36..5c44edc 100644
+index 18c14fc..0a3a3aa 100644
 --- a/gdb/valarith.c
 +++ b/gdb/valarith.c
 @@ -195,7 +195,10 @@ value_subscripted_rvalue (struct value *array, LONGEST index, int lowerbound)
@@ -8558,7 +8558,7 @@ index 074cf36..5c44edc 100644
  }
  
 diff --git a/gdb/valops.c b/gdb/valops.c
-index e3d36a1..a6bda4d 100644
+index 93c09d8..aef0991 100644
 --- a/gdb/valops.c
 +++ b/gdb/valops.c
 @@ -45,6 +45,7 @@
@@ -8569,7 +8569,7 @@ index e3d36a1..a6bda4d 100644
  
  extern unsigned int overload_debug;
  /* Local functions.  */
-@@ -919,6 +920,65 @@ value_one (struct type *type)
+@@ -903,6 +904,65 @@ value_one (struct type *type)
    return val;
  }
  
@@ -8635,7 +8635,7 @@ index e3d36a1..a6bda4d 100644
  /* Helper function for value_at, value_at_lazy, and value_at_lazy_stack.  */
  
  static struct value *
-@@ -981,7 +1041,8 @@ int
+@@ -965,7 +1025,8 @@ int
  value_fetch_lazy (struct value *val)
  {
    gdb_assert (value_lazy (val));
@@ -8645,7 +8645,7 @@ index e3d36a1..a6bda4d 100644
    if (value_bitsize (val))
      {
        /* To read a lazy bitfield, read the entire enclosing value.  This
-@@ -1014,13 +1075,24 @@ value_fetch_lazy (struct value *val)
+@@ -998,13 +1059,24 @@ value_fetch_lazy (struct value *val)
      }
    else if (VALUE_LVAL (val) == lval_memory)
      {
@@ -8718,7 +8718,7 @@ index e3d36a1..a6bda4d 100644
  }
  
  /* Given a value which is a function, return a value which is a pointer
-@@ -3724,6 +3812,8 @@ value_slice (struct value *array, int lowbound, int length)
+@@ -3721,6 +3809,8 @@ value_slice (struct value *array, int lowbound, int length)
  					TYPE_TARGET_TYPE (range_type),
  					lowbound, 
  					lowbound + length - 1);
@@ -8728,7 +8728,7 @@ index e3d36a1..a6bda4d 100644
      {
        struct type *element_type = TYPE_TARGET_TYPE (array_type);
 diff --git a/gdb/valprint.c b/gdb/valprint.c
-index 42dacc5..6977f62 100644
+index 05d6c3e..5430e66 100644
 --- a/gdb/valprint.c
 +++ b/gdb/valprint.c
 @@ -37,6 +37,7 @@
@@ -8747,7 +8747,7 @@ index 42dacc5..6977f62 100644
        return 0;
      default:
        return 1;
-@@ -1605,6 +1605,7 @@ val_print_array_elements (struct type *type,
+@@ -1604,6 +1604,7 @@ val_print_array_elements (struct type *type,
  {
    unsigned int things_printed = 0;
    unsigned len;
@@ -8755,7 +8755,7 @@ index 42dacc5..6977f62 100644
    struct type *elttype, *index_type;
    unsigned eltlen;
    /* Position of the array element we are examining to see
-@@ -1613,9 +1614,33 @@ val_print_array_elements (struct type *type,
+@@ -1612,9 +1613,33 @@ val_print_array_elements (struct type *type,
    /* Number of repetitions we have detected so far.  */
    unsigned int reps;
    LONGEST low_bound, high_bound;
@@ -8791,7 +8791,7 @@ index 42dacc5..6977f62 100644
    index_type = TYPE_INDEX_TYPE (type);
  
    if (get_array_bounds (type, &low_bound, &high_bound))
-@@ -1702,6 +1727,8 @@ val_print_array_elements (struct type *type,
+@@ -1701,6 +1726,8 @@ val_print_array_elements (struct type *type,
      {
        fprintf_filtered (stream, "...");
      }
@@ -8801,7 +8801,7 @@ index 42dacc5..6977f62 100644
  
  /* Read LEN bytes of target memory at address MEMADDR, placing the
 diff --git a/gdb/value.c b/gdb/value.c
-index ec4b090..96a308f 100644
+index 4b70ece..7449c2a 100644
 --- a/gdb/value.c
 +++ b/gdb/value.c
 @@ -42,6 +42,7 @@
@@ -8812,7 +8812,7 @@ index ec4b090..96a308f 100644
  
  /* Prototypes for exported functions.  */
  
-@@ -1440,12 +1441,15 @@ void
+@@ -1435,12 +1436,15 @@ void
  set_value_component_location (struct value *component,
  			      const struct value *whole)
  {
@@ -8828,7 +8828,7 @@ index ec4b090..96a308f 100644
    if (whole->lval == lval_computed)
      {
        const struct lval_funcs *funcs = whole->location.computed.funcs;
-@@ -1453,6 +1457,12 @@ set_value_component_location (struct value *component,
+@@ -1448,6 +1452,12 @@ set_value_component_location (struct value *component,
        if (funcs->copy_closure)
          component->location.computed.closure = funcs->copy_closure (whole);
      }
@@ -8841,7 +8841,7 @@ index ec4b090..96a308f 100644
  }
  
  
-@@ -1586,6 +1596,31 @@ show_values (char *num_exp, int from_tty)
+@@ -1581,6 +1591,31 @@ show_values (char *num_exp, int from_tty)
        num_exp[1] = '\0';
      }
  }
@@ -8873,7 +8873,7 @@ index ec4b090..96a308f 100644
  
  /* Internal variables.  These are variables within the debugger
     that hold values assigned by debugger commands.
-@@ -2121,6 +2156,38 @@ call_internal_function (struct gdbarch *gdbarch,
+@@ -2116,6 +2151,38 @@ call_internal_function (struct gdbarch *gdbarch,
    return (*ifn->handler) (gdbarch, language, ifn->cookie, argc, argv);
  }
  
@@ -8912,7 +8912,7 @@ index ec4b090..96a308f 100644
  /* The 'function' command.  This does nothing -- it is just a
     placeholder to let "help function NAME" work.  This is also used as
     the implementation of the sub-command that is created when
-@@ -2168,11 +2235,10 @@ preserve_one_value (struct value *value, struct objfile *objfile,
+@@ -2163,11 +2230,10 @@ preserve_one_value (struct value *value, struct objfile *objfile,
  		    htab_t copied_types)
  {
    if (TYPE_OBJFILE (value->type) == objfile)
@@ -8926,7 +8926,7 @@ index ec4b090..96a308f 100644
  						 copied_types);
  }
  
-@@ -2187,7 +2253,7 @@ preserve_one_internalvar (struct internalvar *var, struct objfile *objfile,
+@@ -2182,7 +2248,7 @@ preserve_one_internalvar (struct internalvar *var, struct objfile *objfile,
      case INTERNALVAR_INTEGER:
        if (var->u.integer.type && TYPE_OBJFILE (var->u.integer.type) == objfile)
  	var->u.integer.type
@@ -8935,7 +8935,7 @@ index ec4b090..96a308f 100644
        break;
  
      case INTERNALVAR_VALUE:
-@@ -3285,10 +3351,27 @@ readjust_indirect_value_type (struct value *value, struct type *enc_type,
+@@ -3280,10 +3346,27 @@ readjust_indirect_value_type (struct value *value, struct type *enc_type,
  struct value *
  coerce_ref (struct value *arg)
  {
@@ -8964,7 +8964,7 @@ index ec4b090..96a308f 100644
    retval = coerce_ref_if_computed (arg);
    if (retval)
      return retval;
-@@ -3400,4 +3483,10 @@ VARIABLE is already initialized."));
+@@ -3405,4 +3488,10 @@ VARIABLE is already initialized."));
    add_prefix_cmd ("function", no_class, function_command, _("\
  Placeholder command for showing help on convenience functions."),
  		  &functionlist, "function ", 0, &cmdlist);
@@ -8976,10 +8976,10 @@ index ec4b090..96a308f 100644
 +#endif
  }
 diff --git a/gdb/value.h b/gdb/value.h
-index 67f1d04..2d2b830 100644
+index c10c3ec..8d07348 100644
 --- a/gdb/value.h
 +++ b/gdb/value.h
-@@ -533,6 +533,10 @@ extern struct value *value_from_decfloat (struct type *type,
+@@ -537,6 +537,10 @@ extern struct value *value_from_decfloat (struct type *type,
  					  const gdb_byte *decbytes);
  extern struct value *value_from_history_ref (char *, char **);
  
diff --git a/gdb-attach-fail-reasons-5of5.patch b/gdb-attach-fail-reasons-5of5.patch
index 773457e..a98e256 100644
--- a/gdb-attach-fail-reasons-5of5.patch
+++ b/gdb-attach-fail-reasons-5of5.patch
@@ -37,10 +37,10 @@ gdb/gdbserver/
 	(linux_create_inferior, linux_tracefork_child): Call it instead of
 	direct ptrace.
 
-Index: gdb-7.5.50.20130118/gdb/common/linux-ptrace.c
+Index: gdb-7.5.50.20130215/gdb/common/linux-ptrace.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/common/linux-ptrace.c	2013-01-18 23:18:47.313360065 +0100
-+++ gdb-7.5.50.20130118/gdb/common/linux-ptrace.c	2013-01-18 23:19:27.269417051 +0100
+--- gdb-7.5.50.20130215.orig/gdb/common/linux-ptrace.c	2013-01-08 20:38:51.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/common/linux-ptrace.c	2013-02-15 22:38:05.782456279 +0100
 @@ -29,6 +29,10 @@
  #include "gdb_assert.h"
  #include "gdb_wait.h"
@@ -81,10 +81,10 @@ Index: gdb-7.5.50.20130118/gdb/common/linux-ptrace.c
 +			 "(gdb) shell sudo setsebool deny_ptrace=0"));
 +#endif /* HAVE_LIBSELINUX */
 +}
-Index: gdb-7.5.50.20130118/gdb/common/linux-ptrace.h
+Index: gdb-7.5.50.20130215/gdb/common/linux-ptrace.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/common/linux-ptrace.h	2013-01-18 23:18:47.313360065 +0100
-+++ gdb-7.5.50.20130118/gdb/common/linux-ptrace.h	2013-01-18 23:19:04.990385360 +0100
+--- gdb-7.5.50.20130215.orig/gdb/common/linux-ptrace.h	2013-01-01 07:32:54.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/common/linux-ptrace.h	2013-02-15 22:38:05.782456279 +0100
 @@ -69,5 +69,6 @@ struct buffer;
  
  extern void linux_ptrace_attach_warnings (pid_t pid, struct buffer *buffer);
@@ -92,10 +92,10 @@ Index: gdb-7.5.50.20130118/gdb/common/linux-ptrace.h
 +extern void linux_ptrace_create_warnings (struct buffer *buffer);
  
  #endif /* COMMON_LINUX_PTRACE_H */
-Index: gdb-7.5.50.20130118/gdb/configure.ac
+Index: gdb-7.5.50.20130215/gdb/configure.ac
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/configure.ac	2013-01-18 23:18:47.315360069 +0100
-+++ gdb-7.5.50.20130118/gdb/configure.ac	2013-01-18 23:19:04.991385362 +0100
+--- gdb-7.5.50.20130215.orig/gdb/configure.ac	2013-02-15 22:37:57.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/configure.ac	2013-02-15 22:38:05.783456281 +0100
 @@ -2068,6 +2068,10 @@ then
  	      [Define if you support the personality syscall.])
  fi
@@ -107,10 +107,10 @@ Index: gdb-7.5.50.20130118/gdb/configure.ac
  dnl Handle optional features that can be enabled.
  
  # Support for --with-sysroot is a copy of GDB_AC_WITH_DIR,
-Index: gdb-7.5.50.20130118/gdb/gdbserver/configure.ac
+Index: gdb-7.5.50.20130215/gdb/gdbserver/configure.ac
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/gdbserver/configure.ac	2013-01-18 23:18:47.315360069 +0100
-+++ gdb-7.5.50.20130118/gdb/gdbserver/configure.ac	2013-01-18 23:19:04.991385362 +0100
+--- gdb-7.5.50.20130215.orig/gdb/gdbserver/configure.ac	2013-01-01 07:33:00.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/gdbserver/configure.ac	2013-02-15 22:38:05.783456281 +0100
 @@ -451,6 +451,10 @@ if $want_ipa ; then
     fi
  fi
@@ -122,11 +122,11 @@ Index: gdb-7.5.50.20130118/gdb/gdbserver/configure.ac
  AC_SUBST(GDBSERVER_DEPFILES)
  AC_SUBST(GDBSERVER_LIBS)
  AC_SUBST(USE_THREAD_DB)
-Index: gdb-7.5.50.20130118/gdb/gdbserver/linux-low.c
+Index: gdb-7.5.50.20130215/gdb/gdbserver/linux-low.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/gdbserver/linux-low.c	2013-01-18 23:18:47.317360073 +0100
-+++ gdb-7.5.50.20130118/gdb/gdbserver/linux-low.c	2013-01-18 23:19:04.993385366 +0100
-@@ -601,6 +601,28 @@ add_lwp (ptid_t ptid)
+--- gdb-7.5.50.20130215.orig/gdb/gdbserver/linux-low.c	2013-02-04 18:47:00.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/gdbserver/linux-low.c	2013-02-15 22:39:54.256591069 +0100
+@@ -602,6 +602,29 @@ add_lwp (ptid_t ptid)
    return lwp;
  }
  
@@ -139,7 +139,8 @@ Index: gdb-7.5.50.20130118/gdb/gdbserver/linux-low.c
 +  struct buffer buffer;
 +
 +  errno = 0;
-+  if (ptrace (PTRACE_TRACEME, 0, NULL, NULL) == 0)
++  if (ptrace (PTRACE_TRACEME, 0,
++	      (PTRACE_ARG3_TYPE) 0, (PTRACE_ARG4_TYPE) 0) == 0)
 +    return;
 +
 +  save_errno = errno;
@@ -155,28 +156,28 @@ Index: gdb-7.5.50.20130118/gdb/gdbserver/linux-low.c
  /* Start an inferior process and returns its pid.
     ALLARGS is a vector of program-name and args. */
  
-@@ -641,7 +663,7 @@ linux_create_inferior (char *program, ch
+@@ -642,7 +665,7 @@ linux_create_inferior (char *program, ch
  
    if (pid == 0)
      {
--      ptrace (PTRACE_TRACEME, 0, 0, 0);
+-      ptrace (PTRACE_TRACEME, 0, (PTRACE_ARG3_TYPE) 0, (PTRACE_ARG4_TYPE) 0);
 +      linux_traceme (program);
  
  #ifndef __ANDROID__ /* Bionic doesn't use SIGRTMIN the way glibc does.  */
        signal (__SIGRTMIN + 1, SIG_DFL);
-@@ -4574,7 +4596,7 @@ linux_tracefork_grandchild (void *arg)
+@@ -4587,7 +4610,7 @@ linux_tracefork_grandchild (void *arg)
  static int
  linux_tracefork_child (void *arg)
  {
--  ptrace (PTRACE_TRACEME, 0, 0, 0);
+-  ptrace (PTRACE_TRACEME, 0, (PTRACE_ARG3_TYPE) 0, (PTRACE_ARG4_TYPE) 0);
 +  linux_traceme ("PTRACE_O_TRACEFORK test");
    kill (getpid (), SIGSTOP);
  
  #if !(defined(__UCLIBC__) && defined(HAS_NOMMU))
-Index: gdb-7.5.50.20130118/gdb/inf-ptrace.c
+Index: gdb-7.5.50.20130215/gdb/inf-ptrace.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/inf-ptrace.c	2013-01-18 23:18:47.318360076 +0100
-+++ gdb-7.5.50.20130118/gdb/inf-ptrace.c	2013-01-18 23:19:04.993385366 +0100
+--- gdb-7.5.50.20130215.orig/gdb/inf-ptrace.c	2013-01-01 07:32:45.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/inf-ptrace.c	2013-02-15 22:38:05.786456289 +0100
 @@ -104,7 +104,15 @@ static void
  inf_ptrace_me (void)
  {
@@ -193,11 +194,11 @@ Index: gdb-7.5.50.20130118/gdb/inf-ptrace.c
  }
  
  /* Start a new inferior Unix child process.  EXEC_FILE is the file to
-Index: gdb-7.5.50.20130118/gdb/linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/linux-nat.c	2013-01-18 23:18:47.320360083 +0100
-+++ gdb-7.5.50.20130118/gdb/linux-nat.c	2013-01-18 23:19:04.994385369 +0100
-@@ -1578,6 +1578,7 @@ linux_nat_create_inferior (struct target
+--- gdb-7.5.50.20130215.orig/gdb/linux-nat.c	2013-02-15 22:34:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/linux-nat.c	2013-02-15 22:38:05.787456291 +0100
+@@ -1557,6 +1557,7 @@ linux_nat_create_inferior (struct target
  #ifdef HAVE_PERSONALITY
    int personality_orig = 0, personality_set = 0;
  #endif /* HAVE_PERSONALITY */
@@ -205,7 +206,7 @@ Index: gdb-7.5.50.20130118/gdb/linux-nat.c
  
    /* The fork_child mechanism is synchronous and calls target_wait, so
       we have to mask the async mode.  */
-@@ -1602,7 +1603,10 @@ linux_nat_create_inferior (struct target
+@@ -1581,7 +1582,10 @@ linux_nat_create_inferior (struct target
    /* Make sure we report all signals during startup.  */
    linux_nat_pass_signals (0, NULL);
  
@@ -217,7 +218,7 @@ Index: gdb-7.5.50.20130118/gdb/linux-nat.c
  
  #ifdef HAVE_PERSONALITY
    if (personality_set)
-@@ -1614,6 +1618,24 @@ linux_nat_create_inferior (struct target
+@@ -1593,6 +1597,24 @@ linux_nat_create_inferior (struct target
  		 safe_strerror (errno));
      }
  #endif /* HAVE_PERSONALITY */
diff --git a/gdb-dlopen-stap-probe-6of7.patch b/gdb-dlopen-stap-probe-6of7.patch
index af44305..aca4bfd 100644
--- a/gdb-dlopen-stap-probe-6of7.patch
+++ b/gdb-dlopen-stap-probe-6of7.patch
@@ -81,24 +81,24 @@ gdb/testsuite
 	* gdb.base/break-dlmopen.c: Likewise.
 	* gdb.base/break-dlmopen-solib.c: Likewise.
 
-Index: gdb-7.5.50.20130118/gdb/breakpoint.h
+Index: gdb-7.5.50.20130215/gdb/breakpoint.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/breakpoint.h	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/breakpoint.h	2013-01-18 23:57:50.511792890 +0100
-@@ -1548,8 +1548,6 @@ extern int user_breakpoint_p (struct bre
+--- gdb-7.5.50.20130215.orig/gdb/breakpoint.h	2013-02-15 22:37:19.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/breakpoint.h	2013-02-15 22:37:47.185432296 +0100
+@@ -1552,8 +1552,6 @@ extern int user_breakpoint_p (struct bre
  /* Attempt to determine architecture of location identified by SAL.  */
  extern struct gdbarch *get_sal_arch (struct symtab_and_line sal);
  
 -extern void handle_solib_event (void);
 -
- extern void breakpoints_relocate (struct objfile *objfile,
- 				  struct section_offsets *delta);
+ extern void breakpoint_free_objfile (struct objfile *objfile);
  
-Index: gdb-7.5.50.20130118/gdb/breakpoint.c
+ extern void breakpoints_relocate (struct objfile *objfile,
+Index: gdb-7.5.50.20130215/gdb/breakpoint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/breakpoint.c	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/breakpoint.c	2013-01-18 23:57:50.514792879 +0100
-@@ -5254,7 +5254,7 @@ bpstat_stop_status (struct address_space
+--- gdb-7.5.50.20130215.orig/gdb/breakpoint.c	2013-02-15 22:37:30.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/breakpoint.c	2013-02-15 22:37:35.755417584 +0100
+@@ -5250,7 +5250,7 @@ bpstat_stop_status (struct address_space
      {
        if (bs->breakpoint_at && bs->breakpoint_at->type == bp_shlib_event)
  	{
@@ -107,7 +107,7 @@ Index: gdb-7.5.50.20130118/gdb/breakpoint.c
  	  break;
  	}
      }
-@@ -5350,25 +5350,6 @@ handle_jit_event (void)
+@@ -5346,25 +5346,6 @@ handle_jit_event (void)
    target_terminal_inferior ();
  }
  
@@ -133,10 +133,10 @@ Index: gdb-7.5.50.20130118/gdb/breakpoint.c
  /* Prepare WHAT final decision for infrun.  */
  
  /* Decide what infrun needs to do with this bpstat.  */
-Index: gdb-7.5.50.20130118/gdb/solib.h
+Index: gdb-7.5.50.20130215/gdb/solib.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/solib.h	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/solib.h	2013-01-18 23:57:50.515792875 +0100
+--- gdb-7.5.50.20130215.orig/gdb/solib.h	2013-01-01 07:32:51.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/solib.h	2013-02-15 22:37:35.757417588 +0100
 @@ -20,6 +20,9 @@
  #ifndef SOLIB_H
  #define SOLIB_H
@@ -163,10 +163,10 @@ Index: gdb-7.5.50.20130118/gdb/solib.h
 +extern void update_solib_breakpoints (void);
 +
  #endif /* SOLIB_H */
-Index: gdb-7.5.50.20130118/gdb/solib.c
+Index: gdb-7.5.50.20130215/gdb/solib.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/solib.c	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/solib.c	2013-01-18 23:58:09.144716601 +0100
+--- gdb-7.5.50.20130215.orig/gdb/solib.c	2013-02-15 22:37:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/solib.c	2013-02-15 22:37:35.757417588 +0100
 @@ -1221,6 +1221,42 @@ no_shared_libraries (char *ignored, int
    objfile_purge_solibs ();
  }
@@ -210,10 +210,10 @@ Index: gdb-7.5.50.20130118/gdb/solib.c
  /* Reload shared libraries, but avoid reloading the same symbol file
     we already have loaded.  */
  
-Index: gdb-7.5.50.20130118/gdb/solist.h
+Index: gdb-7.5.50.20130215/gdb/solist.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/solist.h	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/solist.h	2013-01-18 23:57:50.515792875 +0100
+--- gdb-7.5.50.20130215.orig/gdb/solist.h	2013-01-01 07:32:51.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/solist.h	2013-02-15 22:37:35.758417590 +0100
 @@ -22,6 +22,8 @@
  #define SO_NAME_MAX_PATH_SIZE 512	/* FIXME: Should be dynamic */
  /* For domain_enum domain.  */
@@ -244,10 +244,10 @@ Index: gdb-7.5.50.20130118/gdb/solist.h
    };
  
  /* Free the memory associated with a (so_list *).  */
-Index: gdb-7.5.50.20130118/gdb/infrun.c
+Index: gdb-7.5.50.20130215/gdb/infrun.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/infrun.c	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/infrun.c	2013-01-18 23:57:50.517792865 +0100
+--- gdb-7.5.50.20130215.orig/gdb/infrun.c	2013-02-15 22:37:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/infrun.c	2013-02-15 22:37:35.760417594 +0100
 @@ -369,6 +369,16 @@ static struct symbol *step_start_functio
  /* Nonzero if we want to give control to the user when we're notified
     of shared library events by the dynamic linker.  */
@@ -265,7 +265,7 @@ Index: gdb-7.5.50.20130118/gdb/infrun.c
  static void
  show_stop_on_solib_events (struct ui_file *file, int from_tty,
  			   struct cmd_list_element *c, const char *value)
-@@ -3347,7 +3357,7 @@ handle_inferior_event (struct execution_
+@@ -3346,7 +3356,7 @@ handle_inferior_event (struct execution_
  	    context_switch (ecs->ptid);
  	  regcache = get_thread_regcache (ecs->ptid);
  
@@ -274,7 +274,7 @@ Index: gdb-7.5.50.20130118/gdb/infrun.c
  
  	  ecs->event_thread->control.stop_bpstat
  	    = bpstat_stop_status (get_regcache_aspace (regcache),
-@@ -7327,7 +7337,7 @@ Show stopping for shared library events.
+@@ -7334,7 +7344,7 @@ Show stopping for shared library events.
  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."),
@@ -283,10 +283,10 @@ Index: gdb-7.5.50.20130118/gdb/infrun.c
  			    show_stop_on_solib_events,
  			    &setlist, &showlist);
  
-Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
+Index: gdb-7.5.50.20130215/gdb/solib-svr4.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/solib-svr4.c	2013-01-18 23:57:45.430815943 +0100
-+++ gdb-7.5.50.20130118/gdb/solib-svr4.c	2013-01-18 23:57:50.519792858 +0100
+--- gdb-7.5.50.20130215.orig/gdb/solib-svr4.c	2013-02-15 22:37:30.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/solib-svr4.c	2013-02-15 22:37:35.761417596 +0100
 @@ -46,10 +46,12 @@
  #include "auxv.h"
  #include "exceptions.h"
@@ -540,7 +540,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  /* Find r_brk from the inferior's debug base.  */
  
  static CORE_ADDR
-@@ -1163,15 +1290,17 @@ svr4_default_sos (void)
+@@ -1161,15 +1288,17 @@ svr4_default_sos (void)
    return new;
  }
  
@@ -565,7 +565,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  
    for (; lm != 0; prev_lm = lm, lm = next_lm)
      {
-@@ -1188,7 +1317,7 @@ svr4_read_so_list (CORE_ADDR lm, struct
+@@ -1185,7 +1314,7 @@ svr4_read_so_list (CORE_ADDR lm, struct
        if (new->lm_info == NULL)
  	{
  	  do_cleanups (old_chain);
@@ -574,7 +574,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	}
  
        next_lm = new->lm_info->l_next;
-@@ -1199,7 +1328,7 @@ svr4_read_so_list (CORE_ADDR lm, struct
+@@ -1196,7 +1325,7 @@ svr4_read_so_list (CORE_ADDR lm, struct
  		   paddress (target_gdbarch (), prev_lm),
  		   paddress (target_gdbarch (), new->lm_info->l_prev));
  	  do_cleanups (old_chain);
@@ -583,7 +583,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	}
  
        /* For SVR4 versions, the first entry in the link map is for the
-@@ -1294,20 +1423,61 @@ svr4_read_so_list (CORE_ADDR lm, struct
+@@ -1291,20 +1420,61 @@ svr4_read_so_list (CORE_ADDR lm, struct
        **link_ptr_ptr = new;
        *link_ptr_ptr = &new->next;
      }
@@ -648,7 +648,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  
    /* Fall back to manual examination of the target if the packet is not
       supported or gdbserver failed to find DT_DEBUG.  gdb.server/solib-list.exp
-@@ -1330,6 +1500,10 @@ svr4_current_sos (void)
+@@ -1327,6 +1497,10 @@ svr4_current_sos (void)
  
    info = get_svr4_info ();
  
@@ -659,7 +659,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
    /* Always locate the debug struct, in case it has moved.  */
    info->debug_base = 0;
    locate_base (info);
-@@ -1339,35 +1513,12 @@ svr4_current_sos (void)
+@@ -1336,35 +1510,12 @@ svr4_current_sos (void)
    if (! info->debug_base)
      return svr4_default_sos ();
  
@@ -698,7 +698,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  }
  
  /* Get the address of the link_map for a given OBJFILE.  */
-@@ -1452,6 +1603,498 @@ exec_entry_point (struct bfd *abfd, stru
+@@ -1449,6 +1600,498 @@ exec_entry_point (struct bfd *abfd, stru
    return gdbarch_addr_bits_remove (target_gdbarch (), addr);
  }
  
@@ -1197,7 +1197,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  /* Helper function for gdb_bfd_lookup_symbol.  */
  
  static int
-@@ -1504,6 +2147,9 @@ enable_break (struct svr4_info *info, in
+@@ -1501,6 +2144,9 @@ enable_break (struct svr4_info *info, in
    info->interp_text_sect_low = info->interp_text_sect_high = 0;
    info->interp_plt_sect_low = info->interp_plt_sect_high = 0;
  
@@ -1207,7 +1207,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
    /* If we already have a shared library list in the target, and
       r_debug contains r_brk, set the breakpoint there - this should
       mean r_brk has already been relocated.  Assume the dynamic linker
-@@ -1535,7 +2181,7 @@ enable_break (struct svr4_info *info, in
+@@ -1532,7 +2178,7 @@ enable_break (struct svr4_info *info, in
  	 That knowledge is encoded in the address, if it's Thumb the low bit
  	 is 1.  However, we've stripped that info above and it's not clear
  	 what all the consequences are of passing a non-addr_bits_remove'd
@@ -1216,7 +1216,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	 find_pc_section verifies we know about the address and have some
  	 hope of computing the right kind of breakpoint to use (via
  	 symbol info).  It does mean that GDB needs to be pointed at a
-@@ -1573,7 +2219,7 @@ enable_break (struct svr4_info *info, in
+@@ -1570,7 +2216,7 @@ enable_break (struct svr4_info *info, in
  		+ bfd_section_size (tmp_bfd, interp_sect);
  	    }
  
@@ -1225,7 +1225,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	  return 1;
  	}
      }
-@@ -1731,7 +2377,8 @@ enable_break (struct svr4_info *info, in
+@@ -1728,7 +2374,8 @@ enable_break (struct svr4_info *info, in
  
        if (sym_addr != 0)
  	{
@@ -1235,7 +1235,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	  xfree (interp_name);
  	  return 1;
  	}
-@@ -1757,7 +2404,7 @@ enable_break (struct svr4_info *info, in
+@@ -1754,7 +2401,7 @@ enable_break (struct svr4_info *info, in
  	  sym_addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch (),
  							 sym_addr,
  							 &current_target);
@@ -1244,7 +1244,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	  return 1;
  	}
      }
-@@ -1773,7 +2420,7 @@ enable_break (struct svr4_info *info, in
+@@ -1770,7 +2417,7 @@ enable_break (struct svr4_info *info, in
  	      sym_addr = gdbarch_convert_from_func_ptr_addr (target_gdbarch (),
  							     sym_addr,
  							     &current_target);
@@ -1253,7 +1253,7 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
  	      return 1;
  	    }
  	}
-@@ -2269,6 +2916,9 @@ svr4_solib_create_inferior_hook (int fro
+@@ -2266,6 +2913,9 @@ svr4_solib_create_inferior_hook (int fro
  
    info = get_svr4_info ();
  
@@ -1263,17 +1263,17 @@ Index: gdb-7.5.50.20130118/gdb/solib-svr4.c
    /* Relocate the main executable if necessary.  */
    svr4_relocate_main_executable ();
  
-@@ -2510,4 +3160,6 @@ _initialize_svr4_solib (void)
+@@ -2507,4 +3157,6 @@ _initialize_svr4_solib (void)
    svr4_so_ops.lookup_lib_global_symbol = elf_lookup_lib_symbol;
    svr4_so_ops.same = svr4_same;
    svr4_so_ops.keep_data_in_core = svr4_keep_data_in_core;
 +  svr4_so_ops.handle_solib_event = svr4_handle_solib_event;
 +  svr4_so_ops.update_breakpoints = svr4_update_solib_event_breakpoints;
  }
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen-solib.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-dlmopen-solib.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen-solib.c	2013-01-18 23:57:50.519792858 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-dlmopen-solib.c	2013-02-15 22:37:35.761417596 +0100
 @@ -0,0 +1,24 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1299,10 +1299,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen-solib.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-dlmopen.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen.c	2013-01-18 23:57:50.519792858 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-dlmopen.c	2013-02-15 22:37:35.762417598 +0100
 @@ -0,0 +1,58 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1362,10 +1362,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-dlmopen.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen.exp	2013-01-18 23:57:50.519792858 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-dlmopen.exp	2013-02-15 22:37:35.762417598 +0100
 @@ -0,0 +1,125 @@
 +# Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1492,10 +1492,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-dlmopen.exp
 +    gdb_test "c" {Breakpoint [0-9]+, .* in stop \(\)}
 +    check_info_shared "info sharedlibrary #7" 0
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-interp.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-interp.exp
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/testsuite/gdb.base/break-interp.exp	2013-01-18 23:57:14.782978485 +0100
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-interp.exp	2013-01-18 23:57:50.520792854 +0100
+--- gdb-7.5.50.20130215.orig/gdb/testsuite/gdb.base/break-interp.exp	2013-01-01 07:33:25.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-interp.exp	2013-02-15 22:37:35.762417598 +0100
 @@ -109,12 +109,19 @@ proc strip_debug {dest} {
      }
  }
@@ -1591,10 +1591,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-interp.exp
  
  	    # Use two separate gdb_test_multiple statements to avoid timeouts due
  	    # to slow processing of wildcard capturing long output
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes-solib.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-probes-solib.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes-solib.c	2013-01-18 23:57:50.520792854 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-probes-solib.c	2013-02-15 22:37:35.762417598 +0100
 @@ -0,0 +1,24 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1620,10 +1620,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes-solib.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-probes.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes.c	2013-01-18 23:57:50.520792854 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-probes.c	2013-02-15 22:37:35.763417600 +0100
 @@ -0,0 +1,26 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1651,10 +1651,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-probes.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes.exp	2013-01-18 23:57:50.520792854 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/break-probes.exp	2013-02-15 22:37:35.763417600 +0100
 @@ -0,0 +1,76 @@
 +# Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1732,10 +1732,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/break-probes.exp
 +    # Call something to ensure that relocation occurred
 +    gdb_test "call foo(23)" "foo 23.*\\\$.* = .*"
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared-solib1.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared-solib1.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared-solib1.c	2013-01-18 23:57:50.520792854 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared-solib1.c	2013-02-15 22:37:35.763417600 +0100
 @@ -0,0 +1,24 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1761,10 +1761,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared-solib1.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared-solib2.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared-solib2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared-solib2.c	2013-01-18 23:57:50.520792854 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared-solib2.c	2013-02-15 22:37:35.763417600 +0100
 @@ -0,0 +1,24 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1790,10 +1790,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared-solib2.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared.c
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared.c	2013-01-18 23:57:50.520792854 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared.c	2013-02-15 22:37:35.763417600 +0100
 @@ -0,0 +1,48 @@
 +/* Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1843,10 +1843,10 @@ Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared.c
 +
 +  return 0;
 +}
-Index: gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared.exp
+Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.5.50.20130118/gdb/testsuite/gdb.base/info-shared.exp	2013-01-18 23:57:50.521792850 +0100
++++ gdb-7.5.50.20130215/gdb/testsuite/gdb.base/info-shared.exp	2013-02-15 22:37:35.764417602 +0100
 @@ -0,0 +1,139 @@
 +# Copyright 2012 Free Software Foundation, Inc.
 +
diff --git a/gdb-rhbz795424-bitpos-20of25.patch b/gdb-rhbz795424-bitpos-20of25.patch
index b3204e1..dd153b4 100644
--- a/gdb-rhbz795424-bitpos-20of25.patch
+++ b/gdb-rhbz795424-bitpos-20of25.patch
@@ -463,10 +463,10 @@ Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=bitpos-main.patch
 
-Index: gdb-7.5.50.20130118/gdb/ada-lang.c
+Index: gdb-7.5.50.20130215/gdb/ada-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ada-lang.c	2013-01-18 23:27:22.060601299 +0100
-+++ gdb-7.5.50.20130118/gdb/ada-lang.c	2013-01-18 23:27:28.845607295 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ada-lang.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ada-lang.c	2013-02-15 22:40:18.513622035 +0100
 @@ -80,7 +80,7 @@ static struct type *desc_bounds_type (st
  
  static struct value *desc_bounds (struct value *);
@@ -680,7 +680,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
    
    val = value_cast (value_type (component), val);
  
-@@ -4082,7 +4085,7 @@ ensure_lval (struct value *val)
+@@ -4084,7 +4087,7 @@ ensure_lval (struct value *val)
    if (VALUE_LVAL (val) == not_lval
        || VALUE_LVAL (val) == lval_internalvar)
      {
@@ -689,7 +689,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
        const CORE_ADDR addr =
          value_as_long (value_allocate_space_in_inferior (len));
  
-@@ -4156,7 +4159,7 @@ static CORE_ADDR
+@@ -4158,7 +4161,7 @@ static CORE_ADDR
  value_pointer (struct value *value, struct type *type)
  {
    struct gdbarch *gdbarch = get_type_arch (type);
@@ -698,7 +698,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
    gdb_byte *buf = alloca (len);
    CORE_ADDR addr;
  
-@@ -6051,7 +6054,7 @@ value_tag_from_contents_and_address (str
+@@ -6053,7 +6056,7 @@ value_tag_from_contents_and_address (str
  				     const gdb_byte *valaddr,
                                       CORE_ADDR address)
  {
@@ -707,7 +707,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
    struct type *tag_type;
  
    if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
-@@ -6516,7 +6519,7 @@ ada_in_variant (LONGEST val, struct type
+@@ -6518,7 +6521,7 @@ ada_in_variant (LONGEST val, struct type
     only in that it can handle packed values of arbitrary type.  */
  
  static struct value *
@@ -716,7 +716,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
                             struct type *arg_type)
  {
    struct type *type;
-@@ -6528,7 +6531,7 @@ ada_value_primitive_field (struct value
+@@ -6530,7 +6533,7 @@ ada_value_primitive_field (struct value
  
    if (TYPE_FIELD_BITSIZE (arg_type, fieldno) != 0)
      {
@@ -725,7 +725,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
        int bit_size = TYPE_FIELD_BITSIZE (arg_type, fieldno);
  
        return ada_value_primitive_packed_val (arg1, value_contents (arg1),
-@@ -6555,9 +6558,9 @@ ada_value_primitive_field (struct value
+@@ -6557,9 +6560,9 @@ ada_value_primitive_field (struct value
     Returns 1 if found, 0 otherwise.  */
  
  static int
@@ -737,7 +737,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  		   int *index_p)
  {
    int i;
-@@ -6575,8 +6578,8 @@ find_struct_field (const char *name, str
+@@ -6577,8 +6580,8 @@ find_struct_field (const char *name, str
  
    for (i = 0; i < TYPE_NFIELDS (type); i += 1)
      {
@@ -748,7 +748,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
        const char *t_field_name = TYPE_FIELD_NAME (type, i);
  
        if (t_field_name == NULL)
-@@ -6646,7 +6649,7 @@ num_visible_fields (struct type *type)
+@@ -6648,7 +6651,7 @@ num_visible_fields (struct type *type)
     Searches recursively through wrapper fields (e.g., '_parent').  */
  
  static struct value *
@@ -757,7 +757,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
                           struct type *type)
  {
    int i;
-@@ -6679,7 +6682,7 @@ ada_search_struct_field (char *name, str
+@@ -6681,7 +6684,7 @@ ada_search_struct_field (char *name, str
            int j;
            struct type *field_type = ada_check_typedef (TYPE_FIELD_TYPE (type,
  									i));
@@ -766,7 +766,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  
            for (j = 0; j < TYPE_NFIELDS (field_type); j += 1)
              {
-@@ -6697,8 +6700,8 @@ ada_search_struct_field (char *name, str
+@@ -6699,8 +6702,8 @@ ada_search_struct_field (char *name, str
    return NULL;
  }
  
@@ -777,7 +777,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  
  
  /* Return field #INDEX in ARG, where the index is that returned by
-@@ -6707,7 +6710,7 @@ static struct value *ada_index_struct_fi
+@@ -6709,7 +6712,7 @@ static struct value *ada_index_struct_fi
   * If found, return value, else return NULL.  */
  
  static struct value *
@@ -786,7 +786,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  			struct type *type)
  {
    return ada_index_struct_field_1 (&index, arg, offset, type);
-@@ -6719,7 +6722,7 @@ ada_index_struct_field (int index, struc
+@@ -6721,7 +6724,7 @@ ada_index_struct_field (int index, struc
   * *INDEX_P.  */
  
  static struct value *
@@ -795,7 +795,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  			  struct type *type)
  {
    int i;
-@@ -6809,7 +6812,8 @@ ada_value_struct_elt (struct value *arg,
+@@ -6811,7 +6814,8 @@ ada_value_struct_elt (struct value *arg,
      v = ada_search_struct_field (name, arg, 0, t);
    else
      {
@@ -805,7 +805,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
        struct type *field_type;
        CORE_ADDR address;
  
-@@ -7122,8 +7126,8 @@ ada_coerce_ref (struct value *val0)
+@@ -7124,8 +7128,8 @@ ada_coerce_ref (struct value *val0)
  /* Return OFF rounded upward if necessary to a multiple of
     ALIGNMENT (a power of 2).  */
  
@@ -816,7 +816,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  {
    return (off + alignment - 1) & ~(alignment - 1);
  }
-@@ -7502,10 +7506,9 @@ ada_template_to_fixed_record_type_1 (str
+@@ -7504,10 +7508,9 @@ ada_template_to_fixed_record_type_1 (str
    struct value *mark = value_mark ();
    struct value *dval;
    struct type *rtype;
@@ -829,7 +829,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
    int f;
  
    /* Compute the number of fields in this record type that are going
-@@ -7576,7 +7579,7 @@ ada_template_to_fixed_record_type_1 (str
+@@ -7578,7 +7581,7 @@ ada_template_to_fixed_record_type_1 (str
  	     that follow this one.  */
  	  if (ada_is_aligner_type (field_type))
  	    {
@@ -838,7 +838,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
  
  	      field_valaddr = cond_offset_host (field_valaddr, field_offset);
  	      field_address = cond_offset_target (field_address, field_offset);
-@@ -7705,11 +7708,11 @@ ada_template_to_fixed_record_type_1 (str
+@@ -7707,11 +7710,11 @@ ada_template_to_fixed_record_type_1 (str
    if (TYPE_LENGTH (type) <= 0)
      {
        if (TYPE_NAME (rtype))
@@ -854,7 +854,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
      }
    else
      {
-@@ -8046,7 +8049,8 @@ to_fixed_array_type (struct type *type0,
+@@ -8048,7 +8051,8 @@ to_fixed_array_type (struct type *type0,
  	 type was a regular (non-packed) array type.  As a result, the
  	 bitsize of the array elements needs to be set again, and the array
  	 length needs to be recomputed based on that bitsize.  */
@@ -864,10 +864,10 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.c
        int elt_bitsize = TYPE_FIELD_BITSIZE (type0, 0);
  
        TYPE_FIELD_BITSIZE (result, 0) = TYPE_FIELD_BITSIZE (type0, 0);
-Index: gdb-7.5.50.20130118/gdb/ada-lang.h
+Index: gdb-7.5.50.20130215/gdb/ada-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ada-lang.h	2013-01-18 23:27:22.061601301 +0100
-+++ gdb-7.5.50.20130118/gdb/ada-lang.h	2013-01-18 23:27:28.845607295 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ada-lang.h	2013-01-24 19:04:34.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ada-lang.h	2013-02-15 22:40:18.513622035 +0100
 @@ -169,7 +169,7 @@ extern void ada_print_type (struct type
  extern void ada_print_typedef (struct type *type, struct symbol *new_symbol,
  			       struct ui_file *stream);
@@ -895,10 +895,10 @@ Index: gdb-7.5.50.20130118/gdb/ada-lang.h
                                                       struct type *);
  
  extern struct type *ada_coerce_to_simple_array_type (struct type *);
-Index: gdb-7.5.50.20130118/gdb/ada-typeprint.c
+Index: gdb-7.5.50.20130215/gdb/ada-typeprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ada-typeprint.c	2013-01-18 23:27:22.061601301 +0100
-+++ gdb-7.5.50.20130118/gdb/ada-typeprint.c	2013-01-18 23:27:28.845607295 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ada-typeprint.c	2013-01-01 07:32:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ada-typeprint.c	2013-02-15 22:40:18.514622038 +0100
 @@ -829,8 +829,8 @@ ada_print_type (struct type *type0, cons
  	    const char *name = ada_type_name (type);
  
@@ -920,10 +920,10 @@ Index: gdb-7.5.50.20130118/gdb/ada-typeprint.c
  	break;
        case TYPE_CODE_ENUM:
  	if (show < 0)
-Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
+Index: gdb-7.5.50.20130215/gdb/ada-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ada-valprint.c	2013-01-18 23:27:22.062601303 +0100
-+++ gdb-7.5.50.20130118/gdb/ada-valprint.c	2013-01-18 23:27:28.846607297 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ada-valprint.c	2013-02-01 21:08:45.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ada-valprint.c	2013-02-15 22:40:18.514622038 +0100
 @@ -41,16 +41,16 @@ static void print_record (struct type *,
  			  const struct value_print_options *);
  
@@ -963,7 +963,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  	 enum bfd_endian byte_order)
  {
    if (type_len == 1)
-@@ -464,11 +464,11 @@ ada_print_scalar (struct type *type, LON
+@@ -462,11 +462,11 @@ ada_print_scalar (struct type *type, LON
  
  static void
  printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string,
@@ -977,7 +977,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
    unsigned int things_printed = 0;
    int in_quotes = 0;
    int need_comma = 0;
-@@ -483,9 +483,9 @@ printstr (struct ui_file *stream, struct
+@@ -481,9 +481,9 @@ printstr (struct ui_file *stream, struct
      {
        /* Position of the character we are examining
           to see whether it is repeated.  */
@@ -989,7 +989,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  
        QUIT;
  
-@@ -516,7 +516,8 @@ printstr (struct ui_file *stream, struct
+@@ -514,7 +514,8 @@ printstr (struct ui_file *stream, struct
  	  ada_emit_char (char_at (string, i, type_len, byte_order),
  			 elttype, stream, '\'', type_len);
  	  fputs_filtered ("'", stream);
@@ -999,7 +999,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  	  i = rep1 - 1;
  	  things_printed += options->repeat_count_threshold;
  	  need_comma = 1;
-@@ -544,7 +545,7 @@ printstr (struct ui_file *stream, struct
+@@ -542,7 +543,7 @@ printstr (struct ui_file *stream, struct
  
  void
  ada_printstr (struct ui_file *stream, struct type *type,
@@ -1008,7 +1008,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  	      const char *encoding, int force_ellipses,
  	      const struct value_print_options *options)
  {
-@@ -558,7 +559,7 @@ ada_printstr (struct ui_file *stream, st
+@@ -556,7 +557,7 @@ ada_printstr (struct ui_file *stream, st
  
  void
  ada_val_print (struct type *type, const gdb_byte *valaddr,
@@ -1017,7 +1017,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  	       struct ui_file *stream, int recurse,
  	       const struct value *val,
  	       const struct value_print_options *options)
-@@ -590,8 +591,8 @@ ada_val_print_array (struct type *type,
+@@ -588,8 +589,8 @@ ada_val_print_array (struct type *type,
      {
        enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type));
        struct type *elttype = TYPE_TARGET_TYPE (type);
@@ -1028,7 +1028,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  
        /* We know that ELTTYPE cannot possibly be null, because we found
  	 that TYPE is a string-like type.  Similarly, the size of ELTTYPE
-@@ -609,7 +610,7 @@ ada_val_print_array (struct type *type,
+@@ -607,7 +608,7 @@ ada_val_print_array (struct type *type,
           elements up to it.  */
        if (options->stop_print_at_null)
          {
@@ -1037,7 +1037,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  
            /* Look for a NULL char.  */
            for (temp_len = 0;
-@@ -642,7 +643,7 @@ ada_val_print_array (struct type *type,
+@@ -640,7 +641,7 @@ ada_val_print_array (struct type *type,
  
  static void
  ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
@@ -1046,7 +1046,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  		 struct ui_file *stream, int recurse,
  		 const struct value *original_value,
  		 const struct value_print_options *options)
-@@ -917,12 +918,12 @@ ada_val_print_1 (struct type *type, cons
+@@ -915,12 +916,12 @@ ada_val_print_1 (struct type *type, cons
  
  static int
  print_variant_part (struct type *type, int field_num,
@@ -1061,7 +1061,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  {
    struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
    int which = ada_which_variant_applies (var_type, outer_type,
-@@ -1029,11 +1030,11 @@ print_record (struct type *type, const g
+@@ -1027,11 +1028,11 @@ print_record (struct type *type, const g
  
  static int
  print_field_values (struct type *type, const gdb_byte *valaddr,
@@ -1075,7 +1075,7 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  {
    int i, len;
  
-@@ -1099,7 +1100,7 @@ print_field_values (struct type *type, c
+@@ -1097,7 +1098,7 @@ print_field_values (struct type *type, c
  	    }
  	  else
  	    {
@@ -1084,11 +1084,11 @@ Index: gdb-7.5.50.20130118/gdb/ada-valprint.c
  	      int bit_size = TYPE_FIELD_BITSIZE (type, i);
  	      struct value_print_options opts;
  
-Index: gdb-7.5.50.20130118/gdb/annotate.c
+Index: gdb-7.5.50.20130215/gdb/annotate.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/annotate.c	2013-01-18 23:27:22.062601303 +0100
-+++ gdb-7.5.50.20130118/gdb/annotate.c	2013-01-18 23:27:28.846607297 +0100
-@@ -521,21 +521,21 @@ annotate_frame_end (void)
+--- gdb-7.5.50.20130215.orig/gdb/annotate.c	2013-01-22 21:22:38.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/annotate.c	2013-02-15 22:40:18.514622038 +0100
+@@ -523,21 +523,21 @@ annotate_frame_end (void)
  }
  
  void
@@ -1114,11 +1114,11 @@ Index: gdb-7.5.50.20130118/gdb/annotate.c
  }
  
  void
-Index: gdb-7.5.50.20130118/gdb/annotate.h
+Index: gdb-7.5.50.20130215/gdb/annotate.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/annotate.h	2013-01-18 23:27:22.062601303 +0100
-+++ gdb-7.5.50.20130118/gdb/annotate.h	2013-01-18 23:27:28.846607297 +0100
-@@ -93,8 +93,8 @@ extern void annotate_frame_source_end (v
+--- gdb-7.5.50.20130215.orig/gdb/annotate.h	2013-01-22 21:19:38.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/annotate.h	2013-02-15 22:40:18.515622041 +0100
+@@ -92,8 +92,8 @@ extern void annotate_frame_source_end (v
  extern void annotate_frame_where (void);
  extern void annotate_frame_end (void);
  
@@ -1129,10 +1129,10 @@ Index: gdb-7.5.50.20130118/gdb/annotate.h
  extern void annotate_elt_rep_end (void);
  extern void annotate_elt (void);
  extern void annotate_array_section_end (void);
-Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/arm-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/arm-linux-nat.c	2013-01-18 23:27:22.063601305 +0100
-+++ gdb-7.5.50.20130118/gdb/arm-linux-nat.c	2013-01-18 23:27:28.847607298 +0100
+--- gdb-7.5.50.20130215.orig/gdb/arm-linux-nat.c	2013-01-01 07:32:38.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/arm-linux-nat.c	2013-02-15 22:40:18.515622041 +0100
 @@ -1073,7 +1073,7 @@ arm_linux_remove_hw_breakpoint (struct g
  /* Are we able to use a hardware watchpoint for the LEN bytes starting at 
     ADDR?  */
@@ -1142,10 +1142,10 @@ Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
  {
    const struct arm_linux_hwbp_cap *cap = arm_linux_get_hwbp_cap ();
    CORE_ADDR max_wp_length, aligned_addr;
-Index: gdb-7.5.50.20130118/gdb/ax-gdb.c
+Index: gdb-7.5.50.20130215/gdb/ax-gdb.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ax-gdb.c	2013-01-18 23:27:22.064601307 +0100
-+++ gdb-7.5.50.20130118/gdb/ax-gdb.c	2013-01-18 23:27:28.848607299 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ax-gdb.c	2013-01-31 17:27:50.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ax-gdb.c	2013-02-15 22:40:18.516622043 +0100
 @@ -83,12 +83,12 @@ static void gen_traced_pop (struct gdbar
  static void gen_sign_extend (struct agent_expr *, struct type *);
  static void gen_extend (struct agent_expr *, struct type *);
@@ -1245,10 +1245,10 @@ Index: gdb-7.5.50.20130118/gdb/ax-gdb.c
  {
    int i, rslt;
    int nbases = TYPE_N_BASECLASSES (type);
-Index: gdb-7.5.50.20130118/gdb/ax-general.c
+Index: gdb-7.5.50.20130215/gdb/ax-general.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ax-general.c	2013-01-18 23:27:22.064601307 +0100
-+++ gdb-7.5.50.20130118/gdb/ax-general.c	2013-01-18 23:27:28.848607299 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ax-general.c	2013-01-31 17:27:50.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ax-general.c	2013-02-15 22:40:18.516622043 +0100
 @@ -192,7 +192,7 @@ ax_zero_ext (struct agent_expr *x, int n
  
  /* Append a trace_quick instruction to EXPR, to record N bytes.  */
@@ -1258,10 +1258,10 @@ Index: gdb-7.5.50.20130118/gdb/ax-general.c
  {
    /* N must fit in a byte.  */
    if (n < 0 || n > 255)
-Index: gdb-7.5.50.20130118/gdb/ax.h
+Index: gdb-7.5.50.20130215/gdb/ax.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ax.h	2013-01-18 23:27:22.064601307 +0100
-+++ gdb-7.5.50.20130118/gdb/ax.h	2013-01-18 23:27:28.848607299 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ax.h	2013-01-01 07:32:39.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ax.h	2013-02-15 22:40:18.517622045 +0100
 @@ -190,7 +190,7 @@ extern void ax_ext (struct agent_expr *E
  extern void ax_zero_ext (struct agent_expr *EXPR, int N);
  
@@ -1271,11 +1271,11 @@ Index: gdb-7.5.50.20130118/gdb/ax.h
  
  /* Append a goto op to EXPR.  OP is the actual op (must be aop_goto or
     aop_if_goto).  We assume we don't know the target offset yet,
-Index: gdb-7.5.50.20130118/gdb/breakpoint.c
+Index: gdb-7.5.50.20130215/gdb/breakpoint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/breakpoint.c	2013-01-18 23:27:22.067601312 +0100
-+++ gdb-7.5.50.20130118/gdb/breakpoint.c	2013-01-18 23:29:33.652726603 +0100
-@@ -6627,7 +6627,7 @@ breakpoint_address_match (struct address
+--- gdb-7.5.50.20130215.orig/gdb/breakpoint.c	2013-02-15 22:37:35.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/breakpoint.c	2013-02-15 22:40:18.521622053 +0100
+@@ -6660,7 +6660,7 @@ breakpoint_address_match (struct address
  
  static int
  breakpoint_address_match_range (struct address_space *aspace1, CORE_ADDR addr1,
@@ -1284,7 +1284,7 @@ Index: gdb-7.5.50.20130118/gdb/breakpoint.c
  				CORE_ADDR addr2)
  {
    return ((gdbarch_has_global_breakpoints (target_gdbarch ())
-@@ -11155,7 +11155,7 @@ can_use_hardware_watchpoint (struct valu
+@@ -11182,7 +11182,7 @@ can_use_hardware_watchpoint (struct valu
  		      && TYPE_CODE (vtype) != TYPE_CODE_ARRAY))
  		{
  		  CORE_ADDR vaddr = value_address (v);
@@ -1293,10 +1293,10 @@ Index: gdb-7.5.50.20130118/gdb/breakpoint.c
  		  int num_regs;
  
  		  len = (target_exact_watchpoints
-Index: gdb-7.5.50.20130118/gdb/breakpoint.h
+Index: gdb-7.5.50.20130215/gdb/breakpoint.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/breakpoint.h	2013-01-18 23:27:22.068601313 +0100
-+++ gdb-7.5.50.20130118/gdb/breakpoint.h	2013-01-18 23:27:28.854607311 +0100
+--- gdb-7.5.50.20130215.orig/gdb/breakpoint.h	2013-02-15 22:37:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/breakpoint.h	2013-02-15 22:40:18.521622053 +0100
 @@ -250,7 +250,7 @@ struct bp_target_info
  
    /* If this is a ranged breakpoint, then this field contains the
@@ -1315,10 +1315,10 @@ Index: gdb-7.5.50.20130118/gdb/breakpoint.h
  
    /* Type of hardware watchpoint.  */
    enum target_hw_bp_type watchpoint_type;
-Index: gdb-7.5.50.20130118/gdb/c-lang.c
+Index: gdb-7.5.50.20130215/gdb/c-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/c-lang.c	2013-01-18 23:27:22.069601315 +0100
-+++ gdb-7.5.50.20130118/gdb/c-lang.c	2013-01-18 23:27:28.854607311 +0100
+--- gdb-7.5.50.20130215.orig/gdb/c-lang.c	2013-02-13 11:41:11.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/c-lang.c	2013-02-15 22:40:18.522622055 +0100
 @@ -188,7 +188,7 @@ c_printchar (int c, struct type *type, s
  
  void
@@ -1328,7 +1328,7 @@ Index: gdb-7.5.50.20130118/gdb/c-lang.c
  	    const char *user_encoding, int force_ellipses,
  	    const struct value_print_options *options)
  {
-@@ -677,7 +677,7 @@ evaluate_subexp_c (struct type *expect_t
+@@ -663,7 +663,7 @@ evaluate_subexp_c (struct type *expect_t
  	  }
  	else
  	  {
@@ -1337,7 +1337,7 @@ Index: gdb-7.5.50.20130118/gdb/c-lang.c
  
  	    /* Write the terminating character.  */
  	    for (i = 0; i < TYPE_LENGTH (type); ++i)
-@@ -686,7 +686,7 @@ evaluate_subexp_c (struct type *expect_t
+@@ -672,7 +672,7 @@ evaluate_subexp_c (struct type *expect_t
  	    if (satisfy_expected)
  	      {
  		LONGEST low_bound, high_bound;
@@ -1346,10 +1346,10 @@ Index: gdb-7.5.50.20130118/gdb/c-lang.c
  
  		if (get_discrete_bounds (TYPE_INDEX_TYPE (expect_type),
  					 &low_bound, &high_bound) < 0)
-Index: gdb-7.5.50.20130118/gdb/c-lang.h
+Index: gdb-7.5.50.20130215/gdb/c-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/c-lang.h	2013-01-18 23:27:22.069601315 +0100
-+++ gdb-7.5.50.20130118/gdb/c-lang.h	2013-01-18 23:27:28.854607311 +0100
+--- gdb-7.5.50.20130215.orig/gdb/c-lang.h	2013-01-01 07:32:40.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/c-lang.h	2013-02-15 22:40:18.522622055 +0100
 @@ -73,7 +73,7 @@ extern void c_print_typedef (struct type
  			     struct ui_file *);
  
@@ -1385,10 +1385,10 @@ Index: gdb-7.5.50.20130118/gdb/c-lang.h
  					struct ui_file *, int,
  					const struct value *,
  					const struct value_print_options *,
-Index: gdb-7.5.50.20130118/gdb/c-valprint.c
+Index: gdb-7.5.50.20130215/gdb/c-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/c-valprint.c	2013-01-18 23:27:22.069601315 +0100
-+++ gdb-7.5.50.20130118/gdb/c-valprint.c	2013-01-18 23:27:28.855607313 +0100
+--- gdb-7.5.50.20130215.orig/gdb/c-valprint.c	2013-01-01 07:32:40.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/c-valprint.c	2013-02-15 22:40:18.522622055 +0100
 @@ -132,7 +132,7 @@ static const struct generic_val_print_de
  
  void
@@ -1430,10 +1430,10 @@ Index: gdb-7.5.50.20130118/gdb/c-valprint.c
    struct value_print_options opts = *options;
  
    opts.deref_ref = 1;
-Index: gdb-7.5.50.20130118/gdb/cp-abi.c
+Index: gdb-7.5.50.20130215/gdb/cp-abi.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/cp-abi.c	2013-01-18 23:27:22.070601317 +0100
-+++ gdb-7.5.50.20130118/gdb/cp-abi.c	2013-01-18 23:27:28.855607313 +0100
+--- gdb-7.5.50.20130215.orig/gdb/cp-abi.c	2013-01-17 21:26:14.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/cp-abi.c	2013-02-15 22:40:18.523622057 +0100
 @@ -68,13 +68,13 @@ is_operator_name (const char *name)
    return (*current_cp_abi.is_operator_name) (name);
  }
@@ -1469,10 +1469,10 @@ Index: gdb-7.5.50.20130118/gdb/cp-abi.c
  {
    struct type *ret = NULL;
    volatile struct gdb_exception e;
-Index: gdb-7.5.50.20130118/gdb/cp-abi.h
+Index: gdb-7.5.50.20130215/gdb/cp-abi.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/cp-abi.h	2013-01-18 23:27:22.070601317 +0100
-+++ gdb-7.5.50.20130118/gdb/cp-abi.h	2013-01-18 23:27:28.855607313 +0100
+--- gdb-7.5.50.20130215.orig/gdb/cp-abi.h	2013-01-01 07:32:40.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/cp-abi.h	2013-02-15 22:40:18.523622057 +0100
 @@ -108,7 +108,7 @@ extern struct value *value_virtual_fn_fi
  					     struct fn_field *f,
  					     int j,
@@ -1527,10 +1527,10 @@ Index: gdb-7.5.50.20130118/gdb/cp-abi.h
    void (*print_method_ptr) (const gdb_byte *contents,
  			    struct type *type,
  			    struct ui_file *stream);
-Index: gdb-7.5.50.20130118/gdb/cp-valprint.c
+Index: gdb-7.5.50.20130215/gdb/cp-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/cp-valprint.c	2013-01-18 23:27:22.070601317 +0100
-+++ gdb-7.5.50.20130118/gdb/cp-valprint.c	2013-01-18 23:27:28.856607315 +0100
+--- gdb-7.5.50.20130215.orig/gdb/cp-valprint.c	2013-01-07 17:40:36.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/cp-valprint.c	2013-02-15 22:40:18.523622057 +0100
 @@ -82,7 +82,7 @@ static void cp_print_static_field (struc
  				   const struct value_print_options *);
  
@@ -1604,10 +1604,10 @@ Index: gdb-7.5.50.20130118/gdb/cp-valprint.c
        int skip;
        struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
        const char *basename = TYPE_NAME (baseclass);
-Index: gdb-7.5.50.20130118/gdb/d-lang.h
+Index: gdb-7.5.50.20130215/gdb/d-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/d-lang.h	2013-01-18 23:27:22.070601317 +0100
-+++ gdb-7.5.50.20130118/gdb/d-lang.h	2013-01-18 23:27:28.856607315 +0100
+--- gdb-7.5.50.20130215.orig/gdb/d-lang.h	2013-01-01 07:32:41.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/d-lang.h	2013-02-15 22:40:18.523622057 +0100
 @@ -25,7 +25,7 @@
  extern char *d_demangle (const char *mangled, int options);
  
@@ -1617,10 +1617,10 @@ Index: gdb-7.5.50.20130118/gdb/d-lang.h
  			 struct ui_file *stream, int recurse,
  			 const struct value *val,
  			 const struct value_print_options *options);
-Index: gdb-7.5.50.20130118/gdb/d-valprint.c
+Index: gdb-7.5.50.20130215/gdb/d-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/d-valprint.c	2013-01-18 23:27:22.071601319 +0100
-+++ gdb-7.5.50.20130118/gdb/d-valprint.c	2013-01-18 23:27:28.856607315 +0100
+--- gdb-7.5.50.20130215.orig/gdb/d-valprint.c	2013-01-01 07:32:41.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/d-valprint.c	2013-02-15 22:40:18.524622059 +0100
 @@ -29,7 +29,7 @@
  
  static int
@@ -1643,10 +1643,10 @@ Index: gdb-7.5.50.20130118/gdb/d-valprint.c
               const struct value_print_options *options)
  {
    int ret;
-Index: gdb-7.5.50.20130118/gdb/doublest.c
+Index: gdb-7.5.50.20130215/gdb/doublest.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/doublest.c	2013-01-18 23:27:22.071601319 +0100
-+++ gdb-7.5.50.20130118/gdb/doublest.c	2013-01-18 23:27:28.856607315 +0100
+--- gdb-7.5.50.20130215.orig/gdb/doublest.c	2013-01-01 07:32:41.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/doublest.c	2013-02-15 22:40:18.524622059 +0100
 @@ -791,7 +791,7 @@ floatformat_from_doublest (const struct
     but not passed on by GDB.  This should be fixed.  */
  
@@ -1667,11 +1667,11 @@ Index: gdb-7.5.50.20130118/gdb/doublest.c
    return format;
  }
  
-Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
+Index: gdb-7.5.50.20130215/gdb/dwarf2loc.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/dwarf2loc.c	2013-01-18 23:27:22.073601323 +0100
-+++ gdb-7.5.50.20130118/gdb/dwarf2loc.c	2013-01-18 23:27:28.857607316 +0100
-@@ -1672,19 +1672,19 @@ insert_bits (unsigned int datum,
+--- gdb-7.5.50.20130215.orig/gdb/dwarf2loc.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/dwarf2loc.c	2013-02-15 22:40:18.525622061 +0100
+@@ -1677,19 +1677,19 @@ insert_bits (unsigned int datum,
     BITS_BIG_ENDIAN is taken directly from gdbarch.  */
  
  static void
@@ -1697,7 +1697,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  
    dest_avail = 8 - dest_offset_bits % 8;
  
-@@ -1722,13 +1722,13 @@ static void
+@@ -1727,13 +1727,13 @@ static void
  read_pieced_value (struct value *v)
  {
    int i;
@@ -1713,7 +1713,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
    size_t buffer_size = 0;
    char *buffer = NULL;
    struct cleanup *cleanup;
-@@ -1755,8 +1755,8 @@ read_pieced_value (struct value *v)
+@@ -1760,8 +1760,8 @@ read_pieced_value (struct value *v)
    for (i = 0; i < c->n_pieces && offset < type_len; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1724,7 +1724,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
        const gdb_byte *intermediate_buffer;
  
        /* Compute size, source, and destination offsets for copying, in
-@@ -1905,13 +1905,13 @@ static void
+@@ -1910,13 +1910,13 @@ static void
  write_pieced_value (struct value *to, struct value *from)
  {
    int i;
@@ -1740,7 +1740,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
    size_t buffer_size = 0;
    char *buffer = NULL;
    struct cleanup *cleanup;
-@@ -1939,8 +1939,8 @@ write_pieced_value (struct value *to, st
+@@ -1944,8 +1944,8 @@ write_pieced_value (struct value *to, st
    for (i = 0; i < c->n_pieces && offset < type_len; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1751,7 +1751,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
        int need_bitwise;
        const gdb_byte *source_buffer;
  
-@@ -2069,8 +2069,8 @@ write_pieced_value (struct value *to, st
+@@ -2074,8 +2074,8 @@ write_pieced_value (struct value *to, st
     implicit pointer.  */
  
  static int
@@ -1762,7 +1762,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  			 enum dwarf_value_location check_for)
  {
    struct piece_closure *c
-@@ -2086,7 +2086,7 @@ check_pieced_value_bits (const struct va
+@@ -2091,7 +2091,7 @@ check_pieced_value_bits (const struct va
    for (i = 0; i < c->n_pieces && bit_length > 0; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1771,7 +1771,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  
        if (bit_offset > 0)
  	{
-@@ -2124,8 +2124,8 @@ check_pieced_value_bits (const struct va
+@@ -2129,8 +2129,8 @@ check_pieced_value_bits (const struct va
  }
  
  static int
@@ -1782,7 +1782,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  {
    return check_pieced_value_bits (value, bit_offset, bit_length,
  				  DWARF_VALUE_MEMORY);
-@@ -2143,8 +2143,8 @@ check_pieced_value_invalid (const struct
+@@ -2148,8 +2148,8 @@ check_pieced_value_invalid (const struct
     a synthetic pointer.  */
  
  static int
@@ -1793,7 +1793,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  {
    return check_pieced_value_bits (value, bit_offset, bit_length,
  				  DWARF_VALUE_IMPLICIT_POINTER);
-@@ -2169,9 +2169,10 @@ indirect_pieced_value (struct value *val
+@@ -2174,9 +2174,10 @@ indirect_pieced_value (struct value *val
    struct type *type;
    struct frame_info *frame;
    struct dwarf2_locexpr_baton baton;
@@ -1806,7 +1806,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  
    type = check_typedef (value_type (value));
    if (TYPE_CODE (type) != TYPE_CODE_PTR)
-@@ -2185,7 +2186,7 @@ indirect_pieced_value (struct value *val
+@@ -2190,7 +2191,7 @@ indirect_pieced_value (struct value *val
    for (i = 0; i < c->n_pieces && bit_length > 0; i++)
      {
        struct dwarf_expr_piece *p = &c->pieces[i];
@@ -1815,7 +1815,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  
        if (bit_offset > 0)
  	{
-@@ -2401,7 +2402,7 @@ dwarf2_evaluate_loc_desc_full (struct ty
+@@ -2406,7 +2407,7 @@ dwarf2_evaluate_loc_desc_full (struct ty
  	    struct value *value = dwarf_expr_fetch (ctx, 0);
  	    gdb_byte *contents;
  	    const gdb_byte *val_bytes;
@@ -1824,11 +1824,11 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2loc.c
  
  	    if (byte_offset + TYPE_LENGTH (type) > n)
  	      invalid_synthetic_pointer ();
-Index: gdb-7.5.50.20130118/gdb/dwarf2read.c
+Index: gdb-7.5.50.20130215/gdb/dwarf2read.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/dwarf2read.c	2013-01-18 23:27:22.076601328 +0100
-+++ gdb-7.5.50.20130118/gdb/dwarf2read.c	2013-01-18 23:27:28.860607321 +0100
-@@ -1216,12 +1216,12 @@ dwarf2_complex_location_expr_complaint (
+--- gdb-7.5.50.20130215.orig/gdb/dwarf2read.c	2013-02-15 22:40:13.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/dwarf2read.c	2013-02-15 22:40:18.528622067 +0100
+@@ -1227,12 +1227,12 @@ dwarf2_complex_location_expr_complaint (
  }
  
  static void
@@ -1845,7 +1845,7 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2read.c
  }
  
  static void
-@@ -10615,8 +10615,8 @@ dwarf2_add_field (struct field_info *fip
+@@ -10641,8 +10641,8 @@ dwarf2_add_field (struct field_info *fip
  	         object, and then subtract off the number of bits of
  	         the field itself.  The result is the bit offset of
  	         the LSB of the field.  */
@@ -1856,10 +1856,10 @@ Index: gdb-7.5.50.20130118/gdb/dwarf2read.c
  
  	      attr = dwarf2_attr (die, DW_AT_byte_size, cu);
  	      if (attr)
-Index: gdb-7.5.50.20130118/gdb/eval.c
+Index: gdb-7.5.50.20130215/gdb/eval.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/eval.c	2013-01-18 23:27:22.078601331 +0100
-+++ gdb-7.5.50.20130118/gdb/eval.c	2013-01-18 23:30:27.432785712 +0100
+--- gdb-7.5.50.20130215.orig/gdb/eval.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/eval.c	2013-02-15 22:40:18.529622070 +0100
 @@ -294,7 +294,8 @@ evaluate_struct_tuple (struct value *str
    while (--nargs >= 0)
      {
@@ -1912,7 +1912,7 @@ Index: gdb-7.5.50.20130118/gdb/eval.c
  	  LONGEST low_bound, high_bound, index;
  
  	  if (get_discrete_bounds (range_type, &low_bound, &high_bound) < 0)
-@@ -2081,7 +2082,8 @@ evaluate_subexp_standard (struct type *e
+@@ -2078,7 +2079,8 @@ evaluate_subexp_standard (struct type *e
        {
          struct type *type = value_type (arg1);
          struct type *real_type;
@@ -1922,10 +1922,10 @@ Index: gdb-7.5.50.20130118/gdb/eval.c
  	struct value_print_options opts;
  
  	get_user_print_options (&opts);
-Index: gdb-7.5.50.20130118/gdb/f-lang.c
+Index: gdb-7.5.50.20130215/gdb/f-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/f-lang.c	2013-01-18 23:27:22.078601331 +0100
-+++ gdb-7.5.50.20130118/gdb/f-lang.c	2013-01-18 23:27:28.861607323 +0100
+--- gdb-7.5.50.20130215.orig/gdb/f-lang.c	2013-01-01 07:32:42.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/f-lang.c	2013-02-15 22:40:18.529622070 +0100
 @@ -103,7 +103,7 @@ f_printchar (int c, struct type *type, s
  
  static void
@@ -1935,10 +1935,10 @@ Index: gdb-7.5.50.20130118/gdb/f-lang.c
  	    const struct value_print_options *options)
  {
    const char *type_encoding = f_get_encoding (type);
-Index: gdb-7.5.50.20130118/gdb/f-lang.h
+Index: gdb-7.5.50.20130215/gdb/f-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/f-lang.h	2013-01-18 23:27:22.078601331 +0100
-+++ gdb-7.5.50.20130118/gdb/f-lang.h	2013-01-18 23:27:28.861607323 +0100
+--- gdb-7.5.50.20130215.orig/gdb/f-lang.h	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/f-lang.h	2013-02-15 22:40:18.529622070 +0100
 @@ -33,7 +33,7 @@ extern const char *f_object_address_data
    (struct type *type, struct ui_file *stream);
  extern void f_object_address_data_valid_or_error (struct type *type);
@@ -1948,10 +1948,10 @@ Index: gdb-7.5.50.20130118/gdb/f-lang.h
  			 struct ui_file *, int,
  			 const struct value *,
  			 const struct value_print_options *);
-Index: gdb-7.5.50.20130118/gdb/f-valprint.c
+Index: gdb-7.5.50.20130215/gdb/f-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/f-valprint.c	2013-01-18 23:27:22.079601333 +0100
-+++ gdb-7.5.50.20130118/gdb/f-valprint.c	2013-01-18 23:27:28.861607323 +0100
+--- gdb-7.5.50.20130215.orig/gdb/f-valprint.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/f-valprint.c	2013-02-15 22:40:18.529622070 +0100
 @@ -43,7 +43,7 @@ static void f77_create_arrayprint_offset
  					      struct ui_file *);
  static void f77_get_dynamic_length_of_aggregate (struct type *);
@@ -2016,10 +2016,10 @@ Index: gdb-7.5.50.20130118/gdb/f-valprint.c
  
            val_print (TYPE_FIELD_TYPE (type, index), valaddr,
  		     embedded_offset + offset,
-Index: gdb-7.5.50.20130118/gdb/findvar.c
+Index: gdb-7.5.50.20130215/gdb/findvar.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/findvar.c	2013-01-18 23:27:22.079601333 +0100
-+++ gdb-7.5.50.20130118/gdb/findvar.c	2013-01-18 23:30:53.511815716 +0100
+--- gdb-7.5.50.20130215.orig/gdb/findvar.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/findvar.c	2013-02-15 22:40:18.529622070 +0100
 @@ -644,7 +644,7 @@ default_value_from_register (struct type
  			     struct frame_info *frame)
  {
@@ -2052,10 +2052,10 @@ Index: gdb-7.5.50.20130118/gdb/findvar.c
  
        if (value_optimized_out (regval))
  	{
-Index: gdb-7.5.50.20130118/gdb/frame.c
+Index: gdb-7.5.50.20130215/gdb/frame.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/frame.c	2013-01-18 23:27:22.080601335 +0100
-+++ gdb-7.5.50.20130118/gdb/frame.c	2013-01-18 23:27:28.862607325 +0100
+--- gdb-7.5.50.20130215.orig/gdb/frame.c	2013-01-01 07:32:42.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/frame.c	2013-02-15 22:40:18.530622073 +0100
 @@ -1113,7 +1113,7 @@ deprecated_frame_register_read (struct f
  
  int
@@ -2074,10 +2074,10 @@ Index: gdb-7.5.50.20130118/gdb/frame.c
  
    /* Copy the data.  */
    while (len > 0)
-Index: gdb-7.5.50.20130118/gdb/frame.h
+Index: gdb-7.5.50.20130215/gdb/frame.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/frame.h	2013-01-18 23:27:22.080601335 +0100
-+++ gdb-7.5.50.20130118/gdb/frame.h	2013-01-18 23:27:28.862607325 +0100
+--- gdb-7.5.50.20130215.orig/gdb/frame.h	2013-02-01 20:58:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/frame.h	2013-02-15 22:40:18.530622073 +0100
 @@ -532,7 +532,7 @@ extern void put_frame_register (struct f
     contents are optimized out or unavailable, set *OPTIMIZEDP,
     *UNAVAILABLEP accordingly.  */
@@ -2087,20 +2087,20 @@ Index: gdb-7.5.50.20130118/gdb/frame.h
  				     gdb_byte *myaddr,
  				     int *optimizedp, int *unavailablep);
  
-Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
+Index: gdb-7.5.50.20130215/gdb/gdbtypes.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/gdbtypes.c	2013-01-18 23:27:22.081601337 +0100
-+++ gdb-7.5.50.20130118/gdb/gdbtypes.c	2013-01-18 23:28:53.769685242 +0100
-@@ -2091,7 +2091,7 @@ allocate_gnat_aux_type (struct type *typ
-    where init_type is called with a NULL value for NAME).  */
+--- gdb-7.5.50.20130215.orig/gdb/gdbtypes.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/gdbtypes.c	2013-02-15 22:40:39.496648052 +0100
+@@ -2090,7 +2090,7 @@ allocate_gnat_aux_type (struct type *typ
+    least as long as OBJFILE.  */
  
  struct type *
 -init_type (enum type_code code, int length, int flags,
 +init_type (enum type_code code, LONGEST length, int flags,
- 	   char *name, struct objfile *objfile)
+ 	   const char *name, struct objfile *objfile)
  {
    struct type *type;
-@@ -2324,8 +2324,8 @@ is_public_ancestor (struct type *base, s
+@@ -2321,8 +2321,8 @@ is_public_ancestor (struct type *base, s
  
  static int
  is_unique_ancestor_worker (struct type *base, struct type *dclass,
@@ -2111,7 +2111,7 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
  			   CORE_ADDR address, struct value *val)
  {
    int i, count = 0;
-@@ -2336,7 +2336,7 @@ is_unique_ancestor_worker (struct type *
+@@ -2333,7 +2333,7 @@ is_unique_ancestor_worker (struct type *
    for (i = 0; i < TYPE_N_BASECLASSES (dclass) && count < 2; ++i)
      {
        struct type *iter;
@@ -2120,7 +2120,7 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
  
        iter = check_typedef (TYPE_BASECLASS (dclass, i));
  
-@@ -2377,7 +2377,7 @@ is_unique_ancestor_worker (struct type *
+@@ -2374,7 +2374,7 @@ is_unique_ancestor_worker (struct type *
  int
  is_unique_ancestor (struct type *base, struct value *val)
  {
@@ -2129,7 +2129,7 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
  
    return is_unique_ancestor_worker (base, value_type (val), &offset,
  				    value_contents_for_printing (val),
-@@ -3286,7 +3286,7 @@ recursive_dump_type (struct type *type,
+@@ -3283,7 +3283,7 @@ recursive_dump_type (struct type *type,
        break;
      }
    puts_filtered ("\n");
@@ -2138,7 +2138,7 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
    if (TYPE_OBJFILE_OWNED (type))
      {
        printfi_filtered (spaces, "objfile ");
-@@ -3410,8 +3410,8 @@ recursive_dump_type (struct type *type,
+@@ -3407,8 +3407,8 @@ recursive_dump_type (struct type *type,
  			  idx, plongest (TYPE_FIELD_ENUMVAL (type, idx)));
        else
  	printfi_filtered (spaces + 2,
@@ -2149,7 +2149,7 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
  			  TYPE_FIELD_BITSIZE (type, idx));
        gdb_print_host_address (TYPE_FIELD_TYPE (type, idx), gdb_stdout);
        printf_filtered (" name '%s' (",
-@@ -3925,7 +3925,7 @@ copy_type (const struct type *type)
+@@ -3922,7 +3922,7 @@ copy_type (const struct type *type)
  
  struct type *
  arch_type (struct gdbarch *gdbarch,
@@ -2158,10 +2158,10 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.c
  {
    struct type *type;
  
-Index: gdb-7.5.50.20130118/gdb/gdbtypes.h
+Index: gdb-7.5.50.20130215/gdb/gdbtypes.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/gdbtypes.h	2013-01-18 23:27:22.082601339 +0100
-+++ gdb-7.5.50.20130118/gdb/gdbtypes.h	2013-01-18 23:27:28.863607327 +0100
+--- gdb-7.5.50.20130215.orig/gdb/gdbtypes.h	2013-02-15 22:37:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/gdbtypes.h	2013-02-15 22:42:33.846787959 +0100
 @@ -606,7 +606,7 @@ struct main_type
  	   gdbarch_bits_big_endian=0 targets, it is the bit offset to
  	   the LSB.  */
@@ -2184,8 +2184,8 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.h
  extern struct gdbarch *get_type_arch (const struct type *);
  
  /* Helper function to construct objfile-owned types.  */
--extern struct type *init_type (enum type_code, int, int, char *,
-+extern struct type *init_type (enum type_code, LONGEST, int, char *,
+-extern struct type *init_type (enum type_code, int, int, const char *,
++extern struct type *init_type (enum type_code, LONGEST, int, const char *,
  			       struct objfile *);
  
  /* Helper functions to construct architecture-owned types.  */
@@ -2195,10 +2195,10 @@ Index: gdb-7.5.50.20130118/gdb/gdbtypes.h
  extern struct type *arch_integer_type (struct gdbarch *, int, int, char *);
  extern struct type *arch_character_type (struct gdbarch *, int, int, char *);
  extern struct type *arch_boolean_type (struct gdbarch *, int, int, char *);
-Index: gdb-7.5.50.20130118/gdb/gnu-v2-abi.c
+Index: gdb-7.5.50.20130215/gdb/gnu-v2-abi.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/gnu-v2-abi.c	2013-01-18 23:27:22.082601339 +0100
-+++ gdb-7.5.50.20130118/gdb/gnu-v2-abi.c	2013-01-18 23:27:28.863607327 +0100
+--- gdb-7.5.50.20130215.orig/gdb/gnu-v2-abi.c	2013-01-21 18:29:39.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/gnu-v2-abi.c	2013-02-15 22:40:18.532622077 +0100
 @@ -85,7 +85,7 @@ gnuv2_is_operator_name (const char *name
     TYPE is the type in which F is located.  */
  static struct value *
@@ -2250,10 +2250,10 @@ Index: gdb-7.5.50.20130118/gdb/gnu-v2-abi.c
  	    gnuv2_baseclass_offset (type, i, valaddr,
  				    embedded_offset, address, val);
  
-Index: gdb-7.5.50.20130118/gdb/gnu-v3-abi.c
+Index: gdb-7.5.50.20130215/gdb/gnu-v3-abi.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/gnu-v3-abi.c	2013-01-18 23:27:22.083601341 +0100
-+++ gdb-7.5.50.20130118/gdb/gnu-v3-abi.c	2013-01-18 23:27:28.864607329 +0100
+--- gdb-7.5.50.20130215.orig/gdb/gnu-v3-abi.c	2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/gnu-v3-abi.c	2013-02-15 22:40:18.532622077 +0100
 @@ -106,7 +106,7 @@ build_gdb_vtable_type (struct gdbarch *a
  {
    struct type *t;
@@ -2328,10 +2328,10 @@ Index: gdb-7.5.50.20130118/gdb/gnu-v3-abi.c
        struct type *basetype;
  
        if (BASETYPE_VIA_VIRTUAL (domain, i))
-Index: gdb-7.5.50.20130118/gdb/go-lang.h
+Index: gdb-7.5.50.20130215/gdb/go-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/go-lang.h	2013-01-18 23:27:22.083601341 +0100
-+++ gdb-7.5.50.20130118/gdb/go-lang.h	2013-01-18 23:27:28.864607329 +0100
+--- gdb-7.5.50.20130215.orig/gdb/go-lang.h	2013-01-01 07:32:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/go-lang.h	2013-02-15 22:40:18.532622077 +0100
 @@ -83,7 +83,7 @@ extern void go_print_type (struct type *
  /* Defined in go-valprint.c.  */
  
@@ -2341,10 +2341,10 @@ Index: gdb-7.5.50.20130118/gdb/go-lang.h
  			  struct ui_file *stream, int recurse,
  			  const struct value *val,
  			  const struct value_print_options *options);
-Index: gdb-7.5.50.20130118/gdb/go-valprint.c
+Index: gdb-7.5.50.20130215/gdb/go-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/go-valprint.c	2013-01-18 23:27:22.083601341 +0100
-+++ gdb-7.5.50.20130118/gdb/go-valprint.c	2013-01-18 23:27:28.864607329 +0100
+--- gdb-7.5.50.20130215.orig/gdb/go-valprint.c	2013-01-01 07:32:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/go-valprint.c	2013-02-15 22:40:18.532622077 +0100
 @@ -37,7 +37,7 @@
  
  static void
@@ -2367,11 +2367,11 @@ Index: gdb-7.5.50.20130118/gdb/go-valprint.c
  	      const struct value_print_options *options)
  {
    CHECK_TYPEDEF (type);
-Index: gdb-7.5.50.20130118/gdb/i386-nat.c
+Index: gdb-7.5.50.20130215/gdb/i386-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/i386-nat.c	2013-01-18 23:27:22.084601343 +0100
-+++ gdb-7.5.50.20130118/gdb/i386-nat.c	2013-01-18 23:27:28.864607329 +0100
-@@ -292,7 +292,7 @@ static int i386_remove_aligned_watchpoin
+--- gdb-7.5.50.20130215.orig/gdb/i386-nat.c	2013-02-13 15:59:49.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/i386-nat.c	2013-02-15 22:41:53.950739414 +0100
+@@ -290,7 +290,7 @@ static int i386_remove_aligned_watchpoin
     valid value, bombs through internal_error.  */
  static int i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state,
  					      i386_wp_op_t what,
@@ -2380,7 +2380,7 @@ Index: gdb-7.5.50.20130118/gdb/i386-nat.c
  					      enum target_hw_bp_type type);
  
  /* Implementation.  */
-@@ -504,8 +504,8 @@ i386_remove_aligned_watchpoint (struct i
+@@ -501,8 +501,8 @@ i386_remove_aligned_watchpoint (struct i
  
  static int
  i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state,
@@ -2398,12 +2398,12 @@ Index: gdb-7.5.50.20130118/gdb/i386-nat.c
 -i386_region_ok_for_watchpoint (CORE_ADDR addr, int len)
 +i386_region_ok_for_watchpoint (CORE_ADDR addr, LONGEST len)
  {
-   struct i386_debug_reg_state *state = i386_debug_reg_state ();
-   int nregs;
-Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
+   struct i386_debug_reg_state *state
+     = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
+Index: gdb-7.5.50.20130215/gdb/inf-ttrace.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/inf-ttrace.c	2013-01-18 23:27:22.084601343 +0100
-+++ gdb-7.5.50.20130118/gdb/inf-ttrace.c	2013-01-18 23:27:28.864607329 +0100
+--- gdb-7.5.50.20130215.orig/gdb/inf-ttrace.c	2013-01-01 07:32:45.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/inf-ttrace.c	2013-02-15 22:40:18.533622078 +0100
 @@ -364,7 +364,7 @@ inf_ttrace_can_use_hw_breakpoint (int ty
  }
  
@@ -2413,11 +2413,11 @@ Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
  {
    return 1;
  }
-Index: gdb-7.5.50.20130118/gdb/jv-lang.c
+Index: gdb-7.5.50.20130215/gdb/jv-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/jv-lang.c	2013-01-18 23:27:22.084601343 +0100
-+++ gdb-7.5.50.20130118/gdb/jv-lang.c	2013-01-18 23:27:28.865607331 +0100
-@@ -439,7 +439,7 @@ java_link_class_type (struct gdbarch *gd
+--- gdb-7.5.50.20130215.orig/gdb/jv-lang.c	2013-02-15 22:37:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/jv-lang.c	2013-02-15 22:40:18.533622078 +0100
+@@ -437,7 +437,7 @@ java_link_class_type (struct gdbarch *gd
    for (i = TYPE_N_BASECLASSES (type); i < nfields; i++)
      {
        int accflags;
@@ -2426,7 +2426,7 @@ Index: gdb-7.5.50.20130118/gdb/jv-lang.c
  
        if (fields == NULL)
  	{
-@@ -889,7 +889,7 @@ java_printchar (int c, struct type *type
+@@ -887,7 +887,7 @@ java_printchar (int c, struct type *type
  static void
  java_printstr (struct ui_file *stream, struct type *type,
  	       const gdb_byte *string,
@@ -2435,10 +2435,10 @@ Index: gdb-7.5.50.20130118/gdb/jv-lang.c
  	       const struct value_print_options *options)
  {
    const char *type_encoding = java_get_encoding (type);
-Index: gdb-7.5.50.20130118/gdb/jv-lang.h
+Index: gdb-7.5.50.20130215/gdb/jv-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/jv-lang.h	2013-01-18 23:27:22.085601345 +0100
-+++ gdb-7.5.50.20130118/gdb/jv-lang.h	2013-01-18 23:27:28.865607331 +0100
+--- gdb-7.5.50.20130215.orig/gdb/jv-lang.h	2013-01-01 07:32:46.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/jv-lang.h	2013-02-15 22:40:18.533622078 +0100
 @@ -42,8 +42,8 @@ struct builtin_java_type
  
  extern const struct builtin_java_type *builtin_java_type (struct gdbarch *);
@@ -2450,10 +2450,10 @@ Index: gdb-7.5.50.20130118/gdb/jv-lang.h
  			    const struct value *,
  			    const struct value_print_options *);
  
-Index: gdb-7.5.50.20130118/gdb/jv-valprint.c
+Index: gdb-7.5.50.20130215/gdb/jv-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/jv-valprint.c	2013-01-18 23:27:22.085601345 +0100
-+++ gdb-7.5.50.20130118/gdb/jv-valprint.c	2013-01-18 23:27:28.865607331 +0100
+--- gdb-7.5.50.20130215.orig/gdb/jv-valprint.c	2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/jv-valprint.c	2013-02-15 22:40:18.533622078 +0100
 @@ -266,7 +266,7 @@ java_value_print (struct value *val, str
  
  static void
@@ -2472,10 +2472,10 @@ Index: gdb-7.5.50.20130118/gdb/jv-valprint.c
  		struct ui_file *stream, int recurse,
  		const struct value *val,
  		const struct value_print_options *options)
-Index: gdb-7.5.50.20130118/gdb/language.c
+Index: gdb-7.5.50.20130215/gdb/language.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/language.c	2013-01-18 23:27:22.085601345 +0100
-+++ gdb-7.5.50.20130118/gdb/language.c	2013-01-18 23:27:28.865607331 +0100
+--- gdb-7.5.50.20130215.orig/gdb/language.c	2013-01-01 07:32:46.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/language.c	2013-02-15 22:40:18.534622079 +0100
 @@ -720,7 +720,7 @@ unk_lang_printchar (int c, struct type *
  
  static void
@@ -2494,10 +2494,10 @@ Index: gdb-7.5.50.20130118/gdb/language.c
  		    struct ui_file *stream, int recurse,
  		    const struct value *val,
  		    const struct value_print_options *options)
-Index: gdb-7.5.50.20130118/gdb/language.h
+Index: gdb-7.5.50.20130215/gdb/language.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/language.h	2013-01-18 23:27:22.086601346 +0100
-+++ gdb-7.5.50.20130118/gdb/language.h	2013-01-18 23:27:28.865607331 +0100
+--- gdb-7.5.50.20130215.orig/gdb/language.h	2013-01-01 07:32:46.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/language.h	2013-02-15 22:40:18.534622079 +0100
 @@ -175,7 +175,7 @@ struct language_defn
  			  struct ui_file * stream);
  
@@ -2516,10 +2516,10 @@ Index: gdb-7.5.50.20130118/gdb/language.h
  			  struct ui_file *stream, int recurse,
  			  const struct value *val,
  			  const struct value_print_options *options);
-Index: gdb-7.5.50.20130118/gdb/m2-lang.c
+Index: gdb-7.5.50.20130215/gdb/m2-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/m2-lang.c	2013-01-18 23:27:22.086601346 +0100
-+++ gdb-7.5.50.20130118/gdb/m2-lang.c	2013-01-18 23:27:28.866607333 +0100
+--- gdb-7.5.50.20130215.orig/gdb/m2-lang.c	2013-01-07 17:40:36.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/m2-lang.c	2013-02-15 22:40:18.534622079 +0100
 @@ -103,10 +103,10 @@ m2_printchar (int c, struct type *type,
  
  static void
@@ -2554,10 +2554,10 @@ Index: gdb-7.5.50.20130118/gdb/m2-lang.c
  	  i = rep1 - 1;
  	  things_printed += options->repeat_count_threshold;
  	  need_comma = 1;
-Index: gdb-7.5.50.20130118/gdb/m2-lang.h
+Index: gdb-7.5.50.20130215/gdb/m2-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/m2-lang.h	2013-01-18 23:27:22.086601346 +0100
-+++ gdb-7.5.50.20130118/gdb/m2-lang.h	2013-01-18 23:27:28.866607333 +0100
+--- gdb-7.5.50.20130215.orig/gdb/m2-lang.h	2013-01-01 07:32:46.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/m2-lang.h	2013-02-15 22:40:18.534622079 +0100
 @@ -33,7 +33,7 @@ extern void m2_print_typedef (struct typ
  extern int m2_is_long_set (struct type *type);
  extern int m2_is_unbounded_array (struct type *type);
@@ -2567,11 +2567,11 @@ Index: gdb-7.5.50.20130118/gdb/m2-lang.h
  			  struct ui_file *, int,
  			  const struct value *,
  			  const struct value_print_options *);
-Index: gdb-7.5.50.20130118/gdb/m2-typeprint.c
+Index: gdb-7.5.50.20130215/gdb/m2-typeprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/m2-typeprint.c	2013-01-18 23:27:28.866607333 +0100
-+++ gdb-7.5.50.20130118/gdb/m2-typeprint.c	2013-01-18 23:31:45.832877805 +0100
-@@ -236,9 +236,12 @@ static void m2_array (struct type *type,
+--- gdb-7.5.50.20130215.orig/gdb/m2-typeprint.c	2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/m2-typeprint.c	2013-02-15 22:40:18.534622079 +0100
+@@ -233,9 +233,12 @@ static void m2_array (struct type *type,
  	  m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 1);
  	}
        else
@@ -2587,10 +2587,10 @@ Index: gdb-7.5.50.20130118/gdb/m2-typeprint.c
      }
    fprintf_filtered (stream, "] OF ");
    m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
-Index: gdb-7.5.50.20130118/gdb/m2-valprint.c
+Index: gdb-7.5.50.20130215/gdb/m2-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/m2-valprint.c	2013-01-18 23:27:22.087601347 +0100
-+++ gdb-7.5.50.20130118/gdb/m2-valprint.c	2013-01-18 23:27:28.866607333 +0100
+--- gdb-7.5.50.20130215.orig/gdb/m2-valprint.c	2013-01-01 07:32:46.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/m2-valprint.c	2013-02-15 22:40:18.534622079 +0100
 @@ -35,7 +35,7 @@ static int print_unpacked_pointer (struc
  				   struct ui_file *stream);
  static void
@@ -2656,10 +2656,10 @@ Index: gdb-7.5.50.20130118/gdb/m2-valprint.c
  
  		  /* Look for a NULL char.  */
  		  for (temp_len = 0;
-Index: gdb-7.5.50.20130118/gdb/memrange.c
+Index: gdb-7.5.50.20130215/gdb/memrange.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/memrange.c	2013-01-18 23:27:22.087601347 +0100
-+++ gdb-7.5.50.20130118/gdb/memrange.c	2013-01-18 23:27:28.866607333 +0100
+--- gdb-7.5.50.20130215.orig/gdb/memrange.c	2013-01-01 07:32:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/memrange.c	2013-02-15 22:40:18.534622079 +0100
 @@ -21,8 +21,8 @@
  #include "memrange.h"
  
@@ -2671,10 +2671,10 @@ Index: gdb-7.5.50.20130118/gdb/memrange.c
  {
    ULONGEST h, l;
  
-Index: gdb-7.5.50.20130118/gdb/memrange.h
+Index: gdb-7.5.50.20130215/gdb/memrange.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/memrange.h	2013-01-18 23:27:22.087601347 +0100
-+++ gdb-7.5.50.20130118/gdb/memrange.h	2013-01-18 23:27:28.866607333 +0100
+--- gdb-7.5.50.20130215.orig/gdb/memrange.h	2013-01-01 07:32:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/memrange.h	2013-02-15 22:40:18.535622081 +0100
 @@ -30,7 +30,7 @@ struct mem_range
    CORE_ADDR start;
  
@@ -2695,10 +2695,10 @@ Index: gdb-7.5.50.20130118/gdb/memrange.h
  
  /* Sort ranges by start address, then coalesce contiguous or
     overlapping ranges.  */
-Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/mips-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/mips-linux-nat.c	2013-01-18 23:27:22.087601347 +0100
-+++ gdb-7.5.50.20130118/gdb/mips-linux-nat.c	2013-01-18 23:27:28.867607334 +0100
+--- gdb-7.5.50.20130215.orig/gdb/mips-linux-nat.c	2013-01-01 07:32:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/mips-linux-nat.c	2013-02-15 22:40:18.535622081 +0100
 @@ -938,7 +938,7 @@ try_one_watch (struct pt_watch_regs *reg
     the specified region can be covered by the watch registers.  */
  
@@ -2708,10 +2708,10 @@ Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
  {
    struct pt_watch_regs dummy_regs;
    int i;
-Index: gdb-7.5.50.20130118/gdb/opencl-lang.c
+Index: gdb-7.5.50.20130215/gdb/opencl-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/opencl-lang.c	2013-01-18 23:27:22.088601349 +0100
-+++ gdb-7.5.50.20130118/gdb/opencl-lang.c	2013-01-18 23:27:28.868607335 +0100
+--- gdb-7.5.50.20130215.orig/gdb/opencl-lang.c	2013-01-25 18:16:40.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/opencl-lang.c	2013-02-15 22:40:18.535622081 +0100
 @@ -80,11 +80,11 @@ builtin_opencl_type (struct gdbarch *gdb
  
  static struct type *
@@ -2838,10 +2838,10 @@ Index: gdb-7.5.50.20130118/gdb/opencl-lang.c
  
        if (!value_bits_synthetic_pointer (c->val,
  					 c->indices[i] * elsize + comp_offset,
-Index: gdb-7.5.50.20130118/gdb/p-lang.c
+Index: gdb-7.5.50.20130215/gdb/p-lang.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/p-lang.c	2013-01-18 23:27:22.089601351 +0100
-+++ gdb-7.5.50.20130118/gdb/p-lang.c	2013-01-18 23:27:28.868607335 +0100
+--- gdb-7.5.50.20130215.orig/gdb/p-lang.c	2013-01-07 17:40:36.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/p-lang.c	2013-02-15 22:40:18.535622081 +0100
 @@ -95,8 +95,8 @@ pascal_main_name (void)
     are not multiple of TARGET_CHAR_BIT then the results are wrong
     but this does not happen for Free Pascal nor for GPC.  */
@@ -2889,10 +2889,10 @@ Index: gdb-7.5.50.20130118/gdb/p-lang.c
  	  i = rep1 - 1;
  	  things_printed += options->repeat_count_threshold;
  	  need_comma = 1;
-Index: gdb-7.5.50.20130118/gdb/p-lang.h
+Index: gdb-7.5.50.20130215/gdb/p-lang.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/p-lang.h	2013-01-18 23:27:22.089601351 +0100
-+++ gdb-7.5.50.20130118/gdb/p-lang.h	2013-01-18 23:32:17.358916426 +0100
+--- gdb-7.5.50.20130215.orig/gdb/p-lang.h	2013-01-01 07:32:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/p-lang.h	2013-02-15 22:40:18.535622081 +0100
 @@ -35,7 +35,7 @@ extern void pascal_print_type (struct ty
  extern void pascal_print_typedef (struct type *, struct symbol *,
  				  struct ui_file *);
@@ -2927,10 +2927,10 @@ Index: gdb-7.5.50.20130118/gdb/p-lang.h
  					      CORE_ADDR, struct ui_file *,
  					      int,
  					      const struct value *,
-Index: gdb-7.5.50.20130118/gdb/p-valprint.c
+Index: gdb-7.5.50.20130215/gdb/p-valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/p-valprint.c	2013-01-18 23:27:22.089601351 +0100
-+++ gdb-7.5.50.20130118/gdb/p-valprint.c	2013-01-18 23:27:28.868607335 +0100
+--- gdb-7.5.50.20130215.orig/gdb/p-valprint.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/p-valprint.c	2013-02-15 22:40:18.536622084 +0100
 @@ -58,7 +58,7 @@ static const struct generic_val_print_de
  
  void
@@ -2992,10 +2992,10 @@ Index: gdb-7.5.50.20130118/gdb/p-valprint.c
        volatile struct gdb_exception ex;
        int skip = 0;
  
-Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ppc-linux-nat.c	2013-01-18 23:27:22.090601353 +0100
-+++ gdb-7.5.50.20130118/gdb/ppc-linux-nat.c	2013-01-18 23:27:28.869607337 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ppc-linux-nat.c	2013-01-01 07:32:49.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ppc-linux-nat.c	2013-02-15 22:40:18.536622084 +0100
 @@ -1492,7 +1492,7 @@ ppc_linux_can_use_hw_breakpoint (int typ
  }
  
@@ -3005,11 +3005,11 @@ Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
  {
    /* Handle sub-8-byte quantities.  */
    if (len <= 0)
-Index: gdb-7.5.50.20130118/gdb/printcmd.c
+Index: gdb-7.5.50.20130215/gdb/printcmd.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/printcmd.c	2013-01-18 23:27:22.091601355 +0100
-+++ gdb-7.5.50.20130118/gdb/printcmd.c	2013-01-18 23:27:28.869607337 +0100
-@@ -289,7 +289,7 @@ print_formatted (struct value *val, int
+--- gdb-7.5.50.20130215.orig/gdb/printcmd.c	2013-02-15 22:34:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/printcmd.c	2013-02-15 22:40:18.537622086 +0100
+@@ -290,7 +290,7 @@ print_formatted (struct value *val, int
  		 struct ui_file *stream)
  {
    struct type *type = check_typedef (value_type (val));
@@ -3018,7 +3018,7 @@ Index: gdb-7.5.50.20130118/gdb/printcmd.c
  
    if (VALUE_LVAL (val) == lval_memory)
      next_address = value_address (val) + len;
-@@ -367,7 +367,7 @@ print_scalar_formatted (const void *vala
+@@ -368,7 +368,7 @@ print_scalar_formatted (const void *vala
  {
    struct gdbarch *gdbarch = get_type_arch (type);
    LONGEST val_long = 0;
@@ -3027,10 +3027,10 @@ Index: gdb-7.5.50.20130118/gdb/printcmd.c
    enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
  
    /* String printing should go through val_print_scalar_formatted.  */
-Index: gdb-7.5.50.20130118/gdb/procfs.c
+Index: gdb-7.5.50.20130215/gdb/procfs.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/procfs.c	2013-01-18 23:27:22.092601357 +0100
-+++ gdb-7.5.50.20130118/gdb/procfs.c	2013-01-18 23:27:28.870607340 +0100
+--- gdb-7.5.50.20130215.orig/gdb/procfs.c	2013-01-01 07:32:49.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/procfs.c	2013-02-15 22:40:18.537622086 +0100
 @@ -4926,7 +4926,7 @@ procfs_remove_watchpoint (CORE_ADDR addr
  }
  
@@ -3040,10 +3040,10 @@ Index: gdb-7.5.50.20130118/gdb/procfs.c
  {
    /* The man page for proc(4) on Solaris 2.6 and up says that the
       system can support "thousands" of hardware watchpoints, but gives
-Index: gdb-7.5.50.20130118/gdb/python/py-prettyprint.c
+Index: gdb-7.5.50.20130215/gdb/python/py-prettyprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/python/py-prettyprint.c	2013-01-18 23:27:22.092601357 +0100
-+++ gdb-7.5.50.20130118/gdb/python/py-prettyprint.c	2013-01-18 23:27:28.870607340 +0100
+--- gdb-7.5.50.20130215.orig/gdb/python/py-prettyprint.c	2013-01-01 07:33:01.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/python/py-prettyprint.c	2013-02-15 22:40:18.538622088 +0100
 @@ -689,7 +689,7 @@ print_children (PyObject *printer, const
  
  int
@@ -3062,10 +3062,10 @@ Index: gdb-7.5.50.20130118/gdb/python/py-prettyprint.c
  			  struct ui_file *stream, int recurse,
  			  const struct value *val,
  			  const struct value_print_options *options,
-Index: gdb-7.5.50.20130118/gdb/python/python.h
+Index: gdb-7.5.50.20130215/gdb/python/python.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/python/python.h	2013-01-18 23:27:22.092601357 +0100
-+++ gdb-7.5.50.20130118/gdb/python/python.h	2013-01-18 23:27:28.870607340 +0100
+--- gdb-7.5.50.20130215.orig/gdb/python/python.h	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/python/python.h	2013-02-15 22:40:18.538622088 +0100
 @@ -37,7 +37,7 @@ void source_python_script (FILE *file, c
  void run_python_script (int argc, char **argv);
  
@@ -3075,11 +3075,11 @@ Index: gdb-7.5.50.20130118/gdb/python/python.h
  			      struct ui_file *stream, int recurse,
  			      const struct value *val,
  			      const struct value_print_options *options,
-Index: gdb-7.5.50.20130118/gdb/regcache.c
+Index: gdb-7.5.50.20130215/gdb/regcache.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/regcache.c	2013-01-18 23:27:22.093601359 +0100
-+++ gdb-7.5.50.20130118/gdb/regcache.c	2013-01-18 23:27:28.871607342 +0100
-@@ -901,7 +901,7 @@ typedef void (regcache_write_ftype) (str
+--- gdb-7.5.50.20130215.orig/gdb/regcache.c	2013-01-31 19:37:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/regcache.c	2013-02-15 22:40:18.538622088 +0100
+@@ -899,7 +899,7 @@ typedef void (regcache_write_ftype) (str
  
  static enum register_status
  regcache_xfer_part (struct regcache *regcache, int regnum,
@@ -3088,7 +3088,7 @@ Index: gdb-7.5.50.20130118/gdb/regcache.c
  		    enum register_status (*read) (struct regcache *regcache,
  						  int regnum,
  						  gdb_byte *buf),
-@@ -945,7 +945,7 @@ regcache_xfer_part (struct regcache *reg
+@@ -943,7 +943,7 @@ regcache_xfer_part (struct regcache *reg
  
  enum register_status
  regcache_raw_read_part (struct regcache *regcache, int regnum,
@@ -3097,7 +3097,7 @@ Index: gdb-7.5.50.20130118/gdb/regcache.c
  {
    struct regcache_descr *descr = regcache->descr;
  
-@@ -956,7 +956,7 @@ regcache_raw_read_part (struct regcache
+@@ -954,7 +954,7 @@ regcache_raw_read_part (struct regcache
  
  void
  regcache_raw_write_part (struct regcache *regcache, int regnum,
@@ -3106,7 +3106,7 @@ Index: gdb-7.5.50.20130118/gdb/regcache.c
  {
    struct regcache_descr *descr = regcache->descr;
  
-@@ -967,7 +967,7 @@ regcache_raw_write_part (struct regcache
+@@ -965,7 +965,7 @@ regcache_raw_write_part (struct regcache
  
  enum register_status
  regcache_cooked_read_part (struct regcache *regcache, int regnum,
@@ -3115,7 +3115,7 @@ Index: gdb-7.5.50.20130118/gdb/regcache.c
  {
    struct regcache_descr *descr = regcache->descr;
  
-@@ -978,7 +978,7 @@ regcache_cooked_read_part (struct regcac
+@@ -976,7 +976,7 @@ regcache_cooked_read_part (struct regcac
  
  void
  regcache_cooked_write_part (struct regcache *regcache, int regnum,
@@ -3124,10 +3124,10 @@ Index: gdb-7.5.50.20130118/gdb/regcache.c
  {
    struct regcache_descr *descr = regcache->descr;
  
-Index: gdb-7.5.50.20130118/gdb/regcache.h
+Index: gdb-7.5.50.20130215/gdb/regcache.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/regcache.h	2013-01-18 23:27:22.093601359 +0100
-+++ gdb-7.5.50.20130118/gdb/regcache.h	2013-01-18 23:27:28.871607342 +0100
+--- gdb-7.5.50.20130215.orig/gdb/regcache.h	2013-01-01 07:32:49.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/regcache.h	2013-02-15 22:40:18.538622088 +0100
 @@ -89,9 +89,9 @@ extern void regcache_raw_write_unsigned
  
  extern enum register_status
@@ -3155,11 +3155,11 @@ Index: gdb-7.5.50.20130118/gdb/regcache.h
  
  /* Special routines to read/write the PC.  */
  
-Index: gdb-7.5.50.20130118/gdb/remote.c
+Index: gdb-7.5.50.20130215/gdb/remote.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/remote.c	2013-01-18 23:27:22.095601362 +0100
-+++ gdb-7.5.50.20130118/gdb/remote.c	2013-01-18 23:27:28.872607343 +0100
-@@ -8174,7 +8174,7 @@ int remote_hw_watchpoint_length_limit =
+--- gdb-7.5.50.20130215.orig/gdb/remote.c	2013-02-15 22:34:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/remote.c	2013-02-15 22:40:18.540622092 +0100
+@@ -8236,7 +8236,7 @@ int remote_hw_watchpoint_length_limit =
  int remote_hw_breakpoint_limit = -1;
  
  static int
@@ -3168,10 +3168,10 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
  {
    if (remote_hw_watchpoint_length_limit == 0)
      return 0;
-Index: gdb-7.5.50.20130118/gdb/s390-nat.c
+Index: gdb-7.5.50.20130215/gdb/s390-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/s390-nat.c	2013-01-18 23:27:22.096601363 +0100
-+++ gdb-7.5.50.20130118/gdb/s390-nat.c	2013-01-18 23:27:28.872607343 +0100
+--- gdb-7.5.50.20130215.orig/gdb/s390-nat.c	2013-01-01 07:32:50.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/s390-nat.c	2013-02-15 22:40:18.540622092 +0100
 @@ -571,7 +571,7 @@ s390_can_use_hw_breakpoint (int type, in
  }
  
@@ -3181,10 +3181,10 @@ Index: gdb-7.5.50.20130118/gdb/s390-nat.c
  {
    return 1;
  }
-Index: gdb-7.5.50.20130118/gdb/spu-multiarch.c
+Index: gdb-7.5.50.20130215/gdb/spu-multiarch.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/spu-multiarch.c	2013-01-18 23:27:22.096601363 +0100
-+++ gdb-7.5.50.20130118/gdb/spu-multiarch.c	2013-01-18 23:27:28.873607344 +0100
+--- gdb-7.5.50.20130215.orig/gdb/spu-multiarch.c	2013-01-01 07:32:51.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/spu-multiarch.c	2013-02-15 22:40:18.540622092 +0100
 @@ -118,7 +118,7 @@ spu_thread_architecture (struct target_o
  
  /* Override the to_region_ok_for_hw_watchpoint routine.  */
@@ -3194,10 +3194,10 @@ Index: gdb-7.5.50.20130118/gdb/spu-multiarch.c
  {
    struct target_ops *ops_beneath = find_target_beneath (&spu_ops);
    while (ops_beneath && !ops_beneath->to_region_ok_for_hw_watchpoint)
-Index: gdb-7.5.50.20130118/gdb/stack.c
+Index: gdb-7.5.50.20130215/gdb/stack.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/stack.c	2013-01-18 23:27:22.096601363 +0100
-+++ gdb-7.5.50.20130118/gdb/stack.c	2013-01-18 23:27:28.873607344 +0100
+--- gdb-7.5.50.20130215.orig/gdb/stack.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/stack.c	2013-02-15 22:40:18.540622092 +0100
 @@ -173,7 +173,7 @@ print_stack_frame (struct frame_info *fr
     argument (not just the first nameless argument).  */
  
@@ -3216,7 +3216,7 @@ Index: gdb-7.5.50.20130118/gdb/stack.c
    /* Number of ints of arguments that we have printed so far.  */
    int args_printed = 0;
    struct cleanup *old_chain;
-@@ -537,8 +537,8 @@ print_frame_args (struct symbol *func, s
+@@ -535,8 +535,8 @@ print_frame_args (struct symbol *func, s
  	    case LOC_ARG:
  	    case LOC_REF_ARG:
  	      {
@@ -3227,7 +3227,7 @@ Index: gdb-7.5.50.20130118/gdb/stack.c
  
  		/* Compute address of next argument by adding the size of
  		   this argument and rounding to an int boundary.  */
-@@ -673,7 +673,7 @@ print_frame_args (struct symbol *func, s
+@@ -671,7 +671,7 @@ print_frame_args (struct symbol *func, s
       enough about the stack to find them.  */
    if (num != -1)
      {
@@ -3236,11 +3236,11 @@ Index: gdb-7.5.50.20130118/gdb/stack.c
  
        if (highest_offset == -1)
  	start = gdbarch_frame_args_skip (get_frame_arch (frame));
-Index: gdb-7.5.50.20130118/gdb/symmisc.c
+Index: gdb-7.5.50.20130215/gdb/symmisc.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/symmisc.c	2013-01-18 23:27:22.097601365 +0100
-+++ gdb-7.5.50.20130118/gdb/symmisc.c	2013-01-18 23:27:28.873607344 +0100
-@@ -524,11 +524,11 @@ print_symbol (void *args)
+--- gdb-7.5.50.20130215.orig/gdb/symmisc.c	2013-02-15 22:34:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/symmisc.c	2013-02-15 22:40:18.541622094 +0100
+@@ -527,11 +527,11 @@ print_symbol (void *args)
  
  	case LOC_CONST_BYTES:
  	  {
@@ -3255,10 +3255,10 @@ Index: gdb-7.5.50.20130118/gdb/symmisc.c
  	    for (i = 0; i < TYPE_LENGTH (type); i++)
  	      fprintf_filtered (outfile, " %02x",
  				(unsigned) SYMBOL_VALUE_BYTES (symbol)[i]);
-Index: gdb-7.5.50.20130118/gdb/target.c
+Index: gdb-7.5.50.20130215/gdb/target.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/target.c	2013-01-18 23:27:22.098601367 +0100
-+++ gdb-7.5.50.20130118/gdb/target.c	2013-01-18 23:32:39.159943674 +0100
+--- gdb-7.5.50.20130215.orig/gdb/target.c	2013-01-31 17:32:44.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/target.c	2013-02-15 22:40:18.541622094 +0100
 @@ -51,7 +51,7 @@ static void default_terminal_info (char
  static int default_watchpoint_addr_within_range (struct target_ops *,
  						 CORE_ADDR, CORE_ADDR, int);
@@ -3277,7 +3277,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  
  static int debug_to_can_accel_watchpoint_condition (CORE_ADDR, int, int,
  						    struct expression *);
-@@ -3552,7 +3552,7 @@ target_fileio_read_stralloc (const char
+@@ -3550,7 +3550,7 @@ target_fileio_read_stralloc (const char
  
  
  static int
@@ -3286,7 +3286,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  {
    return (len <= gdbarch_ptr_bit (target_gdbarch ()) / TARGET_CHAR_BIT);
  }
-@@ -4253,7 +4253,7 @@ debug_to_can_use_hw_breakpoint (int type
+@@ -4251,7 +4251,7 @@ debug_to_can_use_hw_breakpoint (int type
  }
  
  static int
@@ -3295,10 +3295,10 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  {
    CORE_ADDR retval;
  
-Index: gdb-7.5.50.20130118/gdb/target.h
+Index: gdb-7.5.50.20130215/gdb/target.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/target.h	2013-01-18 23:27:22.099601369 +0100
-+++ gdb-7.5.50.20130118/gdb/target.h	2013-01-18 23:27:28.874607346 +0100
+--- gdb-7.5.50.20130215.orig/gdb/target.h	2013-02-15 22:37:30.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/target.h	2013-02-15 22:40:18.542622096 +0100
 @@ -482,7 +482,7 @@ struct target_ops
  
      /* Documentation of this routine is provided with the corresponding
@@ -3308,11 +3308,11 @@ Index: gdb-7.5.50.20130118/gdb/target.h
  
      int (*to_can_accel_watchpoint_condition) (CORE_ADDR, int, int,
  					      struct expression *);
-Index: gdb-7.5.50.20130118/gdb/tracepoint.c
+Index: gdb-7.5.50.20130215/gdb/tracepoint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/tracepoint.c	2013-01-18 23:27:22.100601371 +0100
-+++ gdb-7.5.50.20130118/gdb/tracepoint.c	2013-01-18 23:27:28.875607349 +0100
-@@ -934,13 +934,13 @@ add_register (struct collection_list *co
+--- gdb-7.5.50.20130215.orig/gdb/tracepoint.c	2013-02-14 11:19:39.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/tracepoint.c	2013-02-15 22:40:18.543622099 +0100
+@@ -955,13 +955,13 @@ add_register (struct collection_list *co
  static void
  add_memrange (struct collection_list *memranges, 
  	      int type, bfd_signed_vma base,
@@ -3328,7 +3328,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
      }
  
    /* type: memrange_absolute == memory, other n == basereg */
-@@ -969,7 +969,7 @@ collect_symbol (struct collection_list *
+@@ -990,7 +990,7 @@ collect_symbol (struct collection_list *
  		long frame_regno, long frame_offset,
  		CORE_ADDR scope)
  {
@@ -3337,7 +3337,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
    unsigned int reg;
    bfd_signed_vma offset;
    int treat_as_expr = 0;
-@@ -993,8 +993,8 @@ collect_symbol (struct collection_list *
+@@ -1014,8 +1014,8 @@ collect_symbol (struct collection_list *
  	  char tmp[40];
  
  	  sprintf_vma (tmp, offset);
@@ -3348,7 +3348,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
  			   tmp /* address */);
  	}
        /* A struct may be a C++ class with static fields, go to general
-@@ -1026,8 +1026,8 @@ collect_symbol (struct collection_list *
+@@ -1047,8 +1047,8 @@ collect_symbol (struct collection_list *
        offset = frame_offset + SYMBOL_VALUE (sym);
        if (info_verbose)
  	{
@@ -3359,7 +3359,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
  	  printf_vma (offset);
  	  printf_filtered (" from frame ptr reg %d\n", reg);
  	}
-@@ -1038,8 +1038,8 @@ collect_symbol (struct collection_list *
+@@ -1059,8 +1059,8 @@ collect_symbol (struct collection_list *
        offset = 0;
        if (info_verbose)
  	{
@@ -3370,7 +3370,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
  	  printf_vma (offset);
  	  printf_filtered (" from reg %d\n", reg);
  	}
-@@ -1050,8 +1050,8 @@ collect_symbol (struct collection_list *
+@@ -1071,8 +1071,8 @@ collect_symbol (struct collection_list *
        offset = frame_offset + SYMBOL_VALUE (sym);
        if (info_verbose)
  	{
@@ -3381,7 +3381,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
  	  printf_vma (offset);
  	  printf_filtered (" from frame ptr reg %d\n", reg);
  	}
-@@ -2620,7 +2620,8 @@ scope_info (char *args, int from_tty)
+@@ -2642,7 +2642,8 @@ scope_info (char *args, int from_tty)
    const char *symname;
    char *save_args = args;
    struct block_iterator iter;
@@ -3391,7 +3391,7 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
    struct gdbarch *gdbarch;
    int regno;
  
-@@ -2750,8 +2751,11 @@ scope_info (char *args, int from_tty)
+@@ -2772,8 +2773,11 @@ scope_info (char *args, int from_tty)
  	      break;
  	    }
  	  if (SYMBOL_TYPE (sym))
@@ -3405,10 +3405,10 @@ Index: gdb-7.5.50.20130118/gdb/tracepoint.c
  	}
        if (BLOCK_FUNCTION (block))
  	break;
-Index: gdb-7.5.50.20130118/gdb/typeprint.c
+Index: gdb-7.5.50.20130215/gdb/typeprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/typeprint.c	2013-01-18 23:27:28.876607351 +0100
-+++ gdb-7.5.50.20130118/gdb/typeprint.c	2013-01-18 23:33:02.702973610 +0100
+--- gdb-7.5.50.20130215.orig/gdb/typeprint.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/typeprint.c	2013-02-15 22:40:18.543622099 +0100
 @@ -409,7 +409,7 @@ whatis_exp (char *exp, int show)
    struct type *real_type = NULL;
    struct type *type;
@@ -3418,10 +3418,10 @@ Index: gdb-7.5.50.20130118/gdb/typeprint.c
    int using_enc = 0;
    struct value_print_options opts;
    struct type_print_options flags = default_ptype_flags;
-Index: gdb-7.5.50.20130118/gdb/valarith.c
+Index: gdb-7.5.50.20130215/gdb/valarith.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/valarith.c	2013-01-18 23:27:22.101601373 +0100
-+++ gdb-7.5.50.20130118/gdb/valarith.c	2013-01-18 23:27:28.876607351 +0100
+--- gdb-7.5.50.20130215.orig/gdb/valarith.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/valarith.c	2013-02-15 22:40:18.543622099 +0100
 @@ -190,15 +190,15 @@ value_subscript (struct value *array, LO
     to doubles, but no longer does.  */
  
@@ -3442,7 +3442,7 @@ Index: gdb-7.5.50.20130118/gdb/valarith.c
    struct value *v;
  
    if (index < lowerbound || (!TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (array_type)
-@@ -636,7 +636,7 @@ value_concat (struct value *arg1, struct
+@@ -635,7 +635,7 @@ value_concat (struct value *arg1, struct
    struct value *inval1;
    struct value *inval2;
    struct value *outval = NULL;
@@ -3451,7 +3451,7 @@ Index: gdb-7.5.50.20130118/gdb/valarith.c
    int count, idx;
    char *ptr;
    char inchar;
-@@ -1444,7 +1444,7 @@ value_binop (struct value *arg1, struct
+@@ -1488,7 +1488,7 @@ value_binop (struct value *arg1, struct
  int
  value_logical_not (struct value *arg1)
  {
@@ -3460,7 +3460,7 @@ Index: gdb-7.5.50.20130118/gdb/valarith.c
    const gdb_byte *p;
    struct type *type1;
  
-@@ -1475,11 +1475,11 @@ value_logical_not (struct value *arg1)
+@@ -1519,11 +1519,11 @@ value_logical_not (struct value *arg1)
  static int
  value_strcmp (struct value *arg1, struct value *arg2)
  {
@@ -3475,10 +3475,10 @@ Index: gdb-7.5.50.20130118/gdb/valarith.c
  
    for (i = 0; i < len; i++)
      {
-Index: gdb-7.5.50.20130118/gdb/valops.c
+Index: gdb-7.5.50.20130215/gdb/valops.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/valops.c	2013-01-18 23:27:22.104601379 +0100
-+++ gdb-7.5.50.20130118/gdb/valops.c	2013-01-18 23:27:28.877607352 +0100
+--- gdb-7.5.50.20130215.orig/gdb/valops.c	2013-02-15 22:37:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/valops.c	2013-02-15 22:41:34.751715867 +0100
 @@ -54,11 +54,11 @@ static int typecmp (int staticp, int var
  		    struct field t1[], struct value *t2[]);
  
@@ -3547,7 +3547,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  	  LONGEST low_bound, high_bound, new_length;
  
  	  if (get_discrete_bounds (range_type, &low_bound, &high_bound) < 0)
-@@ -656,7 +657,7 @@ value_reinterpret_cast (struct type *typ
+@@ -640,7 +641,7 @@ value_reinterpret_cast (struct type *typ
  static int
  dynamic_cast_check_1 (struct type *desired_type,
  		      const gdb_byte *valaddr,
@@ -3556,7 +3556,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  		      CORE_ADDR address,
  		      struct value *val,
  		      struct type *search_type,
-@@ -668,8 +669,8 @@ dynamic_cast_check_1 (struct type *desir
+@@ -652,8 +653,8 @@ dynamic_cast_check_1 (struct type *desir
  
    for (i = 0; i < TYPE_N_BASECLASSES (search_type) && result_count < 2; ++i)
      {
@@ -3567,7 +3567,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  
        if (class_types_same_p (desired_type, TYPE_BASECLASS (search_type, i)))
  	{
-@@ -703,7 +704,7 @@ dynamic_cast_check_1 (struct type *desir
+@@ -687,7 +688,7 @@ dynamic_cast_check_1 (struct type *desir
  static int
  dynamic_cast_check_2 (struct type *desired_type,
  		      const gdb_byte *valaddr,
@@ -3576,7 +3576,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  		      CORE_ADDR address,
  		      struct value *val,
  		      struct type *search_type,
-@@ -713,7 +714,7 @@ dynamic_cast_check_2 (struct type *desir
+@@ -697,7 +698,7 @@ dynamic_cast_check_2 (struct type *desir
  
    for (i = 0; i < TYPE_N_BASECLASSES (search_type) && result_count < 2; ++i)
      {
@@ -3585,7 +3585,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  
        if (! BASETYPE_VIA_PUBLIC (search_type, i))
  	continue;
-@@ -744,7 +745,8 @@ dynamic_cast_check_2 (struct type *desir
+@@ -728,7 +729,8 @@ dynamic_cast_check_2 (struct type *desir
  struct value *
  value_dynamic_cast (struct type *type, struct value *arg)
  {
@@ -3595,7 +3595,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
    struct type *resolved_type = check_typedef (type);
    struct type *arg_type = check_typedef (value_type (arg));
    struct type *class_type, *rtti_type;
-@@ -1197,7 +1199,7 @@ value_fetch_lazy (struct value *val)
+@@ -1181,7 +1183,7 @@ value_fetch_lazy (struct value *val)
  }
  
  void
@@ -3694,19 +3694,18 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  		      int *static_memfuncp, struct type *type)
  {
    int i;
-@@ -2347,9 +2349,9 @@ search_struct_method (const char *name,
+@@ -2347,8 +2349,8 @@ search_struct_method (const char *name,
  
    for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
      {
 -      int base_offset;
-+      LONGEST base_offset;
-       int skip = 0;
 -      int this_offset;
++      LONGEST base_offset;
 +      LONGEST this_offset;
  
        if (BASETYPE_VIA_VIRTUAL (type, i))
  	{
-@@ -2531,8 +2533,8 @@ value_struct_elt (struct value **argp, s
+@@ -2530,8 +2532,8 @@ value_struct_elt (struct value **argp, s
  
  static struct fn_field *
  find_method_list (struct value **argp, const char *method,
@@ -3717,7 +3716,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  {
    int i;
    struct fn_field *f;
-@@ -2565,7 +2567,7 @@ find_method_list (struct value **argp, c
+@@ -2564,7 +2566,7 @@ find_method_list (struct value **argp, c
    /* Not found in object, check in base subobjects.  */
    for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
      {
@@ -3726,7 +3725,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  
        if (BASETYPE_VIA_VIRTUAL (type, i))
  	{
-@@ -2601,7 +2603,7 @@ find_method_list (struct value **argp, c
+@@ -2600,7 +2602,7 @@ find_method_list (struct value **argp, c
  static struct fn_field *
  value_find_oload_method_list (struct value **argp, const char *method,
  			      int offset, int *num_fns, 
@@ -3735,7 +3734,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  {
    struct type *t;
  
-@@ -2693,7 +2695,7 @@ find_overload_match (struct value **args
+@@ -2690,7 +2692,7 @@ find_overload_match (struct value **args
    /* Number of overloaded instances being considered.  */
    int num_fns = 0;
    struct type *basetype = NULL;
@@ -3744,7 +3743,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  
    struct cleanup *all_cleanups = make_cleanup (null_cleanup, NULL);
  
-@@ -3363,7 +3365,7 @@ compare_parameters (struct type *t1, str
+@@ -3360,7 +3362,7 @@ compare_parameters (struct type *t1, str
     the form "DOMAIN::NAME".  */
  
  static struct value *
@@ -3753,7 +3752,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  				struct type *curtype, char *name,
  				struct type *intype, 
  				int want_address,
-@@ -3400,7 +3402,7 @@ value_struct_elt_for_reference (struct t
+@@ -3397,7 +3399,7 @@ value_struct_elt_for_reference (struct t
  	  if (want_address)
  	    return value_from_longest
  	      (lookup_memberptr_type (TYPE_FIELD_TYPE (t, i), domain),
@@ -3762,7 +3761,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  	  else if (noside == EVAL_AVOID_SIDE_EFFECTS)
  	    return allocate_value (TYPE_FIELD_TYPE (t, i));
  	  else
-@@ -3543,7 +3545,7 @@ value_struct_elt_for_reference (struct t
+@@ -3540,7 +3542,7 @@ value_struct_elt_for_reference (struct t
    for (i = TYPE_N_BASECLASSES (t) - 1; i >= 0; i--)
      {
        struct value *v;
@@ -3771,7 +3770,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  
        if (BASETYPE_VIA_VIRTUAL (t, i))
  	base_offset = 0;
-@@ -3633,7 +3635,7 @@ value_maybe_namespace_elt (const struct
+@@ -3630,7 +3632,7 @@ value_maybe_namespace_elt (const struct
  
  struct type *
  value_rtti_indirect_type (struct value *v, int *full, 
@@ -3780,7 +3779,7 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
  {
    struct value *target;
    struct type *type, *real_type, *target_type;
-@@ -3683,12 +3685,12 @@ value_rtti_indirect_type (struct value *
+@@ -3680,12 +3682,12 @@ value_rtti_indirect_type (struct value *
  struct value *
  value_full_object (struct value *argp, 
  		   struct type *rtype, 
@@ -3795,10 +3794,10 @@ Index: gdb-7.5.50.20130118/gdb/valops.c
    int using_enc = 0;
    struct value *new_val;
  
-Index: gdb-7.5.50.20130118/gdb/valprint.c
+Index: gdb-7.5.50.20130215/gdb/valprint.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/valprint.c	2013-01-18 23:27:22.105601380 +0100
-+++ gdb-7.5.50.20130118/gdb/valprint.c	2013-01-18 23:27:28.877607352 +0100
+--- gdb-7.5.50.20130215.orig/gdb/valprint.c	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/valprint.c	2013-02-15 22:40:18.545622104 +0100
 @@ -299,7 +299,7 @@ scalar_type_p (struct type *type)
  int
  valprint_check_validity (struct ui_file *stream,
@@ -3817,7 +3816,7 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
  		   struct ui_file *stream, int recurse,
  		   const struct value *original_value,
  		   const struct value_print_options *options,
-@@ -726,7 +726,7 @@ generic_val_print (struct type *type, co
+@@ -725,7 +725,7 @@ generic_val_print (struct type *type, co
     RECURSE.  */
  
  void
@@ -3826,7 +3825,7 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
  	   CORE_ADDR address, struct ui_file *stream, int recurse,
  	   const struct value *val,
  	   const struct value_print_options *options,
-@@ -938,7 +938,7 @@ val_print_type_code_flags (struct type *
+@@ -937,7 +937,7 @@ val_print_type_code_flags (struct type *
  
  void
  val_print_scalar_formatted (struct type *type,
@@ -3835,7 +3834,7 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
  			    const struct value *val,
  			    const struct value_print_options *options,
  			    int size,
-@@ -1479,7 +1479,7 @@ print_decimal_chars (struct ui_file *str
+@@ -1478,7 +1478,7 @@ print_decimal_chars (struct ui_file *str
  
  void
  print_hex_chars (struct ui_file *stream, const gdb_byte *valaddr,
@@ -3844,7 +3843,7 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
  {
    const gdb_byte *p;
  
-@@ -1596,23 +1596,23 @@ maybe_print_array_index (struct type *in
+@@ -1595,23 +1595,23 @@ maybe_print_array_index (struct type *in
  
  void
  val_print_array_elements (struct type *type,
@@ -3874,7 +3873,7 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
    LONGEST low_bound, high_bound;
    struct cleanup *back_to;
    CORE_ADDR saved_address = address;
-@@ -1707,7 +1707,7 @@ val_print_array_elements (struct type *t
+@@ -1706,7 +1706,7 @@ val_print_array_elements (struct type *t
  		     address, stream, recurse + 1, val, options,
  		     current_language);
  	  annotate_elt_rep (reps);
@@ -3883,7 +3882,7 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
  	  annotate_elt_rep_end ();
  
  	  i = rep1 - 1;
-@@ -2358,7 +2358,7 @@ print_converted_chars_to_obstack (struct
+@@ -2357,7 +2357,7 @@ print_converted_chars_to_obstack (struct
  
  void
  generic_printstr (struct ui_file *stream, struct type *type, 
@@ -3892,10 +3891,10 @@ Index: gdb-7.5.50.20130118/gdb/valprint.c
  		  const char *encoding, int force_ellipses,
  		  int quote_char, int c_style_terminator,
  		  const struct value_print_options *options)
-Index: gdb-7.5.50.20130118/gdb/valprint.h
+Index: gdb-7.5.50.20130215/gdb/valprint.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/valprint.h	2013-01-18 23:27:22.106601381 +0100
-+++ gdb-7.5.50.20130118/gdb/valprint.h	2013-01-18 23:27:28.878607353 +0100
+--- gdb-7.5.50.20130215.orig/gdb/valprint.h	2013-01-08 03:00:34.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/valprint.h	2013-02-15 22:40:18.545622104 +0100
 @@ -113,11 +113,11 @@ extern void maybe_print_array_index (str
                                       struct ui_file *stream,
  				     const struct value_print_options *);
@@ -3946,10 +3945,10 @@ Index: gdb-7.5.50.20130118/gdb/valprint.h
  			      const char *encoding, int force_ellipses,
  			      int quote_char, int c_style_terminator,
  			      const struct value_print_options *options);
-Index: gdb-7.5.50.20130118/gdb/value.c
+Index: gdb-7.5.50.20130215/gdb/value.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/value.c	2013-01-18 23:27:22.108601385 +0100
-+++ gdb-7.5.50.20130118/gdb/value.c	2013-01-18 23:27:28.878607353 +0100
+--- gdb-7.5.50.20130215.orig/gdb/value.c	2013-02-15 22:37:04.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/value.c	2013-02-15 22:40:18.545622104 +0100
 @@ -68,10 +68,10 @@ struct internal_function
  struct range
  {
@@ -4133,7 +4132,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  {
    value->pointed_to_offset = val;
  }
-@@ -1974,7 +1977,7 @@ get_internalvar_function (struct interna
+@@ -1969,7 +1972,7 @@ get_internalvar_function (struct interna
  }
  
  void
@@ -4142,7 +4141,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  			   int bitsize, struct value *newval)
  {
    gdb_byte *addr;
-@@ -2681,7 +2684,7 @@ set_value_enclosing_type (struct value *
+@@ -2676,7 +2679,7 @@ set_value_enclosing_type (struct value *
     FIELDNO says which field.  */
  
  struct value *
@@ -4151,7 +4150,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  		       int fieldno, struct type *arg_type)
  {
    struct value *v;
-@@ -2711,7 +2714,7 @@ value_primitive_field (struct value *arg
+@@ -2706,7 +2709,7 @@ value_primitive_field (struct value *arg
  	 bit.  Assume that the address, offset, and embedded offset
  	 are sufficiently aligned.  */
  
@@ -4160,7 +4159,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
        int container_bitsize = TYPE_LENGTH (type) * 8;
  
        v = allocate_value_lazy (type);
-@@ -2734,7 +2737,7 @@ value_primitive_field (struct value *arg
+@@ -2729,7 +2732,7 @@ value_primitive_field (struct value *arg
        /* This field is actually a base subobject, so preserve the
  	 entire object's contents for later references to virtual
  	 bases, etc.  */
@@ -4169,7 +4168,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  
        /* Lazy register values with offsets are not supported.  */
        if (VALUE_LVAL (arg1) == lval_register && value_lazy (arg1))
-@@ -2811,7 +2814,7 @@ value_field (struct value *arg1, int fie
+@@ -2806,7 +2809,7 @@ value_field (struct value *arg1, int fie
  struct value *
  value_fn_field (struct value **arg1p, struct fn_field *f,
  		int j, struct type *type,
@@ -4178,7 +4177,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  {
    struct value *v;
    struct type *ftype = TYPE_FN_FIELD_TYPE (f, j);
-@@ -2871,8 +2874,8 @@ value_fn_field (struct value **arg1p, st
+@@ -2866,8 +2869,8 @@ value_fn_field (struct value **arg1p, st
  
  static int
  unpack_value_bits_as_long_1 (struct type *field_type, const gdb_byte *valaddr,
@@ -4189,7 +4188,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  			     LONGEST *result)
  {
    enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (field_type));
-@@ -2880,7 +2883,7 @@ unpack_value_bits_as_long_1 (struct type
+@@ -2875,7 +2878,7 @@ unpack_value_bits_as_long_1 (struct type
    ULONGEST valmask;
    int lsbcount;
    int bytes_read;
@@ -4198,7 +4197,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  
    /* Read the minimum number of bytes required; there may not be
       enough bytes to read an entire ULONGEST.  */
-@@ -2950,7 +2953,7 @@ unpack_value_bits_as_long_1 (struct type
+@@ -2945,7 +2948,7 @@ unpack_value_bits_as_long_1 (struct type
  
  int
  unpack_value_bits_as_long (struct type *field_type, const gdb_byte *valaddr,
@@ -4207,7 +4206,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  			   const struct value *original_value,
  			   LONGEST *result)
  {
-@@ -2968,10 +2971,10 @@ unpack_value_bits_as_long (struct type *
+@@ -2963,10 +2966,10 @@ unpack_value_bits_as_long (struct type *
  
  static int
  unpack_value_field_as_long_1 (struct type *type, const gdb_byte *valaddr,
@@ -4220,7 +4219,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
    int bitsize = TYPE_FIELD_BITSIZE (type, fieldno);
    struct type *field_type = TYPE_FIELD_TYPE (type, fieldno);
  
-@@ -2987,7 +2990,7 @@ unpack_value_field_as_long_1 (struct typ
+@@ -2982,7 +2985,7 @@ unpack_value_field_as_long_1 (struct typ
  
  int
  unpack_value_field_as_long (struct type *type, const gdb_byte *valaddr,
@@ -4229,7 +4228,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  			    const struct value *val, LONGEST *result)
  {
    gdb_assert (val != NULL);
-@@ -3019,7 +3022,7 @@ unpack_field_as_long (struct type *type,
+@@ -3014,7 +3017,7 @@ unpack_field_as_long (struct type *type,
  struct value *
  value_field_bitfield (struct type *type, int fieldno,
  		      const gdb_byte *valaddr,
@@ -4238,7 +4237,7 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  {
    LONGEST l;
  
-@@ -3046,12 +3049,12 @@ value_field_bitfield (struct type *type,
+@@ -3041,12 +3044,12 @@ value_field_bitfield (struct type *type,
  
  void
  modify_field (struct type *type, gdb_byte *addr,
@@ -4253,10 +4252,10 @@ Index: gdb-7.5.50.20130118/gdb/value.c
  
    /* Normalize BITPOS.  */
    addr += bitpos / 8;
-Index: gdb-7.5.50.20130118/gdb/value.h
+Index: gdb-7.5.50.20130215/gdb/value.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/value.h	2013-01-18 23:27:22.109601387 +0100
-+++ gdb-7.5.50.20130118/gdb/value.h	2013-01-18 23:27:28.879607355 +0100
+--- gdb-7.5.50.20130215.orig/gdb/value.h	2013-02-15 22:31:37.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/value.h	2013-02-15 22:40:18.546622106 +0100
 @@ -82,8 +82,8 @@ extern void set_value_parent (struct val
     within the registers structure.  Note also the member
     embedded_offset below.  */
@@ -4268,7 +4267,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  /* The comment from "struct value" reads: ``Is it modifiable?  Only
     relevant if lval != not_lval.''.  Shouldn't the value instead be
-@@ -154,10 +154,10 @@ extern struct type *value_actual_type (s
+@@ -152,10 +152,10 @@ extern struct type *value_actual_type (s
  				       int resolve_simple_types,
  				       int *real_type_found);
  
@@ -4283,7 +4282,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  /* For lval_computed values, this structure holds functions used to
     retrieve and set the value (or portions of the value).
-@@ -185,7 +185,8 @@ struct lval_funcs
+@@ -183,7 +183,8 @@ struct lval_funcs
    /* Check the validity of some bits in VALUE.  This should return 1
       if all the bits starting at OFFSET and extending for LENGTH bits
       are valid, or 0 if any bit is invalid.  */
@@ -4293,7 +4292,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
    /* Return 1 if any bit in VALUE is valid, 0 if they are all invalid.  */
    int (*check_any_valid) (const struct value *value);
-@@ -203,7 +204,7 @@ struct lval_funcs
+@@ -201,7 +202,7 @@ struct lval_funcs
    /* If non-NULL, this is used to determine whether the indicated bits
       of VALUE are a synthetic pointer.  */
    int (*check_synthetic_pointer) (const struct value *value,
@@ -4302,7 +4301,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
    /* Return a duplicate of VALUE's closure, for use in a new value.
       This may simply return the same closure, if VALUE's is
-@@ -240,7 +241,7 @@ extern struct value *allocate_computed_v
+@@ -238,7 +239,7 @@ extern struct value *allocate_computed_v
     Otherwise, return 1.  */
  
  extern int valprint_check_validity (struct ui_file *stream, struct type *type,
@@ -4311,7 +4310,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  				    const struct value *val);
  
  extern struct value *allocate_optimized_out_value (struct type *type);
-@@ -411,13 +412,13 @@ extern struct value *coerce_array (struc
+@@ -409,13 +410,13 @@ extern struct value *coerce_array (struc
     bits in the given range are valid, zero if any bit is invalid.  */
  
  extern int value_bits_valid (const struct value *value,
@@ -4327,7 +4326,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  /* Given a value, determine whether the contents bytes starting at
     OFFSET and extending for LENGTH bytes are available.  This returns
-@@ -425,7 +426,7 @@ extern int value_bits_synthetic_pointer
+@@ -423,7 +424,7 @@ extern int value_bits_synthetic_pointer
     byte is unavailable.  */
  
  extern int value_bytes_available (const struct value *value,
@@ -4336,7 +4335,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  /* Like value_bytes_available, but return false if any byte in the
     whole object is unavailable.  */
-@@ -435,7 +436,7 @@ extern int value_entirely_available (str
+@@ -433,7 +434,7 @@ extern int value_entirely_available (str
     LENGTH bytes as unavailable.  */
  
  extern void mark_value_bytes_unavailable (struct value *value,
@@ -4345,7 +4344,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  /* Compare LENGTH bytes of VAL1's contents starting at OFFSET1 with
     LENGTH bytes of VAL2's contents starting at OFFSET2.
-@@ -445,7 +446,7 @@ extern void mark_value_bytes_unavailable
+@@ -443,7 +444,7 @@ extern void mark_value_bytes_unavailable
     example, to compare a complete object value with itself, including
     its enclosing type chunk, you'd do:
  
@@ -4354,7 +4353,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
       value_available_contents (val, 0, val, 0, len);
  
     Returns true iff the set of available contents match.  Unavailable
-@@ -467,9 +468,10 @@ extern void mark_value_bytes_unavailable
+@@ -465,9 +466,10 @@ extern void mark_value_bytes_unavailable
     value_available_contents_eq(val, 3, val, 4, 4) => 0
  */
  
@@ -4368,7 +4367,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  /* Read LENGTH bytes of memory starting at MEMADDR into BUFFER, which
     is (or will be copied to) VAL's contents buffer offset by
-@@ -478,7 +480,7 @@ extern int value_available_contents_eq (
+@@ -476,7 +478,7 @@ extern int value_available_contents_eq (
     memory is likewise unavailable.  STACK indicates whether the memory
     is known to be stack memory.  */
  
@@ -4377,7 +4376,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  			       int stack, CORE_ADDR memaddr,
  			       gdb_byte *buffer, size_t length);
  
-@@ -506,7 +508,7 @@ extern CORE_ADDR unpack_pointer (struct
+@@ -510,7 +512,7 @@ extern CORE_ADDR unpack_pointer (struct
  
  extern int unpack_value_bits_as_long (struct type *field_type,
  				      const gdb_byte *valaddr,
@@ -4386,7 +4385,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  				      int bitsize,
  				      const struct value *original_value,
  				      LONGEST *result);
-@@ -515,12 +517,12 @@ extern LONGEST unpack_field_as_long (str
+@@ -519,12 +521,12 @@ extern LONGEST unpack_field_as_long (str
  				     const gdb_byte *valaddr,
  				     int fieldno);
  extern int unpack_value_field_as_long (struct type *type, const gdb_byte *valaddr,
@@ -4401,7 +4400,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  					   const struct value *val);
  
  extern void pack_long (gdb_byte *buf, struct type *type, LONGEST num);
-@@ -579,12 +581,12 @@ extern struct value *default_read_var_va
+@@ -583,12 +585,12 @@ extern struct value *default_read_var_va
  extern struct value *allocate_value (struct type *type);
  extern struct value *allocate_value_lazy (struct type *type);
  extern void allocate_value_contents (struct value *value);
@@ -4420,7 +4419,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  extern struct value *allocate_repeat_value (struct type *type, int count);
  
-@@ -656,16 +658,16 @@ extern int find_overload_match (struct v
+@@ -660,16 +662,16 @@ extern int find_overload_match (struct v
  
  extern struct value *value_field (struct value *arg1, int fieldno);
  
@@ -4440,7 +4439,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  extern struct value *value_cast_pointers (struct type *, struct value *, int);
  
-@@ -755,7 +757,7 @@ extern void set_internalvar_string (stru
+@@ -763,7 +765,7 @@ extern void set_internalvar_string (stru
  extern void clear_internalvar (struct internalvar *var);
  
  extern void set_internalvar_component (struct internalvar *var,
@@ -4449,7 +4448,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  				       int bitpos, int bitsize,
  				       struct value *newvalue);
  
-@@ -837,7 +839,7 @@ extern struct value *value_x_unop (struc
+@@ -845,7 +847,7 @@ extern struct value *value_x_unop (struc
  				   enum noside noside);
  
  extern struct value *value_fn_field (struct value **arg1p, struct fn_field *f,
@@ -4458,7 +4457,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  extern int binop_types_user_defined_p (enum exp_opcode op,
  				       struct type *type1,
-@@ -865,7 +867,8 @@ extern void release_value_or_incref (str
+@@ -873,7 +875,8 @@ extern void release_value_or_incref (str
  extern int record_latest_value (struct value *val);
  
  extern void modify_field (struct type *type, gdb_byte *addr,
@@ -4468,7 +4467,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  
  extern void type_print (struct type *type, const char *varstring,
  			struct ui_file *stream, int show);
-@@ -895,7 +898,7 @@ extern void value_print_array_elements (
+@@ -903,7 +906,7 @@ extern void value_print_array_elements (
  extern struct value *value_release_to_mark (struct value *mark);
  
  extern void val_print (struct type *type, const gdb_byte *valaddr,
@@ -4477,7 +4476,7 @@ Index: gdb-7.5.50.20130118/gdb/value.h
  		       struct ui_file *stream, int recurse,
  		       const struct value *val,
  		       const struct value_print_options *options,
-@@ -944,10 +947,11 @@ extern struct value *value_literal_compl
+@@ -952,10 +955,11 @@ extern struct value *value_literal_compl
  extern struct value *find_function_in_inferior (const char *,
  						struct objfile **);
  
diff --git a/gdb-rhbz795424-bitpos-22of25.patch b/gdb-rhbz795424-bitpos-22of25.patch
index 8e34e74..07d0583 100644
--- a/gdb-rhbz795424-bitpos-22of25.patch
+++ b/gdb-rhbz795424-bitpos-22of25.patch
@@ -96,10 +96,10 @@ Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=bitpos-wp.patch
 
-Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/arm-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/arm-linux-nat.c	2013-01-18 23:34:43.930106839 +0100
-+++ gdb-7.5.50.20130118/gdb/arm-linux-nat.c	2013-01-18 23:34:51.206116513 +0100
+--- gdb-7.5.50.20130215.orig/gdb/arm-linux-nat.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/arm-linux-nat.c	2013-02-15 22:42:45.988804306 +0100
 @@ -1105,7 +1105,7 @@ arm_linux_region_ok_for_hw_watchpoint (C
  
  /* Insert a Hardware breakpoint.  */
@@ -127,11 +127,11 @@ Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
  {
    return start <= addr && start + length - 1 >= addr;
  }
-Index: gdb-7.5.50.20130118/gdb/i386-nat.c
+Index: gdb-7.5.50.20130215/gdb/i386-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/i386-nat.c	2013-01-18 23:34:43.931106841 +0100
-+++ gdb-7.5.50.20130118/gdb/i386-nat.c	2013-01-18 23:34:51.206116513 +0100
-@@ -591,7 +591,7 @@ i386_update_inferior_debug_regs (struct
+--- gdb-7.5.50.20130215.orig/gdb/i386-nat.c	2013-02-15 22:41:53.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/i386-nat.c	2013-02-15 22:43:14.005838741 +0100
+@@ -589,7 +589,7 @@ i386_update_inferior_debug_regs (struct
     of the type TYPE.  Return 0 on success, -1 on failure.  */
  
  static int
@@ -139,8 +139,8 @@ Index: gdb-7.5.50.20130118/gdb/i386-nat.c
 +i386_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
  			struct expression *cond)
  {
-   struct i386_debug_reg_state *state = i386_debug_reg_state ();
-@@ -628,7 +628,7 @@ i386_insert_watchpoint (CORE_ADDR addr,
+   struct i386_debug_reg_state *state
+@@ -627,7 +627,7 @@ i386_insert_watchpoint (CORE_ADDR addr,
     address ADDR, whose length is LEN bytes, and for accesses of the
     type TYPE.  Return 0 on success, -1 on failure.  */
  static int
@@ -148,11 +148,11 @@ Index: gdb-7.5.50.20130118/gdb/i386-nat.c
 +i386_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
  			struct expression *cond)
  {
-   struct i386_debug_reg_state *state = i386_debug_reg_state ();
-Index: gdb-7.5.50.20130118/gdb/ia64-linux-nat.c
+   struct i386_debug_reg_state *state
+Index: gdb-7.5.50.20130215/gdb/ia64-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ia64-linux-nat.c	2013-01-18 23:34:43.931106841 +0100
-+++ gdb-7.5.50.20130118/gdb/ia64-linux-nat.c	2013-01-18 23:34:51.206116513 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ia64-linux-nat.c	2013-02-15 22:34:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ia64-linux-nat.c	2013-02-15 22:42:45.989804309 +0100
 @@ -542,7 +542,7 @@ is_power_of_2 (int val)
  }
  
@@ -171,10 +171,10 @@ Index: gdb-7.5.50.20130118/gdb/ia64-linux-nat.c
  			      struct expression *cond)
  {
    int idx;
-Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
+Index: gdb-7.5.50.20130215/gdb/inf-ttrace.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/inf-ttrace.c	2013-01-18 23:34:43.932106844 +0100
-+++ gdb-7.5.50.20130118/gdb/inf-ttrace.c	2013-01-18 23:34:51.206116513 +0100
+--- gdb-7.5.50.20130215.orig/gdb/inf-ttrace.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/inf-ttrace.c	2013-02-15 22:42:45.989804309 +0100
 @@ -313,14 +313,14 @@ inf_ttrace_disable_page_protections (pid
     type TYPE.  */
  
@@ -211,10 +211,10 @@ Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
  
    gdb_assert (type == hw_write);
  
-Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/mips-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/mips-linux-nat.c	2013-01-18 23:34:43.932106844 +0100
-+++ gdb-7.5.50.20130118/gdb/mips-linux-nat.c	2013-01-18 23:34:51.208116518 +0100
+--- gdb-7.5.50.20130215.orig/gdb/mips-linux-nat.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/mips-linux-nat.c	2013-02-15 22:42:45.990804311 +0100
 @@ -1017,7 +1017,7 @@ populate_regs_from_watches (struct pt_wa
     watch.  Return zero on success.  */
  
@@ -233,10 +233,10 @@ Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
  			      struct expression *cond)
  {
    int retval;
-Index: gdb-7.5.50.20130118/gdb/nto-procfs.c
+Index: gdb-7.5.50.20130215/gdb/nto-procfs.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/nto-procfs.c	2013-01-18 23:34:43.933106847 +0100
-+++ gdb-7.5.50.20130118/gdb/nto-procfs.c	2013-01-18 23:34:51.208116518 +0100
+--- gdb-7.5.50.20130215.orig/gdb/nto-procfs.c	2013-01-01 07:32:47.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/nto-procfs.c	2013-02-15 22:42:45.990804311 +0100
 @@ -69,10 +69,10 @@ static ptid_t do_attach (ptid_t ptid);
  
  static int procfs_can_use_hw_breakpoint (int, int, int);
@@ -267,10 +267,10 @@ Index: gdb-7.5.50.20130118/gdb/nto-procfs.c
  			     struct expression *cond)
  {
    return procfs_hw_watchpoint (addr, len, type);
-Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
+Index: gdb-7.5.50.20130215/gdb/ppc-linux-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/ppc-linux-nat.c	2013-01-18 23:34:43.934106849 +0100
-+++ gdb-7.5.50.20130118/gdb/ppc-linux-nat.c	2013-01-18 23:34:51.208116518 +0100
+--- gdb-7.5.50.20130215.orig/gdb/ppc-linux-nat.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/ppc-linux-nat.c	2013-02-15 22:42:45.991804313 +0100
 @@ -1838,11 +1838,11 @@ can_use_watchpoint_cond_accel (void)
     CONDITION_VALUE will hold the value which should be put in the
     DVC register.  */
@@ -340,10 +340,10 @@ Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
  {
    int mask;
  
-Index: gdb-7.5.50.20130118/gdb/procfs.c
+Index: gdb-7.5.50.20130215/gdb/procfs.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/procfs.c	2013-01-18 23:34:43.937106855 +0100
-+++ gdb-7.5.50.20130118/gdb/procfs.c	2013-01-18 23:35:12.598145073 +0100
+--- gdb-7.5.50.20130215.orig/gdb/procfs.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/procfs.c	2013-02-15 22:42:45.992804315 +0100
 @@ -2433,7 +2433,7 @@ procfs_address_to_host_pointer (CORE_ADD
  #endif
  
@@ -380,10 +380,10 @@ Index: gdb-7.5.50.20130118/gdb/procfs.c
  			  struct expression *cond)
  {
    return procfs_set_watchpoint (inferior_ptid, addr, 0, 0, 0);
-Index: gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c
+Index: gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/remote-m32r-sdi.c	2013-01-18 23:34:51.211116523 +0100
-+++ gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c	2013-01-18 23:36:50.004276296 +0100
+--- gdb-7.5.50.20130215.orig/gdb/remote-m32r-sdi.c	2013-01-01 07:32:50.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c	2013-02-15 22:42:45.993804317 +0100
 @@ -1417,14 +1417,15 @@ m32r_can_use_hw_watchpoint (int type, in
     watchpoint.  */
  
@@ -422,10 +422,10 @@ Index: gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c
  
    for (i = 0; i < MAX_ACCESS_BREAKS; i++)
      {
-Index: gdb-7.5.50.20130118/gdb/remote-mips.c
+Index: gdb-7.5.50.20130215/gdb/remote-mips.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/remote-mips.c	2013-01-18 23:34:43.939106860 +0100
-+++ gdb-7.5.50.20130118/gdb/remote-mips.c	2013-01-18 23:34:51.212116525 +0100
+--- gdb-7.5.50.20130215.orig/gdb/remote-mips.c	2013-01-01 07:32:50.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/remote-mips.c	2013-02-15 22:42:45.994804319 +0100
 @@ -2419,7 +2419,7 @@ calculate_mask (CORE_ADDR addr, int len)
     watchpoint.  */
  
@@ -444,11 +444,11 @@ Index: gdb-7.5.50.20130118/gdb/remote-mips.c
  			struct expression *cond)
  {
    if (mips_clear_breakpoint (addr, len, type))
-Index: gdb-7.5.50.20130118/gdb/remote.c
+Index: gdb-7.5.50.20130215/gdb/remote.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/remote.c	2013-01-18 23:34:43.943106869 +0100
-+++ gdb-7.5.50.20130118/gdb/remote.c	2013-01-18 23:34:51.214116529 +0100
-@@ -8093,7 +8093,7 @@ watchpoint_to_Z_packet (int type)
+--- gdb-7.5.50.20130215.orig/gdb/remote.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/remote.c	2013-02-15 22:42:45.996804323 +0100
+@@ -8155,7 +8155,7 @@ watchpoint_to_Z_packet (int type)
  }
  
  static int
@@ -457,7 +457,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
  			  struct expression *cond)
  {
    struct remote_state *rs = get_remote_state ();
-@@ -8108,7 +8108,7 @@ remote_insert_watchpoint (CORE_ADDR addr
+@@ -8170,7 +8170,7 @@ remote_insert_watchpoint (CORE_ADDR addr
    p = strchr (rs->buf, '\0');
    addr = remote_address_masked (addr);
    p += hexnumstr (p, (ULONGEST) addr);
@@ -466,7 +466,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
  
    putpkt (rs->buf);
    getpkt (&rs->buf, &rs->buf_size, 0);
-@@ -8128,7 +8128,7 @@ remote_insert_watchpoint (CORE_ADDR addr
+@@ -8190,7 +8190,7 @@ remote_insert_watchpoint (CORE_ADDR addr
  
  static int
  remote_watchpoint_addr_within_range (struct target_ops *target, CORE_ADDR addr,
@@ -475,7 +475,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
  {
    CORE_ADDR diff = remote_address_masked (addr - start);
  
-@@ -8137,7 +8137,7 @@ remote_watchpoint_addr_within_range (str
+@@ -8199,7 +8199,7 @@ remote_watchpoint_addr_within_range (str
  
  
  static int
@@ -484,7 +484,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
  			  struct expression *cond)
  {
    struct remote_state *rs = get_remote_state ();
-@@ -8152,7 +8152,7 @@ remote_remove_watchpoint (CORE_ADDR addr
+@@ -8214,7 +8214,7 @@ remote_remove_watchpoint (CORE_ADDR addr
    p = strchr (rs->buf, '\0');
    addr = remote_address_masked (addr);
    p += hexnumstr (p, (ULONGEST) addr);
@@ -493,10 +493,10 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
    putpkt (rs->buf);
    getpkt (&rs->buf, &rs->buf_size, 0);
  
-Index: gdb-7.5.50.20130118/gdb/s390-nat.c
+Index: gdb-7.5.50.20130215/gdb/s390-nat.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/s390-nat.c	2013-01-18 23:34:43.944106871 +0100
-+++ gdb-7.5.50.20130118/gdb/s390-nat.c	2013-01-18 23:34:51.215116531 +0100
+--- gdb-7.5.50.20130215.orig/gdb/s390-nat.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/s390-nat.c	2013-02-15 22:42:45.997804325 +0100
 @@ -516,7 +516,7 @@ s390_fix_watch_points (struct lwp_info *
  }
  
@@ -515,10 +515,10 @@ Index: gdb-7.5.50.20130118/gdb/s390-nat.c
  			struct expression *cond)
  {
    struct lwp_info *lp;
-Index: gdb-7.5.50.20130118/gdb/target.c
+Index: gdb-7.5.50.20130215/gdb/target.c
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/target.c	2013-01-18 23:34:43.947106878 +0100
-+++ gdb-7.5.50.20130118/gdb/target.c	2013-01-18 23:34:51.216116533 +0100
+--- gdb-7.5.50.20130215.orig/gdb/target.c	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/target.c	2013-02-15 22:42:45.997804325 +0100
 @@ -49,7 +49,8 @@ static void target_info (char *, int);
  static void default_terminal_info (char *, int);
  
@@ -579,7 +579,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
              return_zero);
    de_fault (to_terminal_init,
  	    (void (*) (void))
-@@ -3560,7 +3562,7 @@ default_region_ok_for_hw_watchpoint (COR
+@@ -3558,7 +3560,7 @@ default_region_ok_for_hw_watchpoint (COR
  static int
  default_watchpoint_addr_within_range (struct target_ops *target,
  				      CORE_ADDR addr,
@@ -588,7 +588,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  {
    return addr >= start && addr < start + length;
  }
-@@ -4267,7 +4269,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
+@@ -4265,7 +4267,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
  }
  
  static int
@@ -597,7 +597,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  					 struct expression *cond)
  {
    int retval;
-@@ -4277,8 +4279,8 @@ debug_to_can_accel_watchpoint_condition
+@@ -4275,8 +4277,8 @@ debug_to_can_accel_watchpoint_condition
  
    fprintf_unfiltered (gdb_stdlog,
  		      "target_can_accel_watchpoint_condition "
@@ -608,7 +608,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  		      host_address_to_string (cond), (unsigned long) retval);
    return retval;
  }
-@@ -4313,7 +4315,7 @@ debug_to_stopped_data_address (struct ta
+@@ -4311,7 +4313,7 @@ debug_to_stopped_data_address (struct ta
  static int
  debug_to_watchpoint_addr_within_range (struct target_ops *target,
  				       CORE_ADDR addr,
@@ -617,7 +617,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  {
    int retval;
  
-@@ -4321,9 +4323,9 @@ debug_to_watchpoint_addr_within_range (s
+@@ -4319,9 +4321,9 @@ debug_to_watchpoint_addr_within_range (s
  							 start, length);
  
    fprintf_filtered (gdb_stdlog,
@@ -629,7 +629,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
    return retval;
  }
  
-@@ -4358,7 +4360,7 @@ debug_to_remove_hw_breakpoint (struct gd
+@@ -4356,7 +4358,7 @@ debug_to_remove_hw_breakpoint (struct gd
  }
  
  static int
@@ -638,7 +638,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  			    struct expression *cond)
  {
    int retval;
-@@ -4366,14 +4368,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
+@@ -4364,14 +4366,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
    retval = debug_target.to_insert_watchpoint (addr, len, type, cond);
  
    fprintf_unfiltered (gdb_stdlog,
@@ -656,7 +656,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  			    struct expression *cond)
  {
    int retval;
-@@ -4381,8 +4383,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
+@@ -4379,8 +4381,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
    retval = debug_target.to_remove_watchpoint (addr, len, type, cond);
  
    fprintf_unfiltered (gdb_stdlog,
@@ -667,10 +667,10 @@ Index: gdb-7.5.50.20130118/gdb/target.c
  		      host_address_to_string (cond), (unsigned long) retval);
    return retval;
  }
-Index: gdb-7.5.50.20130118/gdb/target.h
+Index: gdb-7.5.50.20130215/gdb/target.h
 ===================================================================
---- gdb-7.5.50.20130118.orig/gdb/target.h	2013-01-18 23:34:43.947106878 +0100
-+++ gdb-7.5.50.20130118/gdb/target.h	2013-01-18 23:34:51.217116536 +0100
+--- gdb-7.5.50.20130215.orig/gdb/target.h	2013-02-15 22:40:18.000000000 +0100
++++ gdb-7.5.50.20130215/gdb/target.h	2013-02-15 22:42:45.998804328 +0100
 @@ -466,8 +466,8 @@ struct target_ops
  
      /* Documentation of what the two routines below are expected to do is
diff --git a/gdb.spec b/gdb.spec
index 632c33f..4ec0b2a 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,14 +27,14 @@
 Summary: A GNU source-level debugger for C, C++, Fortran, Go and other languages
 Name: %{?scl_prefix}gdb
 
-%global snap       20120817
+%global snap       20130215
 # See timestamp of source gnulib installed into gdb/gnulib/ .
-%global snapgnulib 20120623
-Version: 7.5.50.20130118
+%global snapgnulib 20121213
+Version: 7.5.50.20130215
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
 Group: Development/Debuggers
@@ -366,10 +366,6 @@ Patch317: gdb-6.8-sparc64-silence-memcpy-check.patch
 #=fedoratest
 Patch320: gdb-6.5-section-num-fixup-test.patch
 
-# Fix PRPSINFO in the core files dumped by gcore (BZ 254229).
-#=push
-Patch329: gdb-6.8-bz254229-gcore-prpsinfo.patch
-
 # Fix register assignments with no GDB stack frames (BZ 436037).
 #=push+work: This fix is incorrect.
 Patch330: gdb-6.8-bz436037-reg-no-longer-active.patch
@@ -561,14 +557,6 @@ Patch816: gdb-rhbz795424-bitpos-25of25.patch
 Patch817: gdb-rhbz795424-bitpos-25of25-test.patch
 Patch818: gdb-rhbz795424-bitpos-lazyvalue.patch
 
-# Fix gdb.fortran/common-block.exp in PIE mode.
-#=push
-Patch823: gdb-commonblock-pie.patch
-
-#=push
-# Fix assert crashes with minidebuginfo (BZ 903522).
-Patch824: gdb-minidebuginfo-crash.patch
-
 %if 0%{!?rhel:1} || 0%{?rhel} > 6
 # RL_STATE_FEDORA_GDB would not be found for:
 # Patch642: gdb-readline62-ask-more-rh.patch
@@ -829,7 +817,6 @@ find -name "*.info*"|xargs rm -f
 %patch315 -p1
 %patch317 -p1
 %patch320 -p1
-%patch329 -p1
 %patch330 -p1
 %patch343 -p1
 %patch348 -p1
@@ -882,8 +869,6 @@ find -name "*.info*"|xargs rm -f
 %patch816 -p1
 %patch817 -p1
 %patch818 -p1
-%patch823 -p1
-%patch824 -p1
 
 %patch393 -p1
 %if 0%{!?el5:1} || 0%{?scl:1}
@@ -1383,6 +1368,9 @@ fi
 %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch"
 
 %changelog
+* Mon Feb 18 2013 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.5.50.20130215-7.fc19
+- Rebase to FSF GDB 7.5.50.20130215 (pre-7.6 snapshot).
+
 * Fri Feb  8 2013 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.5.50.20130118-6.fc19
 - Re-enable PDF in gdb-doc after texinfo RH BZ 876710 has been fixed.
 
diff --git a/sources b/sources
index 10a5597..2a782fe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 4981307aa9619bbec5b73261e4e41c8d  gdb-libstdc++-v3-python-r155978.tar.bz2
-889f62ad99a041daf5143c61a559cf2f  gdb-7.5.50.20130118.tar.bz2
+8d4d5baf06acf7c95211302efffb16ad  gdb-7.5.50.20130215.tar.bz2


More information about the scm-commits mailing list