From ebad377b2de5da9f259e4733ecd88879abd35b39 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri, 29 Jul 2011 22:55:31 +0200
Subject: [PATCH] Fix regression from VLA merge affecting -O0 -g watchpoints.

---
 gdb-archer.patch | 496 +++++++++++++++++++++++------------------------
 gdb.spec         |   5 +-
 2 files changed, 251 insertions(+), 250 deletions(-)

diff --git a/gdb-archer.patch b/gdb-archer.patch
index 6e1f9e4..5d346d5 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 ad8e4e822c855645bf938ca82d04b4ed9f83a83b
+commit 069aac3325764793a2d57f8b2f0933a326c6b7a3
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-vla
@@ -14,7 +14,7 @@ archer-sergiodj-stap-patch-split
 Index: gdb-7.3.50.20110722/gdb/Makefile.in
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/Makefile.in	2011-07-22 01:46:08.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/Makefile.in	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/Makefile.in	2011-07-29 22:52:02.000000000 +0200
 @@ -720,8 +720,8 @@ SFILES = ada-exp.y ada-lang.c ada-typepr
  	sentinel-frame.c \
  	serial.c ser-base.c ser-unix.c \
@@ -60,7 +60,7 @@ Index: gdb-7.3.50.20110722/gdb/Makefile.in
 Index: gdb-7.3.50.20110722/gdb/NEWS
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/NEWS	2011-07-21 19:23:55.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/NEWS	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/NEWS	2011-07-29 22:52:02.000000000 +0200
 @@ -109,6 +109,10 @@ QTDisable
    Initial support for the OpenCL C language (http://www.khronos.org/opencl)
    has been integrated into GDB.
@@ -75,7 +75,7 @@ Index: gdb-7.3.50.20110722/gdb/NEWS
 Index: gdb-7.3.50.20110722/gdb/ada-lang.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/ada-lang.c	2011-07-05 06:34:55.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/ada-lang.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/ada-lang.c	2011-07-29 22:52:02.000000000 +0200
 @@ -11862,6 +11862,7 @@ ada_operator_length (const struct expres
  
  static int
@@ -105,7 +105,7 @@ Index: gdb-7.3.50.20110722/gdb/ada-lang.c
 Index: gdb-7.3.50.20110722/gdb/amd64-linux-nat.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/amd64-linux-nat.c	2011-01-07 20:36:15.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/amd64-linux-nat.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/amd64-linux-nat.c	2011-07-29 22:52:02.000000000 +0200
 @@ -265,18 +265,11 @@ amd64_linux_store_inferior_registers (st
  
  /* Support for debug registers.  */
@@ -327,8 +327,8 @@ Index: gdb-7.3.50.20110722/gdb/amd64-linux-nat.c
 Index: gdb-7.3.50.20110722/gdb/ax-gdb.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/ax-gdb.c	2011-06-17 22:46:47.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/ax-gdb.c	2011-07-22 20:04:21.000000000 +0200
-@@ -2001,7 +2001,8 @@ gen_expr (struct expression *exp, union 
++++ gdb-7.3.50.20110722/gdb/ax-gdb.c	2011-07-29 22:52:02.000000000 +0200
+@@ -2001,7 +2001,8 @@ gen_expr (struct expression *exp, union
  
      case OP_INTERNALVAR:
        {
@@ -338,7 +338,7 @@ Index: gdb-7.3.50.20110722/gdb/ax-gdb.c
  	struct trace_state_variable *tsv;
  
  	(*pc) += 3;
-@@ -2015,7 +2016,7 @@ gen_expr (struct expression *exp, union 
+@@ -2015,7 +2016,7 @@ gen_expr (struct expression *exp, union
  	    value->kind = axs_rvalue;
  	    value->type = builtin_type (exp->gdbarch)->builtin_long_long;
  	  }
@@ -350,7 +350,7 @@ Index: gdb-7.3.50.20110722/gdb/ax-gdb.c
 Index: gdb-7.3.50.20110722/gdb/block.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/block.c	2011-01-01 16:32:57.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/block.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/block.c	2011-07-29 22:52:02.000000000 +0200
 @@ -322,3 +322,21 @@ allocate_block (struct obstack *obstack)
  
    return bl;
@@ -376,7 +376,7 @@ Index: gdb-7.3.50.20110722/gdb/block.c
 Index: gdb-7.3.50.20110722/gdb/block.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/block.h	2011-04-04 16:10:12.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/block.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/block.h	2011-07-29 22:52:02.000000000 +0200
 @@ -163,4 +163,6 @@ extern const struct block *block_global_
  
  extern struct block *allocate_block (struct obstack *obstack);
@@ -387,7 +387,7 @@ Index: gdb-7.3.50.20110722/gdb/block.h
 Index: gdb-7.3.50.20110722/gdb/breakpoint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/breakpoint.c	2011-07-05 06:34:55.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/breakpoint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/breakpoint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -63,6 +63,8 @@
  #include "jit.h"
  #include "xml-syscall.h"
@@ -624,7 +624,7 @@ Index: gdb-7.3.50.20110722/gdb/breakpoint.c
        if (msym_not_found_p (bp_objfile_data->exception_msym))
  	continue;
  
-@@ -2552,6 +2688,8 @@ remove_breakpoint_1 (struct bp_location 
+@@ -2552,6 +2688,8 @@ remove_breakpoint_1 (struct bp_location
  	    val = target_remove_hw_breakpoint (bl->gdbarch, &bl->target_info);
  	  else
  	    val = target_remove_breakpoint (bl->gdbarch, &bl->target_info);
@@ -827,7 +827,7 @@ Index: gdb-7.3.50.20110722/gdb/breakpoint.c
 Index: gdb-7.3.50.20110722/gdb/breakpoint.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/breakpoint.h	2011-06-22 19:53:44.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/breakpoint.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/breakpoint.h	2011-07-29 22:52:02.000000000 +0200
 @@ -383,6 +383,11 @@ struct bp_location
       processor's architectual constraints.  */
    CORE_ADDR requested_address;
@@ -855,7 +855,7 @@ Index: gdb-7.3.50.20110722/gdb/breakpoint.h
 Index: gdb-7.3.50.20110722/gdb/c-typeprint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/c-typeprint.c	2011-05-18 18:30:34.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/c-typeprint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/c-typeprint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -625,9 +625,14 @@ c_type_print_varspec_suffix (struct type
  	  fprintf_filtered (stream, ")");
  
@@ -877,7 +877,7 @@ Index: gdb-7.3.50.20110722/gdb/c-typeprint.c
 Index: gdb-7.3.50.20110722/gdb/cli/cli-utils.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/cli/cli-utils.c	2011-03-16 22:12:12.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/cli/cli-utils.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/cli/cli-utils.c	2011-07-29 22:52:02.000000000 +0200
 @@ -245,3 +245,32 @@ remove_trailing_whitespace (const char *
  
    return s;
@@ -914,7 +914,7 @@ Index: gdb-7.3.50.20110722/gdb/cli/cli-utils.c
 Index: gdb-7.3.50.20110722/gdb/cli/cli-utils.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/cli/cli-utils.h	2011-03-16 22:12:12.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/cli/cli-utils.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/cli/cli-utils.h	2011-07-29 22:52:02.000000000 +0200
 @@ -103,4 +103,11 @@ extern char *skip_to_space (char *inp);
     START.  */
  
@@ -930,7 +930,7 @@ Index: gdb-7.3.50.20110722/gdb/cli/cli-utils.h
 Index: gdb-7.3.50.20110722/gdb/coffread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/coffread.c	2011-06-14 20:53:13.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/coffread.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/coffread.c	2011-07-29 22:52:02.000000000 +0200
 @@ -2197,6 +2197,7 @@ static const struct sym_fns coff_sym_fns
  
    default_symfile_relocate,	/* sym_relocate: Relocate a debug
@@ -942,7 +942,7 @@ Index: gdb-7.3.50.20110722/gdb/coffread.c
 Index: gdb-7.3.50.20110722/gdb/data-directory/Makefile.in
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/data-directory/Makefile.in	2011-02-04 19:34:41.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/data-directory/Makefile.in	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/data-directory/Makefile.in	2011-07-29 22:52:02.000000000 +0200
 @@ -52,11 +52,23 @@ SYSCALLS_FILES = \
  PYTHON_DIR = python
  PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
@@ -973,7 +973,7 @@ Index: gdb-7.3.50.20110722/gdb/data-directory/Makefile.in
 Index: gdb-7.3.50.20110722/gdb/dbxread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/dbxread.c	2011-06-27 21:21:50.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/dbxread.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dbxread.c	2011-07-29 22:52:02.000000000 +0200
 @@ -3590,6 +3590,7 @@ static const struct sym_fns aout_sym_fns
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
@@ -985,7 +985,7 @@ Index: gdb-7.3.50.20110722/gdb/dbxread.c
 Index: gdb-7.3.50.20110722/gdb/defs.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/defs.h	2011-07-22 01:46:08.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/defs.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/defs.h	2011-07-29 22:52:02.000000000 +0200
 @@ -406,6 +406,8 @@ extern struct cleanup *make_cleanup_rest
  extern struct cleanup *
    set_batch_flag_and_make_cleanup_restore_page_info (void);
@@ -998,7 +998,7 @@ Index: gdb-7.3.50.20110722/gdb/defs.h
 Index: gdb-7.3.50.20110722/gdb/doc/gdb.texinfo
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/doc/gdb.texinfo	2011-07-21 17:13:29.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/doc/gdb.texinfo	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/doc/gdb.texinfo	2011-07-29 22:52:02.000000000 +0200
 @@ -1175,6 +1175,16 @@ for remote debugging.
  Run using @var{device} for your program's standard input and output.
  @c FIXME: kingdon thinks there is more to -tty.  Investigate.
@@ -1142,7 +1142,7 @@ Index: gdb-7.3.50.20110722/gdb/doc/gdb.texinfo
  >print 23
  >end
  23
-@@ -20824,6 +20914,14 @@ occurs in a Python script.  This can be 
+@@ -20824,6 +20914,14 @@ occurs in a Python script.  This can be
  python print-stack}: if @code{on}, then Python stack printing is
  enabled; if @code{off}, the default, then Python stack printing is
  disabled.
@@ -1175,7 +1175,7 @@ Index: gdb-7.3.50.20110722/gdb/doc/gdb.texinfo
 Index: gdb-7.3.50.20110722/gdb/doc/gdbint.texinfo
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/doc/gdbint.texinfo	2011-04-19 20:04:08.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/doc/gdbint.texinfo	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/doc/gdbint.texinfo	2011-07-29 22:52:02.000000000 +0200
 @@ -2104,6 +2104,18 @@ time, and so we attempt to handle symbol
  we create @dfn{partial symbol tables} consisting of only selected
  symbols, and only expand them to full symbol tables when necessary.
@@ -1235,7 +1235,7 @@ Index: gdb-7.3.50.20110722/gdb/doc/gdbint.texinfo
  @section Debugging File Formats
  
  This section describes characteristics of debugging information that
-@@ -2489,6 +2506,7 @@ DWARF 3 is an improved version of DWARF 
+@@ -2489,6 +2506,7 @@ DWARF 3 is an improved version of DWARF
  @cindex SOM debugging info
  Like COFF, the SOM definition includes debugging information.
  
@@ -1304,7 +1304,7 @@ Index: gdb-7.3.50.20110722/gdb/doc/gdbint.texinfo
 Index: gdb-7.3.50.20110722/gdb/doc/observer.texi
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/doc/observer.texi	2011-07-21 13:03:47.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/doc/observer.texi	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/doc/observer.texi	2011-07-29 22:52:02.000000000 +0200
 @@ -227,6 +227,11 @@ Called before a top-level prompt is disp
  the current top-level prompt.
  @end deftypefun
@@ -1320,7 +1320,7 @@ Index: gdb-7.3.50.20110722/gdb/doc/observer.texi
 Index: gdb-7.3.50.20110722/gdb/dwarf2expr.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/dwarf2expr.c	2011-07-15 22:54:32.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/dwarf2expr.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dwarf2expr.c	2011-07-29 22:52:02.000000000 +0200
 @@ -1258,6 +1258,14 @@ execute_stack_op (struct dwarf_expr_cont
  	  }
  	  break;
@@ -1339,7 +1339,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2expr.c
 Index: gdb-7.3.50.20110722/gdb/dwarf2expr.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/dwarf2expr.h	2011-07-15 22:54:32.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/dwarf2expr.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dwarf2expr.h	2011-07-29 22:52:02.000000000 +0200
 @@ -62,12 +62,10 @@ struct dwarf_expr_context_funcs
       meaningful to substitute a stub type of the correct size.  */
    struct type *(*get_base_type) (struct dwarf_expr_context *ctx, size_t die);
@@ -1356,7 +1356,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2expr.h
 Index: gdb-7.3.50.20110722/gdb/dwarf2loc.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/dwarf2loc.c	2011-07-19 22:28:52.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/dwarf2loc.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dwarf2loc.c	2011-07-29 22:52:02.000000000 +0200
 @@ -134,6 +134,9 @@ struct dwarf_expr_baton
  {
    struct frame_info *frame;
@@ -1718,7 +1718,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2loc.c
 Index: gdb-7.3.50.20110722/gdb/dwarf2loc.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/dwarf2loc.h	2011-05-12 19:40:54.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/dwarf2loc.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dwarf2loc.h	2011-07-29 22:52:02.000000000 +0200
 @@ -110,6 +110,15 @@ struct dwarf2_loclist_baton
  
  extern const struct symbol_computed_ops dwarf2_locexpr_funcs;
@@ -1737,9 +1737,9 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2loc.h
     
 Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 ===================================================================
---- gdb-7.3.50.20110722.orig/gdb/dwarf2read.c	2011-07-20 17:13:49.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/dwarf2read.c	2011-07-22 20:04:21.000000000 +0200
-@@ -1245,6 +1245,9 @@ static void fill_in_loclist_baton (struc
+--- gdb-7.3.50.20110722.orig/gdb/dwarf2read.c	2011-07-29 22:52:00.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/dwarf2read.c	2011-07-29 22:52:02.000000000 +0200
+@@ -1251,6 +1251,9 @@ static void fill_in_loclist_baton (struc
  				   struct dwarf2_loclist_baton *baton,
  				   struct attribute *attr);
  
@@ -1749,7 +1749,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  static void dwarf2_symbol_mark_computed (struct attribute *attr,
  					 struct symbol *sym,
  					 struct dwarf2_cu *cu);
-@@ -1279,6 +1282,9 @@ static void age_cached_comp_units (void)
+@@ -1285,6 +1288,9 @@ static void age_cached_comp_units (void)
  
  static void free_one_cached_comp_unit (void *);
  
@@ -1759,7 +1759,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  static struct type *set_die_type (struct die_info *, struct type *,
  				  struct dwarf2_cu *);
  
-@@ -1303,6 +1309,9 @@ static struct type *get_die_type_at_offs
+@@ -1309,6 +1315,9 @@ static struct type *get_die_type_at_offs
  
  static struct type *get_die_type (struct die_info *die, struct dwarf2_cu *cu);
  
@@ -1769,7 +1769,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  static void dwarf2_release_queue (void *dummy);
  
  static void queue_comp_unit (struct dwarf2_per_cu_data *per_cu,
-@@ -7759,6 +7768,29 @@ process_enumeration_scope (struct die_in
+@@ -7785,6 +7794,29 @@ process_enumeration_scope (struct die_in
    new_symbol (die, this_type, cu);
  }
  
@@ -1799,7 +1799,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  /* 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.  */
-@@ -7772,7 +7804,7 @@ read_array_type (struct die_info *die, s
+@@ -7798,7 +7830,7 @@ read_array_type (struct die_info *die, s
    struct type *element_type, *range_type, *index_type;
    struct type **range_types = NULL;
    struct attribute *attr;
@@ -1808,7 +1808,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
    struct cleanup *back_to;
    char *name;
  
-@@ -7825,17 +7857,19 @@ read_array_type (struct die_info *die, s
+@@ -7851,17 +7883,19 @@ read_array_type (struct die_info *die, s
    type = element_type;
  
    if (read_array_order (die, cu) == DW_ORD_col_major)
@@ -1839,7 +1839,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  
    /* Understand Dwarf2 support for vector types (like they occur on
       the PowerPC w/ AltiVec).  Gcc just adds another attribute to the
-@@ -8319,29 +8353,114 @@ read_tag_string_type (struct die_info *d
+@@ -8345,29 +8379,114 @@ read_tag_string_type (struct die_info *d
    struct gdbarch *gdbarch = get_objfile_arch (objfile);
    struct type *type, *range_type, *index_type, *char_type;
    struct attribute *attr;
@@ -1967,7 +1967,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -8632,8 +8751,7 @@ read_subrange_type (struct die_info *die
+@@ -8658,8 +8777,7 @@ read_subrange_type (struct die_info *die
    struct type *base_type;
    struct type *range_type;
    struct attribute *attr;
@@ -1977,40 +1977,18 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
    char *name;
    LONGEST negative_mask;
  
-@@ -8646,53 +8764,126 @@ read_subrange_type (struct die_info *die
+@@ -8672,53 +8790,126 @@ read_subrange_type (struct die_info *die
    if (range_type)
      return range_type;
  
 -  if (cu->language == language_fortran)
+-    {
+-      /* FORTRAN implies a lower bound of 1, if not given.  */
+-      low = 1;
+-    }
 +  /* LOW_BOUND and HIGH_BOUND are set for real below.  */
 +  range_type = create_range_type (NULL, base_type, 0, -1);
 +  TYPE_UNSIGNED (range_type) = 0;
-+
-+  negative_mask = 
-+    (LONGEST) -1 << (TYPE_LENGTH (base_type) * TARGET_CHAR_BIT - 1);
-+
-+  /* Exclude language_ada from any TYPE_DYNAMIC constructs below.  GDB Ada
-+     supports implements the dynamic bounds in a non-DWARF way and the
-+     existing DWARF dynamic bounds are invalid, leading to memory access
-+     errors.  */
-+
-+  attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
-+  if (attr && attr_form_is_block (attr) && cu->language != language_ada)
-     {
--      /* FORTRAN implies a lower bound of 1, if not given.  */
--      low = 1;
-+      TYPE_RANGE_DATA (range_type)->low.kind = RANGE_BOUND_KIND_DWARF_BLOCK;
-+      TYPE_RANGE_DATA (range_type)->low.u.dwarf_block =
-+					dwarf2_attr_to_locexpr_baton (attr, cu);
-+      TYPE_DYNAMIC (range_type) = 1;
-+      /* For setting a default if DW_AT_UPPER_BOUND would be missing.  */
-+      low = 0;
-     }
-+  else if (attr && is_ref_attr (attr) && cu->language != language_ada)
-+    {
-+      struct die_info *target_die;
-+      struct dwarf2_cu *target_cu = cu;
-+      struct attribute *target_loc_attr;
  
 -  /* FIXME: For variable sized arrays either of these could be
 -     a variable rather than a constant value.  We'll allow it,
@@ -2018,22 +1996,18 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 -  attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
 -  if (attr)
 -    low = dwarf2_get_attr_constant_value (attr, 0);
-+      target_die = follow_die_ref_or_sig (die, attr, &target_cu);
-+      gdb_assert (target_cu->objfile == cu->objfile);
-+      target_loc_attr = dwarf2_attr (target_die, DW_AT_location, target_cu);
++  negative_mask = 
++    (LONGEST) -1 << (TYPE_LENGTH (base_type) * TARGET_CHAR_BIT - 1);
  
 -  attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
 -  if (attr)
-+      TYPE_RANGE_DATA (range_type)->low.kind = RANGE_BOUND_KIND_DWARF_LOCLIST;
-+      TYPE_RANGE_DATA (range_type)->low.u.dwarf_loclist.loclist
-+        = dwarf2_attr_to_loclist_baton (target_loc_attr, target_cu);
-+      TYPE_RANGE_DATA (range_type)->low.u.dwarf_loclist.type
-+        = die_type (target_die, target_cu);
-+      TYPE_DYNAMIC (range_type) = 1;
-+      /* For setting a default if DW_AT_UPPER_BOUND would be missing.  */
-+      low = 0;
-+    }
-+  else
++  /* Exclude language_ada from any TYPE_DYNAMIC constructs below.  GDB Ada
++     supports implements the dynamic bounds in a non-DWARF way and the
++     existing DWARF dynamic bounds are invalid, leading to memory access
++     errors.  */
++
++  attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
++  if (attr && attr_form_is_block (attr) && cu->language != language_ada)
      {
 -      if (attr_form_is_block (attr) || is_ref_attr (attr))
 -        {
@@ -2050,11 +2024,44 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 -             the lower bound we've computed above.  */
 -          high = low - 1;
 -        }
+-      else
+-        high = dwarf2_get_attr_constant_value (attr, 1);
++      TYPE_RANGE_DATA (range_type)->low.kind = RANGE_BOUND_KIND_DWARF_BLOCK;
++      TYPE_RANGE_DATA (range_type)->low.u.dwarf_block =
++					dwarf2_attr_to_locexpr_baton (attr, cu);
++      TYPE_DYNAMIC (range_type) = 1;
++      /* For setting a default if DW_AT_UPPER_BOUND would be missing.  */
++      low = 0;
++    }
++  else if (attr && is_ref_attr (attr) && cu->language != language_ada)
++    {
++      struct die_info *target_die;
++      struct dwarf2_cu *target_cu = cu;
++      struct attribute *target_loc_attr;
++
++      target_die = follow_die_ref_or_sig (die, attr, &target_cu);
++      gdb_assert (target_cu->objfile == cu->objfile);
++      target_loc_attr = dwarf2_attr (target_die, DW_AT_location, target_cu);
++
++      TYPE_RANGE_DATA (range_type)->low.kind = RANGE_BOUND_KIND_DWARF_LOCLIST;
++      TYPE_RANGE_DATA (range_type)->low.u.dwarf_loclist.loclist
++        = dwarf2_attr_to_loclist_baton (target_loc_attr, target_cu);
++      TYPE_RANGE_DATA (range_type)->low.u.dwarf_loclist.type
++        = die_type (target_die, target_cu);
++      TYPE_DYNAMIC (range_type) = 1;
++      /* For setting a default if DW_AT_UPPER_BOUND would be missing.  */
++      low = 0;
+     }
+   else
+     {
+-      attr = dwarf2_attr (die, DW_AT_count, cu);
+-      if (attr)
 +      if (attr && attr_form_is_constant (attr))
 +	low = dwarf2_get_attr_constant_value (attr, 0);
-       else
--        high = dwarf2_get_attr_constant_value (attr, 1);
-+	{
++      else
+ 	{
+-	  int count = dwarf2_get_attr_constant_value (attr, 1);
+-	  high = low + count - 1;
 +	  if (cu->language == language_fortran)
 +	    {
 +	      /* FORTRAN implies a lower bound of 1, if not given.  */
@@ -2066,30 +2073,25 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 +		 LANGUAGE_C and LANGUAGE_CPLUS.  */
 +	      low = 0;
 +	    }
-+	}
+ 	}
 +      if (!TYPE_UNSIGNED (base_type) && (low & negative_mask))
 +	low |= negative_mask;
 +      TYPE_LOW_BOUND (range_type) = low;
 +      if (low >= 0)
 +	TYPE_UNSIGNED (range_type) = 1;
-     }
--  else
++    }
 +
 +  attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
 +  if (!attr || (!attr_form_is_block (attr) && !attr_form_is_constant (attr)
 +		&& !is_ref_attr (attr)))
-     {
-       attr = dwarf2_attr (die, DW_AT_count, cu);
--      if (attr)
--	{
--	  int count = dwarf2_get_attr_constant_value (attr, 1);
--	  high = low + count - 1;
++    {
++      attr = dwarf2_attr (die, DW_AT_count, cu);
 +      /* It does not hurt but it is needlessly ineffective in check_typedef.  */
 +      if (attr && (attr_form_is_block (attr) || attr_form_is_constant (attr)))
 +      	{
 +	  TYPE_RANGE_HIGH_BOUND_IS_COUNT (range_type) = 1;
 +	  TYPE_DYNAMIC (range_type) = 1;
- 	}
++	}
 +      /* Pass it now as the regular DW_AT_upper_bound.  */
 +    }
 +
@@ -2137,7 +2139,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
      }
  
    /* Dwarf-2 specifications explicitly allows to create subrange types
-@@ -8733,24 +8924,41 @@ read_subrange_type (struct die_info *die
+@@ -8759,24 +8950,41 @@ read_subrange_type (struct die_info *die
  	}
      }
  
@@ -2197,7 +2199,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  
    name = dwarf2_name (die, cu);
    if (name)
-@@ -11307,13 +11515,12 @@ var_decode_location (struct attribute *a
+@@ -11333,10 +11541,12 @@ var_decode_location (struct attribute *a
       (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
@@ -2208,14 +2210,11 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  
 -  dwarf2_symbol_mark_computed (attr, sym, cu);
    SYMBOL_CLASS (sym) = LOC_COMPUTED;
--
--  if (SYMBOL_COMPUTED_OPS (sym) == &dwarf2_loclist_funcs)
--    cu->has_loclist = 1;
 +  dwarf2_symbol_mark_computed (attr, sym, cu);
- }
  
- /* Given a pointer to a DWARF information entry, figure out if we need
-@@ -11351,6 +11558,8 @@ new_symbol_full (struct die_info *die, s
+   if (SYMBOL_COMPUTED_OPS (sym) == &dwarf2_loclist_funcs)
+     cu->has_loclist = 1;
+@@ -11377,6 +11587,8 @@ new_symbol_full (struct die_info *die, s
        else
  	sym = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct symbol);
        OBJSTAT (objfile, n_syms++);
@@ -2224,7 +2223,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  
        /* Cache this symbol's name and the name's demangled form (if any).  */
        SYMBOL_SET_LANGUAGE (sym, cu->language);
-@@ -12123,6 +12332,9 @@ read_type_die_1 (struct die_info *die, s
+@@ -12149,6 +12361,9 @@ read_type_die_1 (struct die_info *die, s
        break;
      }
  
@@ -2234,7 +2233,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
    return this_type;
  }
  
-@@ -15015,61 +15227,100 @@ fill_in_loclist_baton (struct dwarf2_cu 
+@@ -15324,61 +15539,99 @@ fill_in_loclist_baton (struct dwarf2_cu
    baton->base_address = cu->base_address;
  }
  
@@ -2278,7 +2277,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 +  baton->size = DW_BLOCK (attr)->size;
 +  baton->data = DW_BLOCK (attr)->data;
 +  gdb_assert (baton->size == 0 || baton->data != NULL);
-+
+ 
 +  return baton;
 +}
 +
@@ -2294,7 +2293,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 +
 +  dwarf2_read_section (dwarf2_per_objfile->objfile,
 +		       &dwarf2_per_objfile->loc);
- 
++
 +  if (!(attr_form_is_section_offset (attr)
 +	/* ".debug_loc" may not exist at all, or the offset may be outside
 +	   the section.  If so, fall through to the complaint in the
@@ -2330,7 +2329,6 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
        SYMBOL_COMPUTED_OPS (sym) = &dwarf2_loclist_funcs;
 -      SYMBOL_LOCATION_BATON (sym) = baton;
 +      SYMBOL_LOCATION_BATON (sym) = loclist_baton;
-+      cu->has_loclist = 1;
 +    }
 +  else if (attr_form_is_block (attr))
 +    {
@@ -2378,7 +2376,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
      }
  }
  
-@@ -15418,6 +15669,25 @@ offset_and_type_eq (const void *item_lhs
+@@ -15727,6 +15980,25 @@ offset_and_type_eq (const void *item_lhs
    return ofs_lhs->offset == ofs_rhs->offset;
  }
  
@@ -2404,7 +2402,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
  /* Set the type associated with DIE to TYPE.  Save it in CU's hash
     table if necessary.  For convenience, return TYPE.
  
-@@ -15443,6 +15713,8 @@ set_die_type (struct die_info *die, stru
+@@ -15752,6 +16024,8 @@ set_die_type (struct die_info *die, stru
    struct objfile *objfile = cu->objfile;
    htab_t *type_hash_ptr;
  
@@ -2416,7 +2414,7 @@ Index: gdb-7.3.50.20110722/gdb/dwarf2read.c
 Index: gdb-7.3.50.20110722/gdb/elfread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/elfread.c	2011-05-26 09:47:10.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/elfread.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/elfread.c	2011-07-29 22:52:02.000000000 +0200
 @@ -38,6 +38,8 @@
  #include "demangle.h"
  #include "psympriv.h"
@@ -2448,7 +2446,7 @@ Index: gdb-7.3.50.20110722/gdb/elfread.c
  static void free_elfinfo (void *);
  
  /* Minimal symbols located at the GOT entries for .plt - that is the real
-@@ -1574,7 +1591,266 @@ elfstab_offset_sections (struct objfile 
+@@ -1574,7 +1591,266 @@ elfstab_offset_sections (struct objfile
      complaint (&symfile_complaints,
  	       _("elf/stab section information missing for %s"), filename);
  }
@@ -2715,7 +2713,7 @@ Index: gdb-7.3.50.20110722/gdb/elfread.c
  /* Register that we are able to handle ELF object file formats.  */
  
  static const struct sym_fns elf_sym_fns =
-@@ -1589,6 +1865,7 @@ static const struct sym_fns elf_sym_fns 
+@@ -1589,6 +1865,7 @@ static const struct sym_fns elf_sym_fns
    elf_symfile_segments,		/* Get segment information from a file.  */
    NULL,
    default_symfile_relocate,	/* Relocate a debug section.  */
@@ -2751,7 +2749,7 @@ Index: gdb-7.3.50.20110722/gdb/elfread.c
 Index: gdb-7.3.50.20110722/gdb/eval.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/eval.c	2011-06-17 22:35:09.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/eval.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/eval.c	2011-07-29 22:52:02.000000000 +0200
 @@ -44,6 +44,7 @@
  #include "objfiles.h"
  #include "python/python.h"
@@ -3239,7 +3237,7 @@ Index: gdb-7.3.50.20110722/gdb/eval.c
 Index: gdb-7.3.50.20110722/gdb/f-exp.y
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/f-exp.y	2011-04-19 20:04:07.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/f-exp.y	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/f-exp.y	2011-07-29 22:52:02.000000000 +0200
 @@ -293,7 +293,9 @@ arglist :	subrange
  			{ arglist_len = 1; }
  	;
@@ -3254,7 +3252,7 @@ Index: gdb-7.3.50.20110722/gdb/f-exp.y
 Index: gdb-7.3.50.20110722/gdb/f-lang.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/f-lang.h	2011-01-07 20:36:16.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/f-lang.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/f-lang.h	2011-07-29 22:52:02.000000000 +0200
 @@ -28,6 +28,10 @@ extern void f_error (char *);	/* Defined
  extern void f_print_type (struct type *, const char *, struct ui_file *, int,
  			  int);
@@ -3269,7 +3267,7 @@ Index: gdb-7.3.50.20110722/gdb/f-lang.h
 Index: gdb-7.3.50.20110722/gdb/f-typeprint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/f-typeprint.c	2011-06-29 17:32:39.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/f-typeprint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/f-typeprint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -32,7 +32,7 @@
  #include "gdbcore.h"
  #include "target.h"
@@ -3337,7 +3335,7 @@ Index: gdb-7.3.50.20110722/gdb/f-typeprint.c
 Index: gdb-7.3.50.20110722/gdb/f-valprint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/f-valprint.c	2011-06-29 17:32:39.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/f-valprint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/f-valprint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -54,15 +54,17 @@ int f77_array_offset_tbl[MAX_FORTRAN_DIM
  /* The following macro gives us the size of the nth dimension, Where 
     n is 1 based.  */
@@ -3476,7 +3474,7 @@ Index: gdb-7.3.50.20110722/gdb/f-valprint.c
 Index: gdb-7.3.50.20110722/gdb/findvar.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/findvar.c	2011-07-12 23:16:48.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/findvar.c	2011-07-22 20:05:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/findvar.c	2011-07-29 22:52:44.000000000 +0200
 @@ -35,6 +35,7 @@
  #include "user-regs.h"
  #include "block.h"
@@ -3613,7 +3611,7 @@ Index: gdb-7.3.50.20110722/gdb/findvar.c
      {
        /* The ISA/ABI need to something weird when obtaining the
           specified value from this register.  It might need to
-@@ -640,7 +633,7 @@ value_from_register (struct type *type, 
+@@ -640,7 +633,7 @@ value_from_register (struct type *type,
        VALUE_LVAL (v) = lval_register;
        VALUE_FRAME_ID (v) = get_frame_id (frame);
        VALUE_REGNUM (v) = regnum;
@@ -3625,7 +3623,7 @@ Index: gdb-7.3.50.20110722/gdb/findvar.c
 Index: gdb-7.3.50.20110722/gdb/gdbinit.in
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/gdbinit.in	2009-10-05 15:46:52.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/gdbinit.in	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/gdbinit.in	2011-07-29 22:52:02.000000000 +0200
 @@ -1,5 +1,15 @@
  echo Setting up the environment for debugging gdb.\n
  
@@ -3645,7 +3643,7 @@ Index: gdb-7.3.50.20110722/gdb/gdbinit.in
 Index: gdb-7.3.50.20110722/gdb/gdbtypes.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/gdbtypes.c	2011-06-24 21:47:37.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/gdbtypes.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/gdbtypes.c	2011-07-29 22:52:02.000000000 +0200
 @@ -39,6 +39,9 @@
  #include "cp-abi.h"
  #include "gdb_assert.h"
@@ -3656,7 +3654,7 @@ Index: gdb-7.3.50.20110722/gdb/gdbtypes.c
  
  
  /* Initialize BADNESS constants.  */
-@@ -144,7 +147,16 @@ static void print_bit_vector (B_TYPE *, 
+@@ -144,7 +147,16 @@ static void print_bit_vector (B_TYPE *,
  static void print_arg_types (struct field *, int, int);
  static void dump_fn_fieldlists (struct type *, int);
  static void print_cplus_stuff (struct type *, int);
@@ -3726,7 +3724,7 @@ Index: gdb-7.3.50.20110722/gdb/gdbtypes.c
        if (typeptr)
  	*typeptr = ntype;
      }
-@@ -377,7 +426,7 @@ make_reference_type (struct type *type, 
+@@ -377,7 +426,7 @@ make_reference_type (struct type *type,
  
    if (typeptr == 0 || *typeptr == 0)	/* We'll need to allocate one.  */
      {
@@ -4559,7 +4557,7 @@ Index: gdb-7.3.50.20110722/gdb/gdbtypes.c
 Index: gdb-7.3.50.20110722/gdb/gdbtypes.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/gdbtypes.h	2011-07-05 15:36:41.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/gdbtypes.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/gdbtypes.h	2011-07-29 22:52:02.000000000 +0200
 @@ -215,6 +215,11 @@ enum type_instance_flag_value
  
  #define TYPE_TARGET_STUB(t)	(TYPE_MAIN_TYPE (t)->flag_target_stub)
@@ -4797,7 +4795,7 @@ Index: gdb-7.3.50.20110722/gdb/gdbtypes.h
 Index: gdb-7.3.50.20110722/gdb/i386-linux-nat.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/i386-linux-nat.c	2011-02-27 17:25:37.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/i386-linux-nat.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/i386-linux-nat.c	2011-07-29 22:52:02.000000000 +0200
 @@ -649,22 +649,13 @@ i386_linux_store_inferior_registers (str
  }
  
@@ -4864,7 +4862,10 @@ Index: gdb-7.3.50.20110722/gdb/i386-linux-nat.c
 -  ptid_t ptid;
 +  int inferior_pid = ptid_get_pid (inferior_ptid);
 +  struct inferior *inf = current_inferior ();
-+
+ 
+-  i386_linux_dr[DR_CONTROL] = control;
+-  ALL_LWPS (lp, ptid)
+-    i386_linux_dr_set (ptid, DR_CONTROL, control);
 +  /* The amd64 counterpart and description is amd64_linux_dr_set_control.  */
 +  if (inf->pid != inferior_pid)
 +    {
@@ -4874,10 +4875,7 @@ Index: gdb-7.3.50.20110722/gdb/i386-linux-nat.c
 +      if (!dr_mirror->addr_preset)
 +	{
 +	  dr_mirror->addr_preset = 1;
- 
--  i386_linux_dr[DR_CONTROL] = control;
--  ALL_LWPS (lp, ptid)
--    i386_linux_dr_set (ptid, DR_CONTROL, control);
++
 +	  for (i = 0; i < DR_LASTADDR - DR_FIRSTADDR; i++)
 +	    i386_linux_dr_set_addr (i, dr_mirror->addr[i]);
 +	}
@@ -5005,7 +5003,7 @@ Index: gdb-7.3.50.20110722/gdb/i386-linux-nat.c
 Index: gdb-7.3.50.20110722/gdb/i386-nat.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/i386-nat.c	2011-02-26 23:04:51.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/i386-nat.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/i386-nat.c	2011-07-29 22:52:02.000000000 +0200
 @@ -25,6 +25,7 @@
  #include "gdbcmd.h"
  #include "target.h"
@@ -5346,7 +5344,7 @@ Index: gdb-7.3.50.20110722/gdb/i386-nat.c
  	  rc = 1;
  	  if (maint_show_dr)
  	    i386_show_dr ("watchpoint_hit", addr, -1, hw_write);
-@@ -689,6 +764,10 @@ i386_use_watchpoints (struct target_ops 
+@@ -689,6 +764,10 @@ i386_use_watchpoints (struct target_ops
    t->to_remove_watchpoint = i386_remove_watchpoint;
    t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint;
    t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint;
@@ -5360,8 +5358,8 @@ Index: gdb-7.3.50.20110722/gdb/i386-nat.c
 Index: gdb-7.3.50.20110722/gdb/i386-nat.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/i386-nat.h	2011-01-09 04:08:56.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/i386-nat.h	2011-07-22 20:04:21.000000000 +0200
-@@ -78,6 +78,28 @@ struct i386_dr_low_type 
++++ gdb-7.3.50.20110722/gdb/i386-nat.h	2011-07-29 22:52:02.000000000 +0200
+@@ -78,6 +78,28 @@ struct i386_dr_low_type
  
  extern struct i386_dr_low_type i386_dr_low;
  
@@ -5393,7 +5391,7 @@ Index: gdb-7.3.50.20110722/gdb/i386-nat.h
 Index: gdb-7.3.50.20110722/gdb/infrun.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/infrun.c	2011-07-22 01:46:09.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/infrun.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/infrun.c	2011-07-29 22:52:02.000000000 +0200
 @@ -55,6 +55,8 @@
  #include "jit.h"
  #include "tracepoint.h"
@@ -5552,7 +5550,7 @@ Index: gdb-7.3.50.20110722/gdb/infrun.c
 Index: gdb-7.3.50.20110722/gdb/linespec.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/linespec.c	2011-07-05 22:30:19.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/linespec.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/linespec.c	2011-07-29 22:52:02.000000000 +0200
 @@ -43,6 +43,7 @@
  #include "arch-utils.h"
  #include <ctype.h>
@@ -5582,7 +5580,7 @@ Index: gdb-7.3.50.20110722/gdb/linespec.c
 Index: gdb-7.3.50.20110722/gdb/linespec.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/linespec.h	2011-04-04 19:41:07.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/linespec.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/linespec.h	2011-07-29 22:52:02.000000000 +0200
 @@ -30,6 +30,10 @@ struct linespec_result
       display mechanism would do the wrong thing.  */
    int special_display;
@@ -5597,7 +5595,7 @@ Index: gdb-7.3.50.20110722/gdb/linespec.h
 Index: gdb-7.3.50.20110722/gdb/linux-nat.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/linux-nat.c	2011-07-22 01:46:09.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/linux-nat.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/linux-nat.c	2011-07-29 22:52:02.000000000 +0200
 @@ -1241,6 +1241,64 @@ iterate_over_lwps (ptid_t filter,
    return NULL;
  }
@@ -5666,7 +5664,7 @@ Index: gdb-7.3.50.20110722/gdb/linux-nat.c
 Index: gdb-7.3.50.20110722/gdb/linux-nat.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/linux-nat.h	2011-01-05 23:22:49.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/linux-nat.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/linux-nat.h	2011-07-29 22:52:02.000000000 +0200
 @@ -140,6 +140,11 @@ struct lwp_info *iterate_over_lwps (ptid
  						     void *), 
  				    void *data);
@@ -5682,7 +5680,7 @@ Index: gdb-7.3.50.20110722/gdb/linux-nat.h
 Index: gdb-7.3.50.20110722/gdb/machoread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/machoread.c	2011-07-01 20:36:45.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/machoread.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/machoread.c	2011-07-29 22:52:02.000000000 +0200
 @@ -842,6 +842,7 @@ static const struct sym_fns macho_sym_fn
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
@@ -5694,7 +5692,7 @@ Index: gdb-7.3.50.20110722/gdb/machoread.c
 Index: gdb-7.3.50.20110722/gdb/main.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/main.c	2011-06-13 12:55:26.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/main.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/main.c	2011-07-29 22:52:02.000000000 +0200
 @@ -39,6 +39,7 @@
  
  #include "interps.h"
@@ -5792,8 +5790,7 @@ Index: gdb-7.3.50.20110722/gdb/main.c
 -  while (1)
 +#if HAVE_PYTHON
 +  if (python_script)
-     {
--      catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
++    {
 +      extern int pagination_enabled;
 +      pagination_enabled = 0;
 +      run_python_script (argc - optind, &argv[optind]);
@@ -5801,7 +5798,8 @@ Index: gdb-7.3.50.20110722/gdb/main.c
 +    }
 +  else
 +#endif
-+    {
+     {
+-      catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
 +      /* NOTE: cagney/1999-11-07: There is probably no reason for not
 +	 moving this loop and the code found in captured_command_loop()
 +	 into the command_loop() proper.  The main thing holding back that
@@ -5845,7 +5843,7 @@ Index: gdb-7.3.50.20110722/gdb/main.c
 Index: gdb-7.3.50.20110722/gdb/mi/mi-cmd-var.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/mi/mi-cmd-var.c	2011-06-27 21:21:51.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/mi/mi-cmd-var.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/mi/mi-cmd-var.c	2011-07-29 22:52:02.000000000 +0200
 @@ -707,7 +707,6 @@ mi_cmd_var_update (char *command, char *
      }
    else
@@ -5857,7 +5855,7 @@ Index: gdb-7.3.50.20110722/gdb/mi/mi-cmd-var.c
 Index: gdb-7.3.50.20110722/gdb/mipsread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/mipsread.c	2011-04-19 20:04:07.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/mipsread.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/mipsread.c	2011-07-29 22:52:02.000000000 +0200
 @@ -402,6 +402,7 @@ static const struct sym_fns ecoff_sym_fn
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
@@ -5869,7 +5867,7 @@ Index: gdb-7.3.50.20110722/gdb/mipsread.c
 Index: gdb-7.3.50.20110722/gdb/objfiles.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/objfiles.c	2011-06-14 18:49:41.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/objfiles.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/objfiles.c	2011-07-29 22:52:02.000000000 +0200
 @@ -842,6 +842,11 @@ objfile_relocate1 (struct objfile *objfi
  				obj_section_addr (s));
      }
@@ -5885,7 +5883,7 @@ Index: gdb-7.3.50.20110722/gdb/objfiles.c
 Index: gdb-7.3.50.20110722/gdb/p-valprint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/p-valprint.c	2011-03-15 17:00:56.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/p-valprint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/p-valprint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -39,6 +39,7 @@
  #include "cp-abi.h"
  #include "cp-support.h"
@@ -5965,8 +5963,8 @@ Index: gdb-7.3.50.20110722/gdb/p-valprint.c
 Index: gdb-7.3.50.20110722/gdb/parse.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/parse.c	2011-06-17 22:24:22.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/parse.c	2011-07-22 20:04:21.000000000 +0200
-@@ -1501,6 +1501,7 @@ parser_fprintf (FILE *x, const char *y, 
++++ gdb-7.3.50.20110722/gdb/parse.c	2011-07-29 22:52:02.000000000 +0200
+@@ -1501,6 +1501,7 @@ parser_fprintf (FILE *x, const char *y,
  
  int
  operator_check_standard (struct expression *exp, int pos,
@@ -6074,7 +6072,7 @@ Index: gdb-7.3.50.20110722/gdb/parse.c
 Index: gdb-7.3.50.20110722/gdb/parser-defs.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/parser-defs.h	2011-01-10 21:38:49.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/parser-defs.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/parser-defs.h	2011-07-29 22:52:02.000000000 +0200
 @@ -194,6 +194,8 @@ extern void operator_length_standard (co
  				      int *);
  
@@ -6106,7 +6104,7 @@ Index: gdb-7.3.50.20110722/gdb/parser-defs.h
 Index: gdb-7.3.50.20110722/gdb/ppc-linux-nat.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/ppc-linux-nat.c	2011-05-06 20:46:31.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/ppc-linux-nat.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/ppc-linux-nat.c	2011-07-29 22:52:02.000000000 +0200
 @@ -1647,6 +1647,14 @@ ppc_linux_ranged_break_num_registers (st
  	  2 : -1);
  }
@@ -6253,7 +6251,7 @@ Index: gdb-7.3.50.20110722/gdb/ppc-linux-nat.c
 Index: gdb-7.3.50.20110722/gdb/printcmd.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/printcmd.c	2011-03-22 15:39:40.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/printcmd.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/printcmd.c	2011-07-29 22:52:02.000000000 +0200
 @@ -975,6 +975,11 @@ print_command_1 (char *exp, int inspect,
    else
      val = access_value_history (0);
@@ -6303,7 +6301,7 @@ Index: gdb-7.3.50.20110722/gdb/printcmd.c
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameIterator.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameIterator.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameIterator.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,33 @@
 +# Iterator over frames.
 +
@@ -6341,7 +6339,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameIterator.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameWrapper.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameWrapper.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameWrapper.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,112 @@
 +# Wrapper API for frames.
 +
@@ -6458,7 +6456,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/FrameWrapper.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/backtrace.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/backtrace.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/backtrace.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,42 @@
 +# Filtering backtrace.
 +
@@ -6505,7 +6503,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/backtrace.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/alias.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/alias.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/alias.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,59 @@
 +# Alias command.
 +
@@ -6569,7 +6567,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/alias.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/backtrace.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/backtrace.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/backtrace.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,106 @@
 +# New backtrace command.
 +
@@ -6680,7 +6678,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/backtrace.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/ignore_errors.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/ignore_errors.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/ignore_errors.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,37 @@
 +# Ignore errors in user commands.
 +
@@ -6722,7 +6720,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/ignore_errors.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/pahole.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/pahole.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/pahole.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,75 @@
 +# pahole command for gdb
 +
@@ -6802,7 +6800,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/pahole.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/require.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/require.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/require.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,57 @@
 +# Demand-loading commands.
 +
@@ -6864,7 +6862,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/require.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/upto.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/upto.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/command/upto.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,129 @@
 +# upto command.
 +
@@ -6998,13 +6996,13 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/command/upto.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/function/__init__.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/function/__init__.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/function/__init__.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1 @@
 +
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/function/caller_is.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/function/caller_is.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/function/caller_is.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,58 @@
 +# Caller-is functions.
 +
@@ -7067,7 +7065,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/function/caller_is.py
 Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/function/in_scope.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/python/lib/gdb/function/in_scope.py	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/lib/gdb/function/in_scope.py	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,47 @@
 +# In-scope function.
 +
@@ -7119,7 +7117,7 @@ Index: gdb-7.3.50.20110722/gdb/python/lib/gdb/function/in_scope.py
 Index: gdb-7.3.50.20110722/gdb/python/py-type.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/python/py-type.c	2011-06-24 21:47:37.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/python/py-type.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/py-type.c	2011-07-29 22:52:02.000000000 +0200
 @@ -29,6 +29,8 @@
  #include "language.h"
  #include "vec.h"
@@ -7317,7 +7315,7 @@ Index: gdb-7.3.50.20110722/gdb/python/py-type.c
 Index: gdb-7.3.50.20110722/gdb/python/py-value.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/python/py-value.c	2011-06-27 21:21:51.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/python/py-value.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/py-value.c	2011-07-29 22:52:02.000000000 +0200
 @@ -28,6 +28,7 @@
  #include "infcall.h"
  #include "expression.h"
@@ -7360,7 +7358,7 @@ Index: gdb-7.3.50.20110722/gdb/python/py-value.c
 Index: gdb-7.3.50.20110722/gdb/python/python.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/python/python.c	2011-07-21 13:03:47.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/python/python.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/python.c	2011-07-29 22:52:02.000000000 +0200
 @@ -49,9 +49,12 @@ static int gdbpy_should_print_stack = 0;
  #include "linespec.h"
  #include "source.h"
@@ -7440,7 +7438,7 @@ Index: gdb-7.3.50.20110722/gdb/python/python.c
 Index: gdb-7.3.50.20110722/gdb/python/python.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/python/python.h	2011-03-14 17:09:54.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/python/python.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/python/python.h	2011-07-29 22:52:02.000000000 +0200
 @@ -32,6 +32,8 @@ void eval_python_from_control_command (s
  
  void source_python_script (FILE *stream, const char *file);
@@ -7453,8 +7451,8 @@ Index: gdb-7.3.50.20110722/gdb/python/python.h
 Index: gdb-7.3.50.20110722/gdb/somread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/somread.c	2011-03-07 17:17:29.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/somread.c	2011-07-22 20:04:21.000000000 +0200
-@@ -439,6 +439,7 @@ static const struct sym_fns som_sym_fns 
++++ gdb-7.3.50.20110722/gdb/somread.c	2011-07-29 22:52:02.000000000 +0200
+@@ -439,6 +439,7 @@ static const struct sym_fns som_sym_fns
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
    default_symfile_relocate,	/* Relocate a debug section.  */
@@ -7465,7 +7463,7 @@ Index: gdb-7.3.50.20110722/gdb/somread.c
 Index: gdb-7.3.50.20110722/gdb/stack.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/stack.c	2011-06-27 21:21:50.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/stack.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/stack.c	2011-07-29 22:52:02.000000000 +0200
 @@ -366,6 +366,7 @@ print_frame_args (struct symbol *func, s
  	        {
                    const struct language_defn *language;
@@ -7491,7 +7489,7 @@ Index: gdb-7.3.50.20110722/gdb/stack.c
 Index: gdb-7.3.50.20110722/gdb/stap-probe.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/stap-probe.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/stap-probe.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,2042 @@
 +/* SystemTap probe support for GDB.
 +
@@ -9538,7 +9536,7 @@ Index: gdb-7.3.50.20110722/gdb/stap-probe.c
 Index: gdb-7.3.50.20110722/gdb/stap-probe.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/stap-probe.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/stap-probe.h	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,114 @@
 +/* SystemTap probe support for GDB.
 +
@@ -9656,8 +9654,8 @@ Index: gdb-7.3.50.20110722/gdb/stap-probe.h
 +#endif /* !defined (STAP_PROBE_H) */
 Index: gdb-7.3.50.20110722/gdb/symfile.h
 ===================================================================
---- gdb-7.3.50.20110722.orig/gdb/symfile.h	2011-06-10 23:48:04.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/symfile.h	2011-07-22 20:04:21.000000000 +0200
+--- gdb-7.3.50.20110722.orig/gdb/symfile.h	2011-07-29 22:52:00.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/symfile.h	2011-07-29 22:52:02.000000000 +0200
 @@ -31,6 +31,11 @@ struct objfile;
  struct obj_section;
  struct obstack;
@@ -9737,7 +9735,7 @@ Index: gdb-7.3.50.20110722/gdb/symfile.h
 Index: gdb-7.3.50.20110722/gdb/symtab.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/symtab.c	2011-07-21 17:13:29.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/symtab.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/symtab.c	2011-07-29 22:52:02.000000000 +0200
 @@ -776,6 +776,7 @@ init_sal (struct symtab_and_line *sal)
    sal->end = 0;
    sal->explicit_pc = 0;
@@ -9749,7 +9747,7 @@ Index: gdb-7.3.50.20110722/gdb/symtab.c
 Index: gdb-7.3.50.20110722/gdb/symtab.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/symtab.h	2011-06-30 00:19:24.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/symtab.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/symtab.h	2011-07-29 22:52:02.000000000 +0200
 @@ -1115,6 +1115,10 @@ struct symtab_and_line
    CORE_ADDR end;
    int explicit_pc;
@@ -9764,7 +9762,7 @@ Index: gdb-7.3.50.20110722/gdb/symtab.h
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,457 @@
 +	.file	"x86_64-vla-pointer.c"
 +	.section	.debug_abbrev,"",@progbits
@@ -10226,7 +10224,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,43 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -10274,7 +10272,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,66 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -10345,7 +10343,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,455 @@
 +	.file	"x86_64-vla-typedef.c"
 +	.section	.debug_abbrev,"",@progbits
@@ -10805,7 +10803,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,43 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -10853,7 +10851,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,64 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -10922,7 +10920,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.base/arrayidx.c	2011-01-01 16:33:40.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.c	2011-07-29 22:52:02.000000000 +0200
 @@ -17,6 +17,13 @@
  
  int array[] = {1, 2, 3, 4};
@@ -10940,7 +10938,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.base/arrayidx.exp	2011-01-01 16:33:40.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -57,4 +57,12 @@ gdb_test "print array" \
           "\\{\\\[0\\\] = 1, \\\[1\\\] = 2, \\\[2\\\] = 3, \\\[3\\\] = 4\\}" \
           "Print array with array-indexes on"
@@ -10958,7 +10956,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/arrayidx.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/default.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.base/default.exp	2011-05-20 16:37:20.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/default.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/default.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -607,6 +607,17 @@ gdb_test_list_exact "show convenience" "
  	{$_sdata = void} \
  	{$_siginfo = void} \
@@ -10980,7 +10978,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/default.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,20 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11005,7 +11003,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,26 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -11036,7 +11034,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/internal-var-field-address.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,69 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11110,7 +11108,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,72 @@
 +# Copyright (C) 2011 Free Software Foundation, Inc.
 +
@@ -11187,7 +11185,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/stap-probe.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11222,7 +11220,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,109 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -11336,7 +11334,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla-overflow.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,55 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11396,7 +11394,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,62 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -11463,7 +11461,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.base/vla.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.cp/nextoverthrow.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-01-01 16:33:44.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -53,6 +53,17 @@ gdb_test_multiple "print _Unwind_DebugHo
      }
  }
@@ -11485,7 +11483,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.cp/nextoverthrow.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,246 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11736,7 +11734,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,54 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -11795,7 +11793,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,42 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11842,7 +11840,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,79 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -11926,7 +11924,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,83 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -12014,7 +12012,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-locat
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,37 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -12056,7 +12054,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-locat
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,42 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -12103,7 +12101,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,40 @@
 +! Copyright 2009 Free Software Foundation, Inc.
 +!
@@ -12148,7 +12146,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,24 @@
 +! Copyright 2010 Free Software Foundation, Inc.
 +!
@@ -12177,7 +12175,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f9
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,37 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -12219,7 +12217,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,36 @@
 +! Copyright 2010 Free Software Foundation, Inc.
 +!
@@ -12260,7 +12258,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,145 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -12410,7 +12408,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.f90	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.f90	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,98 @@
 +! Copyright 2007 Free Software Foundation, Inc.
 +!
@@ -12513,7 +12511,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/dynamic.f90
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,59 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -12577,7 +12575,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.f90	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.f90	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,37 @@
 +! Copyright 2008 Free Software Foundation, Inc.
 +!
@@ -12619,7 +12617,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/string.f90
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,60 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +
@@ -12684,7 +12682,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.f90	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.f90	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,28 @@
 +! Copyright 2011 Free Software Foundation, Inc.
 +!
@@ -12716,8 +12714,8 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.fortran/subrange.f90
 +end
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.gdb/selftest.exp
 ===================================================================
---- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.gdb/selftest.exp	2011-07-22 20:04:10.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.gdb/selftest.exp	2011-07-22 20:04:21.000000000 +0200
+--- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.gdb/selftest.exp	2011-07-29 22:52:00.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.gdb/selftest.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -92,6 +92,10 @@ proc do_steps_and_nexts {} {
  		set description "step over ttyarg initialization"
  		set command "step"
@@ -12732,7 +12730,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.gdb/selftest.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,26 @@
 +/* Copyright 2011 Free Software Foundation, Inc.
 +
@@ -12763,7 +12761,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,57 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +#
@@ -12825,7 +12823,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,59 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -12889,7 +12887,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,113 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -13007,7 +13005,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.multi/watchpoint-multi.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register-func.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register-func.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register-func.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,22 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -13034,7 +13032,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register-func.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,28 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -13067,7 +13065,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,33 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +#
@@ -13105,7 +13103,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.opt/array-from-register.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,104 @@
 +# Copyright 2008, 2009 Free Software Foundation, Inc.
 +#
@@ -13214,7 +13212,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.pas
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.pas	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.pas	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,82 @@
 +{
 + Copyright 2008, 2009 Free Software Foundation, Inc.
@@ -13301,7 +13299,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.pascal/arrays.pas
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-frame.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.python/py-frame.exp	2011-02-26 15:06:28.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-frame.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-frame.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -78,8 +78,6 @@ gdb_test "python print bframe == gdb.new
  
  gdb_test "python print 'result =', f0 == f1" " = False" "test equality comparison (false)"
@@ -13320,7 +13318,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-frame.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-value.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/gdb.python/py-value.exp	2011-04-24 11:04:38.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-value.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-value.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -319,6 +319,15 @@ proc test_value_after_death {} {
      "print value's type"
  }
@@ -13348,7 +13346,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.python/py-value.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-child.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-child.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,127 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13480,7 +13478,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,174 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13659,7 +13657,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,74 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13738,7 +13736,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-st.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-st.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-st.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,61 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13804,7 +13802,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork-st.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,149 @@
 +# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 +
@@ -13958,7 +13956,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.h	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13995,7 +13993,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.threads/watchpoint-fork.h
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.c	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,71 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -14071,7 +14069,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.c
 Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -0,0 +1,129 @@
 +# Copyright 2011
 +# Free Software Foundation, Inc.
@@ -14205,7 +14203,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/gdb.trace/stap-trace.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/lib/gdb.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/lib/gdb.exp	2011-07-15 16:11:22.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/testsuite/lib/gdb.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/lib/gdb.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -141,6 +141,11 @@ proc gdb_unload {} {
  	    send_gdb "y\n"
  	    exp_continue
@@ -14221,7 +14219,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/lib/gdb.exp
 Index: gdb-7.3.50.20110722/gdb/testsuite/lib/pascal.exp
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/testsuite/lib/pascal.exp	2011-01-01 16:33:52.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/testsuite/lib/pascal.exp	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/testsuite/lib/pascal.exp	2011-07-29 22:52:02.000000000 +0200
 @@ -37,6 +37,9 @@ proc pascal_init {} {
      global pascal_compiler_is_fpc
      global gpc_compiler
@@ -14256,7 +14254,7 @@ Index: gdb-7.3.50.20110722/gdb/testsuite/lib/pascal.exp
 Index: gdb-7.3.50.20110722/gdb/thread.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/thread.c	2011-05-30 20:04:32.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/thread.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/thread.c	2011-07-29 22:52:02.000000000 +0200
 @@ -1441,7 +1441,8 @@ update_thread_list (void)
     no thread is selected, or no threads exist.  */
  
@@ -14283,7 +14281,7 @@ Index: gdb-7.3.50.20110722/gdb/thread.c
  void
  _initialize_thread (void)
  {
-@@ -1497,5 +1507,5 @@ Show printing of thread events (such as 
+@@ -1497,5 +1507,5 @@ Show printing of thread events (such as
           show_print_thread_events,
           &setprintlist, &showprintlist);
  
@@ -14293,7 +14291,7 @@ Index: gdb-7.3.50.20110722/gdb/thread.c
 Index: gdb-7.3.50.20110722/gdb/top.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/top.c	2011-07-21 13:03:45.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/top.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/top.c	2011-07-29 22:52:02.000000000 +0200
 @@ -347,6 +347,9 @@ prepare_execute_command (void)
  
    mark = value_mark ();
@@ -14307,7 +14305,7 @@ Index: gdb-7.3.50.20110722/gdb/top.c
 Index: gdb-7.3.50.20110722/gdb/tracepoint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/tracepoint.c	2011-07-07 15:32:55.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/tracepoint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/tracepoint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -1609,6 +1609,8 @@ start_tracing (void)
  
    for (ix = 0; VEC_iterate (breakpoint_p, tp_vec, ix, t); ix++)
@@ -14394,7 +14392,7 @@ Index: gdb-7.3.50.20110722/gdb/tracepoint.c
 Index: gdb-7.3.50.20110722/gdb/typeprint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/typeprint.c	2011-01-11 22:53:25.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/typeprint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/typeprint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "gdb_string.h"
  #include "exceptions.h"
@@ -14451,7 +14449,7 @@ Index: gdb-7.3.50.20110722/gdb/typeprint.c
 Index: gdb-7.3.50.20110722/gdb/utils.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/utils.c	2011-07-22 01:46:09.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/utils.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/utils.c	2011-07-29 22:52:02.000000000 +0200
 @@ -1874,6 +1874,36 @@ set_batch_flag_and_make_cleanup_restore_
    return back_to;
  }
@@ -14492,7 +14490,7 @@ Index: gdb-7.3.50.20110722/gdb/utils.c
 Index: gdb-7.3.50.20110722/gdb/valarith.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/valarith.c	2011-02-18 20:10:46.000000000 +0100
-+++ gdb-7.3.50.20110722/gdb/valarith.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/valarith.c	2011-07-29 22:52:02.000000000 +0200
 @@ -198,7 +198,10 @@ value_subscripted_rvalue (struct value *
    struct type *array_type = check_typedef (value_type (array));
    struct type *elt_type = check_typedef (TYPE_TARGET_TYPE (array_type));
@@ -14519,7 +14517,7 @@ Index: gdb-7.3.50.20110722/gdb/valarith.c
 Index: gdb-7.3.50.20110722/gdb/valops.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/valops.c	2011-07-14 17:00:20.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/valops.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/valops.c	2011-07-29 22:52:02.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "objfiles.h"
  #include "symtab.h"
@@ -14674,7 +14672,7 @@ Index: gdb-7.3.50.20110722/gdb/valops.c
 Index: gdb-7.3.50.20110722/gdb/valprint.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/valprint.c	2011-06-29 17:32:39.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/valprint.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/valprint.c	2011-07-29 22:52:02.000000000 +0200
 @@ -39,6 +39,7 @@
  #include "gdb_obstack.h"
  #include "charset.h"
@@ -14747,7 +14745,7 @@ Index: gdb-7.3.50.20110722/gdb/valprint.c
 Index: gdb-7.3.50.20110722/gdb/value.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/value.c	2011-07-14 17:00:20.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/value.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/value.c	2011-07-29 22:52:02.000000000 +0200
 @@ -43,6 +43,7 @@
  #include "python/python.h"
  #include <ctype.h>
@@ -15026,7 +15024,7 @@ Index: gdb-7.3.50.20110722/gdb/value.c
 Index: gdb-7.3.50.20110722/gdb/value.h
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/value.h	2011-07-14 17:00:20.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/value.h	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/value.h	2011-07-29 22:52:02.000000000 +0200
 @@ -475,6 +475,10 @@ extern struct value *value_from_decfloat
  					  const gdb_byte *decbytes);
  extern struct value *value_from_history_ref (char *, char **);
@@ -15097,7 +15095,7 @@ Index: gdb-7.3.50.20110722/gdb/value.h
 Index: gdb-7.3.50.20110722/gdb/windows-tdep.c
 ===================================================================
 --- gdb-7.3.50.20110722.orig/gdb/windows-tdep.c	2011-07-14 17:00:20.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/windows-tdep.c	2011-07-22 20:04:21.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/windows-tdep.c	2011-07-29 22:52:02.000000000 +0200
 @@ -268,7 +268,7 @@ static const struct lval_funcs tlb_value
     if there's no object available.  */
  
@@ -15132,9 +15130,9 @@ Index: gdb-7.3.50.20110722/gdb/windows-tdep.c
  }
 Index: gdb-7.3.50.20110722/gdb/xcoffread.c
 ===================================================================
---- gdb-7.3.50.20110722.orig/gdb/xcoffread.c	2011-06-07 14:31:07.000000000 +0200
-+++ gdb-7.3.50.20110722/gdb/xcoffread.c	2011-07-22 20:04:21.000000000 +0200
-@@ -3123,6 +3123,7 @@ static const struct sym_fns xcoff_sym_fn
+--- gdb-7.3.50.20110722.orig/gdb/xcoffread.c	2011-07-29 22:52:00.000000000 +0200
++++ gdb-7.3.50.20110722/gdb/xcoffread.c	2011-07-29 22:52:02.000000000 +0200
+@@ -3125,6 +3125,7 @@ static const struct sym_fns xcoff_sym_fn
    default_symfile_segments,	/* Get segment information from a file.  */
    aix_process_linenos,
    default_symfile_relocate,	/* Relocate a debug section.  */
diff --git a/gdb.spec b/gdb.spec
index 788570b..d0732af 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,7 +27,7 @@ Version: 7.3.50.20110722
 
 # 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: 2%{?_with_upstream:.upstream}%{?dist}
+Release: 3%{?_with_upstream:.upstream}%{?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
@@ -1213,6 +1213,9 @@ fi
 %{_infodir}/gdb.info*
 
 %changelog
+* Fri Jul 29 2011 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.3.50.20110722-3.fc16
+- Fix regression from VLA merge affecting -O0 -g watchpoints.
+
 * Fri Jul 29 2011 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.3.50.20110722-2.fc16
 - Include gcc -g3 .debug_macro implementation by Tom Tromey.