diff --git a/.gitignore b/.gitignore
index c263c7d..c1643cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /libstdc++-v3-python-r155978.tar.bz2
-/gdb-7.2.90.20110525.tar.bz2
+/gdb-7.2.90.20110703.tar.bz2
diff --git a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
index 9943e60..fa2f4ed 100644
--- a/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
+++ b/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch
@@ -32,51 +32,17 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
   <81a2>     DW_AT_name        : (indirect string, offset: 0x280e): __errno_location
   <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
 
-Index: gdb-7.2/gdb/printcmd.c
-===================================================================
---- gdb-7.2.orig/gdb/printcmd.c	2011-03-29 10:55:32.000000000 +0200
-+++ gdb-7.2/gdb/printcmd.c	2011-03-29 10:56:00.000000000 +0200
-@@ -947,10 +947,10 @@ validate_format (struct format_data fmt,
- static void
- print_command_1 (char *exp, int inspect, int voidprint)
- {
--  struct expression *expr;
-   struct cleanup *old_chain = 0;
-   char format = 0;
--  struct value *val;
-+  /* False GCC warning due to the TRY_CATCH.  */
-+  struct value *val = NULL;
-   struct format_data fmt;
-   int cleanup = 0;
- 
-@@ -971,10 +971,25 @@ print_command_1 (char *exp, int inspect,
+--- a/gdb/printcmd.c
++++ b/gdb/printcmd.c
+@@ -967,6 +967,8 @@ print_command_1 (char *exp, int inspect, int voidprint)
  
    if (exp && *exp)
      {
-+      struct expression *expr;
-+      volatile struct gdb_exception except;
-+
++      if (strcmp (exp, "errno") == 0)
++	exp = "*((int *(*) (void)) __errno_location) ()";
        expr = parse_expression (exp);
--      old_chain = make_cleanup (free_current_contents, &expr);
-+      old_chain = make_cleanup (xfree, expr);
+       old_chain = make_cleanup (free_current_contents, &expr);
        cleanup = 1;
--      val = evaluate_expression (expr);
-+      TRY_CATCH (except, RETURN_MASK_ERROR)
-+	{
-+	  val = evaluate_expression (expr);
-+	}
-+      if (except.reason < 0)
-+	{
-+	  if (strcmp (exp, "errno") != 0)
-+	    throw_exception (except);
-+
-+	  expr = parse_expression ("*((int *(*) (void)) __errno_location) ()");
-+	  make_cleanup (xfree, expr);
-+	  val = evaluate_expression (expr);
-+	}
-     }
-   else
-     val = access_value_history (0);
 Index: gdb-7.2/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/gdb-archer.patch b/gdb-archer.patch
index 6bf9168..78b4e5a 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -11,10 +11,10 @@ archer-tromey-python
 archer-sergiodj-stap-fedora15jk
 
 
-Index: gdb-7.2.90.20110525/bfd/elf-bfd.h
+Index: gdb-7.2.90.20110703/bfd/elf-bfd.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/bfd/elf-bfd.h	2011-03-14 16:54:57.000000000 +0100
-+++ gdb-7.2.90.20110525/bfd/elf-bfd.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/bfd/elf-bfd.h	2011-03-14 16:54:57.000000000 +0100
++++ gdb-7.2.90.20110703/bfd/elf-bfd.h	2011-07-03 10:33:11.000000000 +0200
 @@ -1476,6 +1476,15 @@ enum
    Tag_compatibility = 32
  };
@@ -43,10 +43,10 @@ Index: gdb-7.2.90.20110525/bfd/elf-bfd.h
    /* True if the bfd contains symbols that have the STT_GNU_IFUNC
       symbol type.  Used to set the osabi field in the ELF header
       structure.  */
-Index: gdb-7.2.90.20110525/bfd/elf.c
+Index: gdb-7.2.90.20110703/bfd/elf.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/bfd/elf.c	2011-03-14 16:54:58.000000000 +0100
-+++ gdb-7.2.90.20110525/bfd/elf.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/bfd/elf.c	2011-03-14 16:54:58.000000000 +0100
++++ gdb-7.2.90.20110703/bfd/elf.c	2011-07-03 10:33:11.000000000 +0200
 @@ -8416,6 +8416,37 @@ elfobj_grok_gnu_note (bfd *abfd, Elf_Int
      }
  }
@@ -98,10 +98,10 @@ Index: gdb-7.2.90.20110525/bfd/elf.c
  	  break;
  	}
  
-Index: gdb-7.2.90.20110525/gdb/Makefile.in
+Index: gdb-7.2.90.20110703/gdb/Makefile.in
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/Makefile.in	2011-03-30 08:55:39.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/Makefile.in	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/Makefile.in	2011-03-30 08:55:39.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/Makefile.in	2011-07-03 10:33:11.000000000 +0200
 @@ -721,8 +721,8 @@ SFILES = ada-exp.y ada-lang.c ada-typepr
  	sentinel-frame.c \
  	serial.c ser-base.c ser-unix.c \
@@ -144,10 +144,10 @@ Index: gdb-7.2.90.20110525/gdb/Makefile.in
  config.status: $(srcdir)/configure configure.tgt configure.host
  	$(SHELL) config.status --recheck
  
-Index: gdb-7.2.90.20110525/gdb/NEWS
+Index: gdb-7.2.90.20110703/gdb/NEWS
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/NEWS	2011-03-31 16:32:48.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/NEWS	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/NEWS	2011-03-31 16:32:48.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/NEWS	2011-07-03 10:33:11.000000000 +0200
 @@ -36,6 +36,10 @@
    Initial support for the OpenCL C language (http://www.khronos.org/opencl)
    has been integrated into GDB.
@@ -159,10 +159,10 @@ Index: gdb-7.2.90.20110525/gdb/NEWS
  * Python scripting
  
    ** The function gdb.Write now accepts an optional keyword 'stream'.
-Index: gdb-7.2.90.20110525/gdb/ada-lang.c
+Index: gdb-7.2.90.20110703/gdb/ada-lang.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/ada-lang.c	2011-05-17 23:26:08.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/ada-lang.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/ada-lang.c	2011-05-17 23:26:08.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/ada-lang.c	2011-07-03 10:33:11.000000000 +0200
 @@ -11421,6 +11421,7 @@ ada_operator_length (const struct expres
  
  static int
@@ -189,10 +189,10 @@ Index: gdb-7.2.90.20110525/gdb/ada-lang.c
        && (*objfile_func) (TYPE_OBJFILE (type), data))
      return 1;
  
-Index: gdb-7.2.90.20110525/gdb/amd64-linux-nat.c
+Index: gdb-7.2.90.20110703/gdb/amd64-linux-nat.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/amd64-linux-nat.c	2011-01-07 20:36:15.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/amd64-linux-nat.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/amd64-linux-nat.c	2011-01-07 20:36:15.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/amd64-linux-nat.c	2011-07-03 10:33:11.000000000 +0200
 @@ -265,18 +265,11 @@ amd64_linux_store_inferior_registers (st
  
  /* Support for debug registers.  */
@@ -411,10 +411,10 @@ Index: gdb-7.2.90.20110525/gdb/amd64-linux-nat.c
  }
  
  
-Index: gdb-7.2.90.20110525/gdb/ax-gdb.c
+Index: gdb-7.2.90.20110703/gdb/ax-gdb.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/ax-gdb.c	2011-02-24 08:39:47.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/ax-gdb.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/ax-gdb.c	2011-02-24 08:39:47.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/ax-gdb.c	2011-07-03 10:33:11.000000000 +0200
 @@ -2001,7 +2001,8 @@ gen_expr (struct expression *exp, union 
  
      case OP_INTERNALVAR:
@@ -434,10 +434,10 @@ Index: gdb-7.2.90.20110525/gdb/ax-gdb.c
  	  error (_("$%s is not a trace state variable; GDB agent "
  		   "expressions cannot use convenience variables."), name);
        }
-Index: gdb-7.2.90.20110525/gdb/block.c
+Index: gdb-7.2.90.20110703/gdb/block.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/block.c	2011-01-01 16:32:57.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/block.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/block.c	2011-01-01 16:32:57.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/block.c	2011-07-03 10:33:11.000000000 +0200
 @@ -322,3 +322,21 @@ allocate_block (struct obstack *obstack)
  
    return bl;
@@ -460,10 +460,10 @@ Index: gdb-7.2.90.20110525/gdb/block.c
 +
 +  return SYMBOL_SYMTAB (func)->objfile;
 +}
-Index: gdb-7.2.90.20110525/gdb/block.h
+Index: gdb-7.2.90.20110703/gdb/block.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/block.h	2011-01-01 16:32:57.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/block.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/block.h	2011-01-01 16:32:57.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/block.h	2011-07-03 10:33:11.000000000 +0200
 @@ -167,4 +167,6 @@ extern const struct block *block_global_
  
  extern struct block *allocate_block (struct obstack *obstack);
@@ -471,10 +471,10 @@ Index: gdb-7.2.90.20110525/gdb/block.h
 +extern struct objfile *block_objfile (const struct block *block);
 +
  #endif /* BLOCK_H */
-Index: gdb-7.2.90.20110525/gdb/breakpoint.c
+Index: gdb-7.2.90.20110703/gdb/breakpoint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/breakpoint.c	2011-05-17 23:25:56.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/breakpoint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/breakpoint.c	2011-07-02 21:33:09.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/breakpoint.c	2011-07-03 10:35:09.000000000 +0200
 @@ -63,6 +63,8 @@
  #include "jit.h"
  #include "xml-syscall.h"
@@ -708,7 +708,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
  
    /* Store the program space that was used to set the breakpoint, for
       breakpoint resetting.  */
-@@ -7057,6 +7172,7 @@ clone_momentary_breakpoint (struct break
+@@ -7056,6 +7171,7 @@ clone_momentary_breakpoint (struct break
    copy->loc->address = orig->loc->address;
    copy->loc->section = orig->loc->section;
    copy->loc->pspace = orig->loc->pspace;
@@ -716,7 +716,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
  
    if (orig->source_file == NULL)
      copy->source_file = NULL;
-@@ -7280,6 +7396,7 @@ add_location_to_breakpoint (struct break
+@@ -7279,6 +7395,7 @@ add_location_to_breakpoint (struct break
    loc->address = adjust_breakpoint_address (loc->gdbarch,
  					    loc->requested_address, b->type);
    loc->pspace = sal->pspace;
@@ -724,7 +724,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
    gdb_assert (loc->pspace != NULL);
    loc->section = sal->section;
  
-@@ -7629,6 +7746,16 @@ create_breakpoints_sal (struct gdbarch *
+@@ -7628,6 +7745,16 @@ create_breakpoints_sal (struct gdbarch *
  {
    int i;
  
@@ -741,7 +741,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
    for (i = 0; i < sals.nelts; ++i)
      {
        struct symtabs_and_lines expanded = 
-@@ -8154,7 +8281,7 @@ create_breakpoint (struct gdbarch *gdbar
+@@ -8148,7 +8275,7 @@ create_breakpoint (struct gdbarch *gdbar
          mention (b);
      }
    
@@ -750,7 +750,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
      {
        warning (_("Multiple breakpoints were set.\nUse the "
  		 "\"delete\" command to delete unwanted breakpoints."));
-@@ -9026,6 +9153,7 @@ watch_command_1 (char *arg, int accessfl
+@@ -9020,6 +9147,7 @@ watch_command_1 (char *arg, int accessfl
    b = set_raw_breakpoint_without_location (NULL, bp_type);
    set_breakpoint_number (internal, b);
    b->thread = thread;
@@ -758,7 +758,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
    b->disposition = disp_donttouch;
    b->exp = exp;
    b->exp_valid_block = exp_valid_block;
-@@ -10188,6 +10316,9 @@ update_global_location_list (int should_
+@@ -10182,6 +10310,9 @@ update_global_location_list (int should_
        int keep_in_target = 0;
        int removed = 0;
  
@@ -768,7 +768,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
        /* Skip LOCP entries which will definitely never be needed.
  	 Stop either at or being the one matching OLD_LOC.  */
        while (locp < bp_location + bp_location_count
-@@ -10952,12 +11083,14 @@ update_breakpoint_locations (struct brea
+@@ -10946,12 +11077,14 @@ update_breakpoint_locations (struct brea
     On return, FOUND will be 1 if any SaL was found, zero otherwise.  */
  
  static struct symtabs_and_lines
@@ -777,25 +777,24 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
 +		     int *pre_expanded)
  {
    char *s;
-   int marker_spec, not_found;
+   int marker_spec;
    struct symtabs_and_lines sals = {0};
    struct gdb_exception e;
 +  int my_pre_expanded = 0;
  
    s = addr_string;
    marker_spec = b->type == bp_static_tracepoint && is_marker_spec (s);
-@@ -10976,8 +11109,27 @@ addr_string_to_sals (struct breakpoint *
+@@ -10970,7 +11103,27 @@ addr_string_to_sals (struct breakpoint *
  	    error (_("marker %s not found"), b->static_trace_marker_id);
  	}
        else
--	sals = decode_line_1 (&s, 1, (struct symtab *) NULL, 0,
--			      NULL, &not_found);
+-	sals = decode_line_1 (&s, 1, (struct symtab *) NULL, 0, NULL);
 +	{
 +	  struct linespec_result canonical;
 +
 +	  init_linespec_result (&canonical);
 +	  sals = decode_line_1 (&s, 1, (struct symtab *) NULL, 0,
-+				&canonical, &not_found);
++				&canonical);
 +
 +	  /* We don't need the contents.  */
 +	  if (canonical.canonical)
@@ -814,16 +813,16 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
      }
    if (e.reason < 0)
      {
-@@ -11010,7 +11162,7 @@ addr_string_to_sals (struct breakpoint *
+@@ -11003,7 +11156,7 @@ addr_string_to_sals (struct breakpoint *
  
-   if (!not_found)
+   if (e.reason == 0 || e.error != NOT_FOUND_ERROR)
      {
 -      gdb_assert (sals.nelts == 1);
 +      gdb_assert (my_pre_expanded || sals.nelts == 1);
  
        resolve_sal_pc (&sals.sals[0]);
        if (b->condition_not_parsed && s && s[0])
-@@ -11049,22 +11201,27 @@ re_set_breakpoint (struct breakpoint *b)
+@@ -11044,22 +11197,27 @@ re_set_breakpoint (struct breakpoint *b)
    struct symtabs_and_lines expanded = {0};
    struct symtabs_and_lines expanded_end = {0};
    struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
@@ -854,7 +853,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
        if (found)
  	{
  	  make_cleanup (xfree, sals_end.sals);
-@@ -12501,6 +12658,24 @@ all_tracepoints (void)
+@@ -12496,6 +12654,24 @@ all_tracepoints (void)
    return tp_vec;
  }
  
@@ -879,7 +878,7 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
  
  /* This help string is used for the break, hbreak, tbreak and thbreak
     commands.  It is defined as a macro to prevent duplication.
-@@ -13136,4 +13311,7 @@ range (including START-LOCATION and END-
+@@ -13131,4 +13307,7 @@ range (including START-LOCATION and END-
    automatic_hardware_breakpoints = 1;
  
    observer_attach_about_to_proceed (breakpoint_about_to_proceed);
@@ -887,10 +886,10 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.c
 +  observer_attach_mark_used (breakpoint_types_mark_used);
 +#endif
  }
-Index: gdb-7.2.90.20110525/gdb/breakpoint.h
+Index: gdb-7.2.90.20110703/gdb/breakpoint.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/breakpoint.h	2011-05-17 23:25:56.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/breakpoint.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/breakpoint.h	2011-05-17 23:25:56.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/breakpoint.h	2011-07-03 10:33:11.000000000 +0200
 @@ -363,6 +363,11 @@ struct bp_location
       processor's architectual constraints.  */
    CORE_ADDR requested_address;
@@ -915,10 +914,10 @@ Index: gdb-7.2.90.20110525/gdb/breakpoint.h
 +extern void modify_semaphore (struct bp_location *location, int set);
 +
  #endif /* !defined (BREAKPOINT_H) */
-Index: gdb-7.2.90.20110525/gdb/c-typeprint.c
+Index: gdb-7.2.90.20110703/gdb/c-typeprint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/c-typeprint.c	2011-03-22 18:35:22.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/c-typeprint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/c-typeprint.c	2011-03-22 18:35:22.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/c-typeprint.c	2011-07-03 10:33:11.000000000 +0200
 @@ -625,9 +625,14 @@ c_type_print_varspec_suffix (struct type
  	  fprintf_filtered (stream, ")");
  
@@ -937,10 +936,10 @@ Index: gdb-7.2.90.20110525/gdb/c-typeprint.c
  	fprintf_filtered (stream, "]");
  
  	c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream,
-Index: gdb-7.2.90.20110525/gdb/cli/cli-utils.c
+Index: gdb-7.2.90.20110703/gdb/cli/cli-utils.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/cli/cli-utils.c	2011-03-16 22:12:12.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/cli/cli-utils.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/cli/cli-utils.c	2011-03-16 22:12:12.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/cli/cli-utils.c	2011-07-03 10:33:11.000000000 +0200
 @@ -245,3 +245,32 @@ remove_trailing_whitespace (const char *
  
    return s;
@@ -974,10 +973,10 @@ Index: gdb-7.2.90.20110525/gdb/cli/cli-utils.c
 +
 +  return copy;
 +}
-Index: gdb-7.2.90.20110525/gdb/cli/cli-utils.h
+Index: gdb-7.2.90.20110703/gdb/cli/cli-utils.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/cli/cli-utils.h	2011-03-16 22:12:12.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/cli/cli-utils.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/cli/cli-utils.h	2011-03-16 22:12:12.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/cli/cli-utils.h	2011-07-03 10:33:11.000000000 +0200
 @@ -103,4 +103,11 @@ extern char *skip_to_space (char *inp);
     START.  */
  
@@ -990,10 +989,10 @@ Index: gdb-7.2.90.20110525/gdb/cli/cli-utils.h
 +extern char *extract_arg (char **arg);
 +
  #endif /* CLI_UTILS_H */
-Index: gdb-7.2.90.20110525/gdb/coffread.c
+Index: gdb-7.2.90.20110703/gdb/coffread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/coffread.c	2011-03-17 14:19:23.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/coffread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/coffread.c	2011-03-17 14:19:23.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/coffread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -2193,6 +2193,7 @@ static const struct sym_fns coff_sym_fns
  
    default_symfile_relocate,	/* sym_relocate: Relocate a debug
@@ -1002,10 +1001,10 @@ Index: gdb-7.2.90.20110525/gdb/coffread.c
    &psym_functions
  };
  
-Index: gdb-7.2.90.20110525/gdb/data-directory/Makefile.in
+Index: gdb-7.2.90.20110703/gdb/data-directory/Makefile.in
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/data-directory/Makefile.in	2011-02-04 19:34:41.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/data-directory/Makefile.in	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/data-directory/Makefile.in	2011-02-04 19:34:41.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/data-directory/Makefile.in	2011-07-03 10:33:11.000000000 +0200
 @@ -52,11 +52,23 @@ SYSCALLS_FILES = \
  PYTHON_DIR = python
  PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
@@ -1033,10 +1032,10 @@ Index: gdb-7.2.90.20110525/gdb/data-directory/Makefile.in
  
  FLAGS_TO_PASS = \
  	"prefix=$(prefix)" \
-Index: gdb-7.2.90.20110525/gdb/dbxread.c
+Index: gdb-7.2.90.20110703/gdb/dbxread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/dbxread.c	2011-03-23 19:23:54.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/dbxread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/dbxread.c	2011-03-23 19:23:54.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/dbxread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -1,6 +1,6 @@
  /* Read dbx symbol tables and convert to internal format, for GDB.
     Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
@@ -1053,10 +1052,10 @@ Index: gdb-7.2.90.20110525/gdb/dbxread.c
    &psym_functions
  };
  
-Index: gdb-7.2.90.20110525/gdb/defs.h
+Index: gdb-7.2.90.20110703/gdb/defs.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/defs.h	2011-03-31 16:32:48.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/defs.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/defs.h	2011-03-31 16:32:48.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/defs.h	2011-07-03 10:33:11.000000000 +0200
 @@ -398,6 +398,8 @@ extern struct cleanup *make_cleanup_rest
  extern struct cleanup *
    set_batch_flag_and_make_cleanup_restore_page_info (void);
@@ -1066,10 +1065,10 @@ Index: gdb-7.2.90.20110525/gdb/defs.h
  extern char *gdb_realpath (const char *);
  extern char *xfullpath (const char *);
  
-Index: gdb-7.2.90.20110525/gdb/doc/gdb.texinfo
+Index: gdb-7.2.90.20110703/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/doc/gdb.texinfo	2011-05-17 23:27:48.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/doc/gdb.texinfo	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/doc/gdb.texinfo	2011-07-02 21:59:29.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/doc/gdb.texinfo	2011-07-03 10:33:11.000000000 +0200
 @@ -1177,6 +1177,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.
@@ -1204,7 +1203,7 @@ Index: gdb-7.2.90.20110525/gdb/doc/gdb.texinfo
  @item $_sdata
  @vindex $_sdata@r{, collect}
  Collect static tracepoint marker specific data.  Only available for
-@@ -20710,8 +20802,6 @@ containing @code{end}.  For example:
+@@ -20720,8 +20812,6 @@ containing @code{end}.  For example:
  
  @smallexample
  (@value{GDBP}) python
@@ -1213,7 +1212,7 @@ Index: gdb-7.2.90.20110525/gdb/doc/gdb.texinfo
  >print 23
  >end
  23
-@@ -20724,6 +20814,14 @@ in a Python script.  This can be control
+@@ -20734,6 +20824,14 @@ in a Python script.  This can be control
  python print-stack}: if @code{on}, the default, then Python stack
  printing is enabled; if @code{off}, then Python stack printing is
  disabled.
@@ -1228,7 +1227,7 @@ Index: gdb-7.2.90.20110525/gdb/doc/gdb.texinfo
  @end table
  
  It is also possible to execute a Python script from the @value{GDBN}
-@@ -20745,6 +20843,14 @@ and thus is always available.
+@@ -20755,6 +20853,14 @@ and thus is always available.
  @cindex python api
  @cindex programming in python
  
@@ -1243,10 +1242,10 @@ Index: gdb-7.2.90.20110525/gdb/doc/gdb.texinfo
  @cindex python stdout
  @cindex python pagination
  At startup, @value{GDBN} overrides Python's @code{sys.stdout} and
-Index: gdb-7.2.90.20110525/gdb/doc/gdbint.texinfo
+Index: gdb-7.2.90.20110703/gdb/doc/gdbint.texinfo
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/doc/gdbint.texinfo	2011-02-04 20:10:12.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/doc/gdbint.texinfo	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/doc/gdbint.texinfo	2011-02-04 20:10:12.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/doc/gdbint.texinfo	2011-07-03 10:33:11.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.
@@ -1372,10 +1371,10 @@ Index: gdb-7.2.90.20110525/gdb/doc/gdbint.texinfo
  
  
  @node Language Support
-Index: gdb-7.2.90.20110525/gdb/doc/observer.texi
+Index: gdb-7.2.90.20110703/gdb/doc/observer.texi
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/doc/observer.texi	2011-01-05 06:09:54.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/doc/observer.texi	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/doc/observer.texi	2011-01-05 06:09:54.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/doc/observer.texi	2011-07-03 10:33:11.000000000 +0200
 @@ -223,6 +223,11 @@ Bytes from @var{data} to @var{data} + @v
  to the current inferior at @var{addr}.
  @end deftypefun
@@ -1388,10 +1387,10 @@ Index: gdb-7.2.90.20110525/gdb/doc/observer.texi
  @deftypefun void test_notification (int @var{somearg})
  This observer is used for internal testing.  Do not use.  
  See testsuite/gdb.gdb/observer.exp.
-Index: gdb-7.2.90.20110525/gdb/dwarf2expr.c
+Index: gdb-7.2.90.20110703/gdb/dwarf2expr.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/dwarf2expr.c	2011-05-13 20:54:47.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/dwarf2expr.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/dwarf2expr.c	2011-05-13 20:54:47.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/dwarf2expr.c	2011-07-03 10:33:11.000000000 +0200
 @@ -912,6 +912,13 @@ execute_stack_op (struct dwarf_expr_cont
  	  ctx->num_pieces = 0;
  	  goto abort_expression;
@@ -1406,10 +1405,10 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2expr.c
  	default:
  	  error (_("Unhandled dwarf expression opcode 0x%x"), op);
  	}
-Index: gdb-7.2.90.20110525/gdb/dwarf2expr.h
+Index: gdb-7.2.90.20110703/gdb/dwarf2expr.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/dwarf2expr.h	2011-02-27 17:25:37.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/dwarf2expr.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/dwarf2expr.h	2011-02-27 17:25:37.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/dwarf2expr.h	2011-07-03 10:33:11.000000000 +0200
 @@ -114,9 +114,15 @@ struct dwarf_expr_context
  #if 0
    /* Not yet implemented.  */
@@ -1427,10 +1426,10 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2expr.h
  
    /* The current depth of dwarf expression recursion, via DW_OP_call*,
       DW_OP_fbreg, DW_OP_push_object_address, etc., and the maximum
-Index: gdb-7.2.90.20110525/gdb/dwarf2loc.c
+Index: gdb-7.2.90.20110703/gdb/dwarf2loc.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/dwarf2loc.c	2011-03-22 22:06:33.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/dwarf2loc.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/dwarf2loc.c	2011-03-22 22:06:33.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/dwarf2loc.c	2011-07-03 10:33:11.000000000 +0200
 @@ -134,6 +134,9 @@ struct dwarf_expr_baton
  {
    struct frame_info *frame;
@@ -1784,10 +1783,10 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2loc.c
 +  missing_describe_location,
 +  missing_tracepoint_var_ref
 +};
-Index: gdb-7.2.90.20110525/gdb/dwarf2loc.h
+Index: gdb-7.2.90.20110703/gdb/dwarf2loc.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/dwarf2loc.h	2011-02-17 17:20:44.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/dwarf2loc.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/dwarf2loc.h	2011-02-17 17:20:44.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/dwarf2loc.h	2011-07-03 10:33:11.000000000 +0200
 @@ -107,6 +107,15 @@ struct dwarf2_loclist_baton
  
  extern const struct symbol_computed_ops dwarf2_locexpr_funcs;
@@ -1804,11 +1803,11 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2loc.h
  
  /* Compile a DWARF location expression to an agent expression.
     
-Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
+Index: gdb-7.2.90.20110703/gdb/dwarf2read.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/dwarf2read.c	2011-05-17 23:26:39.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/dwarf2read.c	2011-05-25 17:06:06.000000000 +0200
-@@ -1219,6 +1219,9 @@ static void fill_in_loclist_baton (struc
+--- gdb-7.2.90.20110703.orig/gdb/dwarf2read.c	2011-07-02 21:59:29.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/dwarf2read.c	2011-07-03 10:33:11.000000000 +0200
+@@ -1222,6 +1222,9 @@ static void fill_in_loclist_baton (struc
  				   struct dwarf2_loclist_baton *baton,
  				   struct attribute *attr);
  
@@ -1818,7 +1817,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  static void dwarf2_symbol_mark_computed (struct attribute *attr,
  					 struct symbol *sym,
  					 struct dwarf2_cu *cu);
-@@ -1253,6 +1256,9 @@ static void age_cached_comp_units (void)
+@@ -1256,6 +1259,9 @@ static void age_cached_comp_units (void)
  
  static void free_one_cached_comp_unit (void *);
  
@@ -1828,7 +1827,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  static struct type *set_die_type (struct die_info *, struct type *,
  				  struct dwarf2_cu *);
  
-@@ -1277,6 +1283,9 @@ static struct type *get_die_type_at_offs
+@@ -1280,6 +1286,9 @@ static struct type *get_die_type_at_offs
  
  static struct type *get_die_type (struct die_info *die, struct dwarf2_cu *cu);
  
@@ -1838,7 +1837,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  static void dwarf2_release_queue (void *dummy);
  
  static void queue_comp_unit (struct dwarf2_per_cu_data *per_cu,
-@@ -7455,6 +7464,29 @@ process_enumeration_scope (struct die_in
+@@ -7542,6 +7551,29 @@ process_enumeration_scope (struct die_in
    new_symbol (die, this_type, cu);
  }
  
@@ -1868,7 +1867,7 @@ Index: gdb-7.2.90.20110525/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.  */
-@@ -7468,7 +7500,7 @@ read_array_type (struct die_info *die, s
+@@ -7555,7 +7587,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;
@@ -1877,7 +1876,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
    struct cleanup *back_to;
    char *name;
  
-@@ -7521,17 +7553,19 @@ read_array_type (struct die_info *die, s
+@@ -7608,17 +7640,19 @@ read_array_type (struct die_info *die, s
    type = element_type;
  
    if (read_array_order (die, cu) == DW_ORD_col_major)
@@ -1908,7 +1907,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  
    /* Understand Dwarf2 support for vector types (like they occur on
       the PowerPC w/ AltiVec).  Gcc just adds another attribute to the
-@@ -8015,29 +8049,114 @@ read_tag_string_type (struct die_info *d
+@@ -8102,29 +8136,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;
@@ -2036,7 +2035,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
    char_type = language_string_char_type (cu->language_defn, gdbarch);
    type = create_string_type (NULL, char_type, range_type);
  
-@@ -8322,8 +8441,7 @@ read_subrange_type (struct die_info *die
+@@ -8409,8 +8528,7 @@ read_subrange_type (struct die_info *die
    struct type *base_type;
    struct type *range_type;
    struct attribute *attr;
@@ -2046,30 +2045,18 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
    char *name;
    LONGEST negative_mask;
  
-@@ -8336,53 +8454,126 @@ read_subrange_type (struct die_info *die
+@@ -8423,53 +8541,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;
- 
--  /* FIXME: For variable sized arrays either of these could be
--     a variable rather than a constant value.  We'll allow it,
--     but we don't know how to handle it.  */
--  attr = dwarf2_attr (die, DW_AT_lower_bound, cu);
--  if (attr)
--    low = dwarf2_get_attr_constant_value (attr, 0);
++
 +  negative_mask = 
 +    (LONGEST) -1 << (TYPE_LENGTH (base_type) * TARGET_CHAR_BIT - 1);
- 
--  attr = dwarf2_attr (die, DW_AT_upper_bound, cu);
--  if (attr)
++
 +  /* 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
@@ -2078,6 +2065,44 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
 +  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,
+-     but we don't know how to handle it.  */
+-  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);
+ 
+-  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
+     {
 -      if (attr->form == DW_FORM_block1 || is_ref_attr (attr))
 -        {
 -          /* GCC encodes arrays with unspecified or dynamic length
@@ -2093,44 +2118,11 @@ Index: gdb-7.2.90.20110525/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
- 	{
--	  int count = dwarf2_get_attr_constant_value (attr, 1);
--	  high = low + count - 1;
+       else
+-        high = dwarf2_get_attr_constant_value (attr, 1);
++	{
 +	  if (cu->language == language_fortran)
 +	    {
 +	      /* FORTRAN implies a lower bound of 1, if not given.  */
@@ -2142,25 +2134,30 @@ Index: gdb-7.2.90.20110525/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);
+     {
+       attr = dwarf2_attr (die, DW_AT_count, cu);
+-      if (attr)
+-	{
+-	  int count = dwarf2_get_attr_constant_value (attr, 1);
+-	  high = low + count - 1;
 +      /* 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.  */
 +    }
 +
@@ -2208,7 +2205,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
      }
  
    /* Dwarf-2 specifications explicitly allows to create subrange types
-@@ -8423,24 +8614,41 @@ read_subrange_type (struct die_info *die
+@@ -8510,24 +8701,41 @@ read_subrange_type (struct die_info *die
  	}
      }
  
@@ -2268,7 +2265,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  
    name = dwarf2_name (die, cu);
    if (name)
-@@ -10985,10 +11193,12 @@ var_decode_location (struct attribute *a
+@@ -11072,10 +11280,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
@@ -2283,7 +2280,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  
    if (SYMBOL_COMPUTED_OPS (sym) == &dwarf2_loclist_funcs)
      cu->has_loclist = 1;
-@@ -11029,6 +11239,8 @@ new_symbol_full (struct die_info *die, s
+@@ -11116,6 +11326,8 @@ new_symbol_full (struct die_info *die, s
        else
  	sym = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct symbol);
        OBJSTAT (objfile, n_syms++);
@@ -2292,7 +2289,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  
        /* Cache this symbol's name and the name's demangled form (if any).  */
        SYMBOL_SET_LANGUAGE (sym, cu->language);
-@@ -11801,6 +12013,9 @@ read_type_die_1 (struct die_info *die, s
+@@ -11888,6 +12100,9 @@ read_type_die_1 (struct die_info *die, s
        break;
      }
  
@@ -2302,7 +2299,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
    return this_type;
  }
  
-@@ -14655,61 +14870,99 @@ fill_in_loclist_baton (struct dwarf2_cu 
+@@ -14742,61 +14957,99 @@ fill_in_loclist_baton (struct dwarf2_cu 
    baton->base_address = cu->base_address;
  }
  
@@ -2349,7 +2346,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
 +
 +  return baton;
 +}
-+
+ 
 +static struct dwarf2_loclist_baton *
 +dwarf2_attr_to_loclist_baton (struct attribute *attr, struct dwarf2_cu *cu)
 +{
@@ -2362,7 +2359,7 @@ Index: gdb-7.2.90.20110525/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
@@ -2445,7 +2442,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
      }
  }
  
-@@ -15058,6 +15311,25 @@ offset_and_type_eq (const void *item_lhs
+@@ -15145,6 +15398,25 @@ offset_and_type_eq (const void *item_lhs
    return ofs_lhs->offset == ofs_rhs->offset;
  }
  
@@ -2471,7 +2468,7 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
  /* Set the type associated with DIE to TYPE.  Save it in CU's hash
     table if necessary.  For convenience, return TYPE.
  
-@@ -15083,6 +15355,8 @@ set_die_type (struct die_info *die, stru
+@@ -15170,6 +15442,8 @@ set_die_type (struct die_info *die, stru
    struct objfile *objfile = cu->objfile;
    htab_t *type_hash_ptr;
  
@@ -2480,10 +2477,10 @@ Index: gdb-7.2.90.20110525/gdb/dwarf2read.c
    /* For Ada types, make sure that the gnat-specific data is always
       initialized (if not already set).  There are a few types where
       we should not be doing so, because the type-specific area is
-Index: gdb-7.2.90.20110525/gdb/elfread.c
+Index: gdb-7.2.90.20110703/gdb/elfread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/elfread.c	2011-05-03 18:25:20.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/elfread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/elfread.c	2011-05-03 18:25:20.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/elfread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -43,6 +43,12 @@
  #include "infcall.h"
  #include "gdbthread.h"
@@ -2819,10 +2816,10 @@ Index: gdb-7.2.90.20110525/gdb/elfread.c
    add_symtab_fns (&elf_sym_fns);
  
    elf_objfile_gnu_ifunc_cache_data = register_objfile_data ();
-Index: gdb-7.2.90.20110525/gdb/eval.c
+Index: gdb-7.2.90.20110703/gdb/eval.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/eval.c	2011-03-28 22:21:03.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/eval.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/eval.c	2011-03-28 22:21:03.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/eval.c	2011-07-03 10:33:11.000000000 +0200
 @@ -44,6 +44,7 @@
  #include "objfiles.h"
  #include "python/python.h"
@@ -3307,10 +3304,10 @@ Index: gdb-7.2.90.20110525/gdb/eval.c
 -  return ndimen;
 +
  }
-Index: gdb-7.2.90.20110525/gdb/f-exp.y
+Index: gdb-7.2.90.20110703/gdb/f-exp.y
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/f-exp.y	2011-03-18 14:51:41.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/f-exp.y	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/f-exp.y	2011-03-18 14:51:41.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/f-exp.y	2011-07-03 10:33:11.000000000 +0200
 @@ -293,7 +293,9 @@ arglist :	subrange
  			{ arglist_len = 1; }
  	;
@@ -3322,10 +3319,10 @@ Index: gdb-7.2.90.20110525/gdb/f-exp.y
  			{ arglist_len++; }
  	;
  
-Index: gdb-7.2.90.20110525/gdb/f-lang.h
+Index: gdb-7.2.90.20110703/gdb/f-lang.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/f-lang.h	2011-01-07 20:36:16.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/f-lang.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/f-lang.h	2011-01-07 20:36:16.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/f-lang.h	2011-07-03 10:33:11.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);
@@ -3337,10 +3334,10 @@ Index: gdb-7.2.90.20110525/gdb/f-lang.h
  extern int f_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
  			struct ui_file *, int,
  			const struct value *,
-Index: gdb-7.2.90.20110525/gdb/f-typeprint.c
+Index: gdb-7.2.90.20110703/gdb/f-typeprint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/f-typeprint.c	2011-01-07 20:36:16.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/f-typeprint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/f-typeprint.c	2011-01-07 20:36:16.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/f-typeprint.c	2011-07-03 10:33:11.000000000 +0200
 @@ -32,7 +32,7 @@
  #include "gdbcore.h"
  #include "target.h"
@@ -3405,10 +3402,10 @@ Index: gdb-7.2.90.20110525/gdb/f-typeprint.c
    switch (TYPE_CODE (type))
      {
      case TYPE_CODE_ARRAY:
-Index: gdb-7.2.90.20110525/gdb/f-valprint.c
+Index: gdb-7.2.90.20110703/gdb/f-valprint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/f-valprint.c	2011-02-07 18:49:32.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/f-valprint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/f-valprint.c	2011-02-07 18:49:32.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/f-valprint.c	2011-07-03 10:33:11.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.  */
@@ -3544,10 +3541,10 @@ Index: gdb-7.2.90.20110525/gdb/f-valprint.c
    CHECK_TYPEDEF (type);
    switch (TYPE_CODE (type))
      {
-Index: gdb-7.2.90.20110525/gdb/findvar.c
+Index: gdb-7.2.90.20110703/gdb/findvar.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/findvar.c	2011-03-18 19:42:41.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/findvar.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/findvar.c	2011-03-18 19:42:41.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/findvar.c	2011-07-03 10:33:11.000000000 +0200
 @@ -35,6 +35,7 @@
  #include "user-regs.h"
  #include "block.h"
@@ -3693,10 +3690,10 @@ Index: gdb-7.2.90.20110525/gdb/findvar.c
  				      value_contents_raw (v), &optim,
  				      &unavail);
      }
-Index: gdb-7.2.90.20110525/gdb/gdbinit.in
+Index: gdb-7.2.90.20110703/gdb/gdbinit.in
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/gdbinit.in	2009-10-05 15:46:52.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/gdbinit.in	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/gdbinit.in	2009-10-05 15:46:52.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/gdbinit.in	2011-07-03 10:33:11.000000000 +0200
 @@ -1,5 +1,15 @@
  echo Setting up the environment for debugging gdb.\n
  
@@ -3713,10 +3710,10 @@ Index: gdb-7.2.90.20110525/gdb/gdbinit.in
  set complaints 1
  
  b internal_error
-Index: gdb-7.2.90.20110525/gdb/gdbtypes.c
+Index: gdb-7.2.90.20110703/gdb/gdbtypes.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/gdbtypes.c	2011-03-28 22:21:03.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/gdbtypes.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/gdbtypes.c	2011-03-28 22:21:03.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/gdbtypes.c	2011-07-03 10:33:11.000000000 +0200
 @@ -39,6 +39,9 @@
  #include "cp-abi.h"
  #include "gdb_assert.h"
@@ -4627,10 +4624,10 @@ Index: gdb-7.2.90.20110525/gdb/gdbtypes.c
    objfile_type_data = register_objfile_data ();
  
    add_setshow_zinteger_cmd ("overload", no_class, &overload_debug,
-Index: gdb-7.2.90.20110525/gdb/gdbtypes.h
+Index: gdb-7.2.90.20110703/gdb/gdbtypes.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/gdbtypes.h	2011-03-28 22:21:03.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/gdbtypes.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/gdbtypes.h	2011-03-28 22:21:03.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/gdbtypes.h	2011-07-03 10:33:11.000000000 +0200
 @@ -215,6 +215,11 @@ enum type_instance_flag_value
  
  #define TYPE_TARGET_STUB(t)	(TYPE_MAIN_TYPE (t)->flag_target_stub)
@@ -4865,10 +4862,10 @@ Index: gdb-7.2.90.20110525/gdb/gdbtypes.h
 +#endif
 +
  #endif /* GDBTYPES_H */
-Index: gdb-7.2.90.20110525/gdb/i386-linux-nat.c
+Index: gdb-7.2.90.20110703/gdb/i386-linux-nat.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/i386-linux-nat.c	2011-02-27 17:25:37.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/i386-linux-nat.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/i386-linux-nat.c	2011-02-27 17:25:37.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/i386-linux-nat.c	2011-07-03 10:33:11.000000000 +0200
 @@ -649,22 +649,13 @@ i386_linux_store_inferior_registers (str
  }
  
@@ -5073,10 +5070,10 @@ Index: gdb-7.2.90.20110525/gdb/i386-linux-nat.c
  }
  
  
-Index: gdb-7.2.90.20110525/gdb/i386-nat.c
+Index: gdb-7.2.90.20110703/gdb/i386-nat.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/i386-nat.c	2011-02-26 23:04:51.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/i386-nat.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/i386-nat.c	2011-02-26 23:04:51.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/i386-nat.c	2011-07-03 10:33:11.000000000 +0200
 @@ -25,6 +25,7 @@
  #include "gdbcmd.h"
  #include "target.h"
@@ -5428,10 +5425,10 @@ Index: gdb-7.2.90.20110525/gdb/i386-nat.c
  }
  
  void
-Index: gdb-7.2.90.20110525/gdb/i386-nat.h
+Index: gdb-7.2.90.20110703/gdb/i386-nat.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/i386-nat.h	2011-01-09 04:08:56.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/i386-nat.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/i386-nat.h	2011-01-09 04:08:56.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/i386-nat.h	2011-07-03 10:33:11.000000000 +0200
 @@ -78,6 +78,28 @@ struct i386_dr_low_type 
  
  extern struct i386_dr_low_type i386_dr_low;
@@ -5461,10 +5458,10 @@ Index: gdb-7.2.90.20110525/gdb/i386-nat.h
  /* Use this function to set i386_dr_low debug_register_length field
     rather than setting it directly to check that the length is only
     set once.  It also enables the 'maint set/show show-debug-regs' 
-Index: gdb-7.2.90.20110525/gdb/infrun.c
+Index: gdb-7.2.90.20110703/gdb/infrun.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/infrun.c	2011-04-20 19:04:32.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/infrun.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/infrun.c	2011-06-03 17:32:13.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/infrun.c	2011-07-03 10:33:11.000000000 +0200
 @@ -54,6 +54,8 @@
  #include "inline-frame.h"
  #include "jit.h"
@@ -5483,7 +5480,7 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  
  static void stop_stepping (struct execution_control_state *ecs);
  static void prepare_to_wait (struct execution_control_state *ecs);
-@@ -4164,9 +4166,17 @@ process_event_stop_test:
+@@ -4169,9 +4171,17 @@ process_event_stop_test:
  
  	if (what.is_longjmp)
  	  {
@@ -5504,7 +5501,7 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  	      {
  		if (debug_infrun)
  		  fprintf_unfiltered (gdb_stdlog,
-@@ -4184,12 +4194,7 @@ process_event_stop_test:
+@@ -4189,12 +4199,7 @@ process_event_stop_test:
  	    insert_longjmp_resume_breakpoint (gdbarch, jmp_buf_pc);
  	  }
  	else
@@ -5518,7 +5515,7 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  	keep_going (ecs);
  	return;
  
-@@ -5263,15 +5268,65 @@ insert_exception_resume_breakpoint (stru
+@@ -5268,15 +5273,65 @@ insert_exception_resume_breakpoint (stru
      }
  }
  
@@ -5585,7 +5582,7 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  
    TRY_CATCH (e, RETURN_MASK_ERROR)
      {
-@@ -6253,7 +6308,8 @@ static struct lval_funcs siginfo_value_f
+@@ -6258,7 +6313,8 @@ static struct lval_funcs siginfo_value_f
     if there's no object available.  */
  
  static struct value *
@@ -5595,7 +5592,7 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  {
    if (target_has_stack
        && !ptid_equal (inferior_ptid, null_ptid)
-@@ -6821,6 +6877,15 @@ show_schedule_multiple (struct ui_file *
+@@ -6826,6 +6882,15 @@ show_schedule_multiple (struct ui_file *
  			    "of all processes is %s.\n"), value);
  }
  
@@ -5611,7 +5608,7 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  void
  _initialize_infrun (void)
  {
-@@ -7093,7 +7158,7 @@ Tells gdb whether to detach the child of
+@@ -7098,7 +7163,7 @@ Tells gdb whether to detach the child of
       value with a void typed value, and when we get here, gdbarch
       isn't initialized yet.  At this point, we're quite sure there
       isn't another convenience variable of the same name.  */
@@ -5620,10 +5617,10 @@ Index: gdb-7.2.90.20110525/gdb/infrun.c
  
    add_setshow_boolean_cmd ("observer", no_class,
  			   &observer_mode_1, _("\
-Index: gdb-7.2.90.20110525/gdb/linespec.c
+Index: gdb-7.2.90.20110703/gdb/linespec.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/linespec.c	2011-03-25 18:13:12.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/linespec.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/linespec.c	2011-07-02 22:13:08.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/linespec.c	2011-07-03 10:33:11.000000000 +0200
 @@ -43,6 +43,7 @@
  #include "arch-utils.h"
  #include <ctype.h>
@@ -5632,7 +5629,7 @@ Index: gdb-7.2.90.20110525/gdb/linespec.c
  
  /* We share this one with symtab.c, but it is not exported widely.  */
  
-@@ -762,6 +763,7 @@ keep_name_info (char *ptr)
+@@ -786,6 +787,7 @@ keep_name_info (char *p, int on_boundary
     PC returned is 0.
     FILE:FUNCTION -- likewise, but prefer functions in that file.
     *EXPR -- line in which address EXPR appears.
@@ -5640,7 +5637,7 @@ Index: gdb-7.2.90.20110525/gdb/linespec.c
  
     This may all be followed by an "if EXPR", which we ignore.
  
-@@ -837,6 +839,9 @@ decode_line_1 (char **argptr, int funfir
+@@ -854,6 +856,9 @@ decode_line_1 (char **argptr, int funfir
    if (**argptr == '*')
      return decode_indirect (argptr);
  
@@ -5650,10 +5647,10 @@ Index: gdb-7.2.90.20110525/gdb/linespec.c
    is_quoted = (strchr (get_gdb_completer_quote_characters (),
  		       **argptr) != NULL);
  
-Index: gdb-7.2.90.20110525/gdb/linespec.h
+Index: gdb-7.2.90.20110703/gdb/linespec.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/linespec.h	2011-03-24 20:47:17.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/linespec.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/linespec.h	2011-07-02 21:33:09.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/linespec.h	2011-07-03 10:33:11.000000000 +0200
 @@ -30,6 +30,10 @@ struct linespec_result
       display mechanism would do the wrong thing.  */
    int special_display;
@@ -5665,10 +5662,10 @@ Index: gdb-7.2.90.20110525/gdb/linespec.h
    /* If non-NULL, an array of canonical names for returned
       symtab_and_line objects.  The array has as many elements as the
       `nelts' field in the symtabs_and_line returned by decode_line_1.
-Index: gdb-7.2.90.20110525/gdb/linux-nat.c
+Index: gdb-7.2.90.20110703/gdb/linux-nat.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/linux-nat.c	2011-04-29 18:02:10.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/linux-nat.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/linux-nat.c	2011-04-29 18:02:10.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/linux-nat.c	2011-07-03 10:33:11.000000000 +0200
 @@ -1272,6 +1272,64 @@ iterate_over_lwps (ptid_t filter,
    return NULL;
  }
@@ -5734,10 +5731,10 @@ Index: gdb-7.2.90.20110525/gdb/linux-nat.c
  /* Update our internal state when changing from one checkpoint to
     another indicated by NEW_PTID.  We can only switch single-threaded
     applications, so we only create one new LWP, and the previous list
-Index: gdb-7.2.90.20110525/gdb/linux-nat.h
+Index: gdb-7.2.90.20110703/gdb/linux-nat.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/linux-nat.h	2011-01-05 23:22:49.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/linux-nat.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/linux-nat.h	2011-01-05 23:22:49.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/linux-nat.h	2011-07-03 10:33:11.000000000 +0200
 @@ -140,6 +140,11 @@ struct lwp_info *iterate_over_lwps (ptid
  						     void *), 
  				    void *data);
@@ -5750,10 +5747,10 @@ Index: gdb-7.2.90.20110525/gdb/linux-nat.h
  /* Create a prototype generic GNU/Linux target.  The client can
     override it with local methods.  */
  struct target_ops * linux_target (void);
-Index: gdb-7.2.90.20110525/gdb/machoread.c
+Index: gdb-7.2.90.20110703/gdb/machoread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/machoread.c	2011-03-07 17:17:29.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/machoread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/machoread.c	2011-03-07 17:17:29.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/machoread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -849,6 +849,7 @@ static const struct sym_fns macho_sym_fn
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
@@ -5762,10 +5759,10 @@ Index: gdb-7.2.90.20110525/gdb/machoread.c
    &psym_functions
  };
  
-Index: gdb-7.2.90.20110525/gdb/main.c
+Index: gdb-7.2.90.20110703/gdb/main.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/main.c	2011-03-07 19:34:31.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/main.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/main.c	2011-03-07 19:34:31.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/main.c	2011-07-03 10:33:11.000000000 +0200
 @@ -39,6 +39,7 @@
  
  #include "interps.h"
@@ -5913,10 +5910,10 @@ Index: gdb-7.2.90.20110525/gdb/main.c
    --quiet            Do not print version number on startup.\n\
    --readnow          Fully read symbol files on first access.\n\
  "), stream);
-Index: gdb-7.2.90.20110525/gdb/mi/mi-cmd-var.c
+Index: gdb-7.2.90.20110703/gdb/mi/mi-cmd-var.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/mi/mi-cmd-var.c	2011-01-12 22:09:39.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/mi/mi-cmd-var.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/mi/mi-cmd-var.c	2011-01-12 22:09:39.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/mi/mi-cmd-var.c	2011-07-03 10:33:11.000000000 +0200
 @@ -707,7 +707,6 @@ mi_cmd_var_update (char *command, char *
      }
    else
@@ -5925,10 +5922,10 @@ Index: gdb-7.2.90.20110525/gdb/mi/mi-cmd-var.c
        struct varobj *var = varobj_get_handle (name);
  
        varobj_update_one (var, print_values, 1 /* explicit */);
-Index: gdb-7.2.90.20110525/gdb/mipsread.c
+Index: gdb-7.2.90.20110703/gdb/mipsread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/mipsread.c	2011-03-07 17:17:29.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/mipsread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/mipsread.c	2011-03-07 17:17:29.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/mipsread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -402,6 +402,7 @@ static const struct sym_fns ecoff_sym_fn
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
@@ -5937,10 +5934,10 @@ Index: gdb-7.2.90.20110525/gdb/mipsread.c
    &psym_functions
  };
  
-Index: gdb-7.2.90.20110525/gdb/objfiles.c
+Index: gdb-7.2.90.20110703/gdb/objfiles.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/objfiles.c	2011-04-25 23:25:18.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/objfiles.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/objfiles.c	2011-04-25 23:25:18.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/objfiles.c	2011-07-03 10:33:11.000000000 +0200
 @@ -846,6 +846,11 @@ objfile_relocate1 (struct objfile *objfi
  				obj_section_addr (s));
      }
@@ -5953,10 +5950,10 @@ Index: gdb-7.2.90.20110525/gdb/objfiles.c
    /* Data changed.  */
    return 1;
  }
-Index: gdb-7.2.90.20110525/gdb/p-valprint.c
+Index: gdb-7.2.90.20110703/gdb/p-valprint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/p-valprint.c	2011-03-15 17:00:56.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/p-valprint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/p-valprint.c	2011-03-15 17:00:56.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/p-valprint.c	2011-07-03 10:33:11.000000000 +0200
 @@ -39,6 +39,7 @@
  #include "cp-abi.h"
  #include "cp-support.h"
@@ -6033,10 +6030,10 @@ Index: gdb-7.2.90.20110525/gdb/p-valprint.c
    return (0);
  }
  
-Index: gdb-7.2.90.20110525/gdb/parse.c
+Index: gdb-7.2.90.20110703/gdb/parse.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/parse.c	2011-03-28 22:21:03.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/parse.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/parse.c	2011-03-28 22:21:03.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/parse.c	2011-07-03 10:33:11.000000000 +0200
 @@ -1502,6 +1502,7 @@ parser_fprintf (FILE *x, const char *y, 
  
  int
@@ -6142,10 +6139,10 @@ Index: gdb-7.2.90.20110525/gdb/parse.c
  
  void
  _initialize_parse (void)
-Index: gdb-7.2.90.20110525/gdb/parser-defs.h
+Index: gdb-7.2.90.20110703/gdb/parser-defs.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/parser-defs.h	2011-01-10 21:38:49.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/parser-defs.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/parser-defs.h	2011-01-10 21:38:49.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/parser-defs.h	2011-07-03 10:33:11.000000000 +0200
 @@ -194,6 +194,8 @@ extern void operator_length_standard (co
  				      int *);
  
@@ -6174,10 +6171,10 @@ Index: gdb-7.2.90.20110525/gdb/parser-defs.h
 +#endif
 +
  #endif /* PARSER_DEFS_H */
-Index: gdb-7.2.90.20110525/gdb/ppc-linux-nat.c
+Index: gdb-7.2.90.20110703/gdb/ppc-linux-nat.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/ppc-linux-nat.c	2011-04-18 23:29:18.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/ppc-linux-nat.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/ppc-linux-nat.c	2011-04-18 23:29:18.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/ppc-linux-nat.c	2011-07-03 10:33:11.000000000 +0200
 @@ -1637,6 +1637,14 @@ booke_remove_point (struct ppc_hw_breakp
    hw_breaks[i].hw_break = NULL;
  }
@@ -6321,10 +6318,10 @@ Index: gdb-7.2.90.20110525/gdb/ppc-linux-nat.c
      }
  
    return ret;
-Index: gdb-7.2.90.20110525/gdb/printcmd.c
+Index: gdb-7.2.90.20110703/gdb/printcmd.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/printcmd.c	2011-03-22 15:39:40.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/printcmd.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/printcmd.c	2011-03-22 15:39:40.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/printcmd.c	2011-07-03 10:33:11.000000000 +0200
 @@ -975,6 +975,11 @@ print_command_1 (char *exp, int inspect,
    else
      val = access_value_history (0);
@@ -6371,10 +6368,10 @@ Index: gdb-7.2.90.20110525/gdb/printcmd.c
 +  observer_attach_mark_used (print_types_mark_used);
 +#endif
  }
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/FrameIterator.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/FrameIterator.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/FrameIterator.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/FrameIterator.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,33 @@
 +# Iterator over frames.
 +
@@ -6409,10 +6406,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/FrameIterator.py
 +            raise StopIteration
 +        self.frame = result.older ()
 +        return result
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/FrameWrapper.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/FrameWrapper.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/FrameWrapper.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/FrameWrapper.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,112 @@
 +# Wrapper API for frames.
 +
@@ -6526,10 +6523,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/FrameWrapper.py
 +
 +    def __getattr__ (self, name):
 +        return getattr (self.frame, name)
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/backtrace.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/backtrace.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/backtrace.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/backtrace.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,42 @@
 +# Filtering backtrace.
 +
@@ -6573,10 +6570,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/backtrace.py
 +        return iter
 +    return frame_filter (iter)
 +
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/alias.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/command/alias.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/command/alias.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/command/alias.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,59 @@
 +# Alias command.
 +
@@ -6637,10 +6634,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/alias.py
 +                             "This command is an alias for '%s'." % target)
 +
 +AliasCommand()
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/backtrace.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/command/backtrace.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/command/backtrace.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/command/backtrace.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,106 @@
 +# New backtrace command.
 +
@@ -6748,10 +6745,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/backtrace.py
 +            pair[1].describe (sys.stdout, full)
 +
 +FilteringBacktrace()
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/ignore_errors.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/command/ignore_errors.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/command/ignore_errors.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/command/ignore_errors.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,37 @@
 +# Ignore errors in user commands.
 +
@@ -6790,10 +6787,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/ignore_errors.py
 +            pass
 +
 +IgnoreErrorsCommand ()
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/pahole.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/command/pahole.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/command/pahole.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/command/pahole.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,75 @@
 +# pahole command for gdb
 +
@@ -6870,10 +6867,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/pahole.py
 +        self.pahole (type, 0, '')
 +
 +Pahole()
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/require.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/command/require.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/command/require.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/command/require.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,57 @@
 +# Demand-loading commands.
 +
@@ -6932,10 +6929,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/require.py
 +RequireCommand()
 +RequireSubcommand("command")
 +RequireSubcommand("function")
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/upto.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/command/upto.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/command/upto.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/command/upto.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,129 @@
 +# upto command.
 +
@@ -7066,16 +7063,16 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/command/upto.py
 +UptoSourceCommand ()
 +UptoObjectCommand ()
 +UptoWhereCommand ()
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/function/__init__.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/function/__init__.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/function/__init__.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/function/__init__.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1 @@
 +
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/function/caller_is.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/function/caller_is.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/function/caller_is.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/function/caller_is.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,58 @@
 +# Caller-is functions.
 +
@@ -7135,10 +7132,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/function/caller_is.py
 +
 +CallerIs()
 +CallerMatches()
-Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/function/in_scope.py
+Index: gdb-7.2.90.20110703/gdb/python/lib/gdb/function/in_scope.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/python/lib/gdb/function/in_scope.py	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/lib/gdb/function/in_scope.py	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,47 @@
 +# In-scope function.
 +
@@ -7187,10 +7184,10 @@ Index: gdb-7.2.90.20110525/gdb/python/lib/gdb/function/in_scope.py
 +	return wanted == found
 +
 +InScope ()
-Index: gdb-7.2.90.20110525/gdb/python/py-type.c
+Index: gdb-7.2.90.20110703/gdb/python/py-type.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/python/py-type.c	2011-01-26 21:53:45.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/python/py-type.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/python/py-type.c	2011-01-26 21:53:45.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/python/py-type.c	2011-07-03 10:33:11.000000000 +0200
 @@ -29,6 +29,8 @@
  #include "language.h"
  #include "vec.h"
@@ -7385,10 +7382,10 @@ Index: gdb-7.2.90.20110525/gdb/python/py-type.c
  }
  
  
-Index: gdb-7.2.90.20110525/gdb/python/py-value.c
+Index: gdb-7.2.90.20110703/gdb/python/py-value.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/python/py-value.c	2011-03-18 17:09:57.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/python/py-value.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/python/py-value.c	2011-03-18 17:09:57.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/python/py-value.c	2011-07-03 10:33:11.000000000 +0200
 @@ -28,6 +28,7 @@
  #include "infcall.h"
  #include "expression.h"
@@ -7428,10 +7425,10 @@ Index: gdb-7.2.90.20110525/gdb/python/py-value.c
  }
  
  
-Index: gdb-7.2.90.20110525/gdb/python/python.c
+Index: gdb-7.2.90.20110703/gdb/python/python.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/python/python.c	2011-03-18 09:44:47.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/python/python.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/python/python.c	2011-07-02 21:33:10.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/python/python.c	2011-07-03 10:33:11.000000000 +0200
 @@ -49,8 +49,11 @@ static int gdbpy_should_print_stack = 1;
  #include "linespec.h"
  #include "source.h"
@@ -7507,10 +7504,10 @@ Index: gdb-7.2.90.20110525/gdb/python/python.c
    { "parameter", gdbpy_parameter, METH_VARARGS,
      "Return a gdb parameter's value" },
  
-Index: gdb-7.2.90.20110525/gdb/python/python.h
+Index: gdb-7.2.90.20110703/gdb/python/python.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/python/python.h	2011-03-14 17:09:54.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/python/python.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/python/python.h	2011-03-14 17:09:54.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/python/python.h	2011-07-03 10:33:11.000000000 +0200
 @@ -32,6 +32,8 @@ void eval_python_from_control_command (s
  
  void source_python_script (FILE *stream, const char *file);
@@ -7520,10 +7517,10 @@ Index: gdb-7.2.90.20110525/gdb/python/python.h
  int apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
  			      int embedded_offset, CORE_ADDR address,
  			      struct ui_file *stream, int recurse,
-Index: gdb-7.2.90.20110525/gdb/somread.c
+Index: gdb-7.2.90.20110703/gdb/somread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/somread.c	2011-03-07 17:17:29.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/somread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/somread.c	2011-03-07 17:17:29.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/somread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -439,6 +439,7 @@ static const struct sym_fns som_sym_fns 
    default_symfile_segments,	/* Get segment information from a file.  */
    NULL,
@@ -7532,10 +7529,10 @@ Index: gdb-7.2.90.20110525/gdb/somread.c
    &psym_functions
  };
  
-Index: gdb-7.2.90.20110525/gdb/stack.c
+Index: gdb-7.2.90.20110703/gdb/stack.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/stack.c	2011-03-18 19:48:56.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/stack.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/stack.c	2011-03-18 19:48:56.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/stack.c	2011-07-03 10:33:11.000000000 +0200
 @@ -366,6 +366,7 @@ print_frame_args (struct symbol *func, s
  	        {
                    const struct language_defn *language;
@@ -7558,10 +7555,10 @@ Index: gdb-7.2.90.20110525/gdb/stack.c
  		  ui_out_field_stream (uiout, "value", stb);
  	        }
  	      else
-Index: gdb-7.2.90.20110525/gdb/stap-probe.c
+Index: gdb-7.2.90.20110703/gdb/stap-probe.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/stap-probe.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/stap-probe.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,2041 @@
 +/* SystemTap probe support for GDB.
 +
@@ -9604,10 +9601,10 @@ Index: gdb-7.2.90.20110525/gdb/stap-probe.c
 +  create_internalvar_type_lazy ("_probe_arg9", &probe_funcs,
 +				(void *) (uintptr_t) 9);
 +}
-Index: gdb-7.2.90.20110525/gdb/stap-probe.h
+Index: gdb-7.2.90.20110703/gdb/stap-probe.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/stap-probe.h	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/stap-probe.h	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,109 @@
 +/* SystemTap probe support for GDB.
 +
@@ -9718,10 +9715,10 @@ Index: gdb-7.2.90.20110525/gdb/stap-probe.h
 +					       int n);
 +
 +#endif /* !defined (STAP_PROBE_H) */
-Index: gdb-7.2.90.20110525/gdb/symfile.h
+Index: gdb-7.2.90.20110703/gdb/symfile.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/symfile.h	2011-04-25 23:25:18.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/symfile.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/symfile.h	2011-04-25 23:25:18.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/symfile.h	2011-07-03 10:33:11.000000000 +0200
 @@ -31,6 +31,11 @@ struct objfile;
  struct obj_section;
  struct obstack;
@@ -9798,10 +9795,10 @@ Index: gdb-7.2.90.20110525/gdb/symfile.h
    /* The "quick" (aka partial) symbol functions for this symbol
       reader.  */
    const struct quick_symbol_functions *qf;
-Index: gdb-7.2.90.20110525/gdb/symtab.c
+Index: gdb-7.2.90.20110703/gdb/symtab.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/symtab.c	2011-05-06 17:13:37.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/symtab.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/symtab.c	2011-07-02 22:03:43.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/symtab.c	2011-07-03 10:33:11.000000000 +0200
 @@ -770,6 +770,7 @@ init_sal (struct symtab_and_line *sal)
    sal->end = 0;
    sal->explicit_pc = 0;
@@ -9810,10 +9807,10 @@ Index: gdb-7.2.90.20110525/gdb/symtab.c
  }
  
  
-Index: gdb-7.2.90.20110525/gdb/symtab.h
+Index: gdb-7.2.90.20110703/gdb/symtab.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/symtab.h	2011-05-06 17:13:37.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/symtab.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/symtab.h	2011-05-06 17:13:37.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/symtab.h	2011-07-03 10:33:11.000000000 +0200
 @@ -1118,6 +1118,10 @@ struct symtab_and_line
    CORE_ADDR end;
    int explicit_pc;
@@ -9825,10 +9822,10 @@ Index: gdb-7.2.90.20110525/gdb/symtab.h
  };
  
  extern void init_sal (struct symtab_and_line *sal);
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,457 @@
 +	.file	"x86_64-vla-pointer.c"
 +	.section	.debug_abbrev,"",@progbits
@@ -10287,10 +10284,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer-foo.S
 +	.string	"GNU C 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.ident	"GCC: (GNU) 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.section	.note.GNU-stack,"",@progbits
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,43 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -10335,10 +10332,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer.c
 +}
 +
 +#endif
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,66 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -10406,10 +10403,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-pointer.exp
 +
 +gdb_test "whatis *array" "type = char \\\[78\\\]" "second: whatis *array"
 +gdb_test "ptype *array" "type = char \\\[78\\\]" "second: ptype *array"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,455 @@
 +	.file	"x86_64-vla-typedef.c"
 +	.section	.debug_abbrev,"",@progbits
@@ -10866,10 +10863,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 +	.string	"GNU C 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.ident	"GCC: (GNU) 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.section	.note.GNU-stack,"",@progbits
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,43 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -10914,10 +10911,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 +}
 +
 +#endif
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,64 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -10983,10 +10980,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 +gdb_test "whatis array" "type = array_t" "second: whatis array"
 +
 +gdb_test "ptype array" "type = char \\\[78\\\]" "second: ptype array"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/arrayidx.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/arrayidx.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.base/arrayidx.c	2011-01-01 16:33:40.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/arrayidx.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.base/arrayidx.c	2011-01-01 16:33:40.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/arrayidx.c	2011-07-03 10:33:11.000000000 +0200
 @@ -17,6 +17,13 @@
  
  int array[] = {1, 2, 3, 4};
@@ -11001,10 +10998,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/arrayidx.c
  int
  main (void)
  {
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/arrayidx.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/arrayidx.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.base/arrayidx.exp	2011-01-01 16:33:40.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/arrayidx.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.base/arrayidx.exp	2011-01-01 16:33:40.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/arrayidx.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -57,4 +57,12 @@ gdb_test "print array" \
           "\\{\\\[0\\\] = 1, \\\[1\\\] = 2, \\\[2\\\] = 3, \\\[3\\\] = 4\\}" \
           "Print array with array-indexes on"
@@ -11019,10 +11016,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/arrayidx.exp
 +	unsupported "$test (no GCC)"
 +    }
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/default.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/default.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.base/default.exp	2011-02-15 22:17:52.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/default.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.base/default.exp	2011-02-15 22:17:52.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/default.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -607,6 +607,17 @@ gdb_test_list_exact "show convenience" "
  	{$_sdata = void} \
  	{$_siginfo = void} \
@@ -11041,10 +11038,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/default.exp
      }
  
  #test show directories
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/internal-var-field-address.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/internal-var-field-address.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/internal-var-field-address.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/internal-var-field-address.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,20 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11066,10 +11063,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/internal-var-field-address.c
 +struct {
 +  int field;
 +} staticstruct = { 1 };
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/internal-var-field-address.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/internal-var-field-address.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/internal-var-field-address.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/internal-var-field-address.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,26 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -11097,10 +11094,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/internal-var-field-address.exp
 +
 +gdb_test {set $varstruct = staticstruct}
 +gdb_test {p $varstruct.field} " = 1"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/stap-probe.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/stap-probe.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/stap-probe.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/stap-probe.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,69 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11171,10 +11168,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/stap-probe.c
 +  m1();
 +  m2();
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/stap-probe.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/stap-probe.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/stap-probe.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/stap-probe.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,72 @@
 +# Copyright (C) 2011 Free Software Foundation, Inc.
 +
@@ -11248,10 +11245,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/stap-probe.exp
 +    return -1
 +}
 +stap_test "-DUSE_PROBES"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla-overflow.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla-overflow.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla-overflow.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla-overflow.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11283,10 +11280,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla-overflow.c
 +
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla-overflow.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla-overflow.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla-overflow.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla-overflow.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,109 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -11397,10 +11394,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla-overflow.exp
 +gdb_test "bt" "in \[^ \]*abort \\(.* in main \\(.*" "Backtrace after abort()"
 +
 +verbose -log "kb_found in bt after abort() = [expr [memory_v_pages_get] * $pagesize / 1024]"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,55 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11457,10 +11454,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla.c
 +  foo (78);
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.base/vla.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,62 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -11524,10 +11521,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.base/vla.exp
 +gdb_test "p temp1" " = '1' <repeats 78 times>" "second: print temp1"
 +gdb_test "p temp2" " = '2' <repeats 78 times>" "second: print temp2"
 +gdb_test "p temp3" " = '3' <repeats 48 times>" "second: print temp3"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.cp/nextoverthrow.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.cp/nextoverthrow.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-01-01 16:33:44.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-01-01 16:33:44.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.cp/nextoverthrow.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -53,6 +53,17 @@ gdb_test_multiple "print _Unwind_DebugHo
      }
  }
@@ -11546,10 +11543,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.cp/nextoverthrow.exp
      unsupported "nextoverthrow.exp could not find _Unwind_DebugHook"
      return -1
  }
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,246 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11797,10 +11794,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 +	.string		"char"
 +.Luint_str:
 +	.string		"unsigned int"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,54 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -11856,10 +11853,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 +
 +# The register contains unpredictable value - the array size.
 +gdb_test "ptype reg_string" {type = char \[-?[0-9]+\]}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,42 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -11903,10 +11900,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 +  func1 (1, 2);
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,79 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -11987,10 +11984,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 +gdb_test "step" \
 +         "func.* \\(.*\\) at .*" \
 +         "step"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,83 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -12075,10 +12072,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-locat
 +
 +	.byte		0x0			/* Terminator */
 +	.byte		0x0			/* Terminator */
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,37 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -12117,10 +12114,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-locat
 +clean_restart $binfile
 +
 +gdb_test "ptype struct some_struct" "type = struct some_struct {\[\r\n \t\]*void field;\[\r\n \t\]*}"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dwarf-stride.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,42 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -12164,10 +12161,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 +gdb_continue_to_breakpoint "break-here" ".*break-here.*"
 +gdb_test "p c40pt(1)" " = '0-hello.*"
 +gdb_test "p c40pt(2)" " = '1-hello.*"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dwarf-stride.f90
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,40 @@
 +! Copyright 2009 Free Software Foundation, Inc.
 +!
@@ -12209,10 +12206,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 +  print *, c40pt  ! break-here
 +
 +end program repro
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f90	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,24 @@
 +! Copyright 2010 Free Software Foundation, Inc.
 +!
@@ -12238,10 +12235,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame-stub.f9
 +  real :: dummy
 +  dummy = 1
 +end subroutine bar
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,37 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -12280,10 +12277,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame.exp
 +}
 +
 +gdb_test "bt" {foo \(string='hello'.*}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,36 @@
 +! Copyright 2010 Free Software Foundation, Inc.
 +!
@@ -12321,10 +12318,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic-other-frame.f90
 +  end interface
 +  call foo ('hello')
 +end
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,145 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -12471,10 +12468,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic.exp
 +gdb_test "p vart(3,8)" "\\$\[0-9\]* = 9"
 +# maps to foo::vary(1,3)
 +gdb_test "p vart(2,9)" "\\$\[0-9\]* = 10"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic.f90
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic.f90	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/dynamic.f90	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,98 @@
 +! Copyright 2007 Free Software Foundation, Inc.
 +!
@@ -12574,10 +12571,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/dynamic.f90
 +  if (x (1, 1) .ne. 8 .or. x (2, 2) .ne. 9 .or. x (1, 2) .ne. 4) call abort
 +  if (x (3, 1) .ne. 10) call abort
 +end
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/string.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/string.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/string.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/string.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,59 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -12638,10 +12635,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/string.exp
 +gdb_continue_to_breakpoint "var-finish"
 +gdb_test "p e" "\\$\[0-9\]* = 'e   '" "p e re-set"
 +gdb_test "p f" "\\$\[0-9\]* = \\(\\( 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\( 'f2  ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\( 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\)" "p *f re-set"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/string.f90
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/string.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/string.f90	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/string.f90	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,37 @@
 +! Copyright 2008 Free Software Foundation, Inc.
 +!
@@ -12680,10 +12677,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/string.f90
 +  h = 'h'
 +  call foo (g, h)
 +end
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/subrange.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/subrange.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/subrange.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/subrange.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,60 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +
@@ -12745,10 +12742,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/subrange.exp
 +delete_breakpoints
 +gdb_unload
 +gdb_test {p $a (3, 2:2)} { = \(23\)}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/subrange.f90
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/subrange.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/subrange.f90	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.fortran/subrange.f90	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,28 @@
 +! Copyright 2011 Free Software Foundation, Inc.
 +!
@@ -12778,10 +12775,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.fortran/subrange.f90
 +  ptr => a
 +  write (*,*) a                 ! break-static
 +end
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.gdb/selftest.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.gdb/selftest.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.gdb/selftest.exp	2011-05-25 17:04:21.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.gdb/selftest.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.gdb/selftest.exp	2011-07-03 10:33:07.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.gdb/selftest.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -92,6 +92,10 @@ proc do_steps_and_nexts {} {
  		set description "step over ttyarg initialization"
  		set command "step"
@@ -12793,10 +12790,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.gdb/selftest.exp
  	    -re ".*pre_stat_chain = make_command_stats_cleanup.*$gdb_prompt $" {
  		set description "next over make_command_stats_cleanup and everything it calls"
  		set command "next"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,26 @@
 +/* Copyright 2011 Free Software Foundation, Inc.
 +
@@ -12824,10 +12821,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 +
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,57 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +#
@@ -12886,10 +12883,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 +mi_create_varobj "vla" "vla" "create local variable vla"
 +
 +mi_gdb_test "-var-update *" "\\^done,changelist=.*" "-var-update *"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.multi/watchpoint-multi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.multi/watchpoint-multi.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,59 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -12950,10 +12947,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.c
 +  marker_exit2 ();
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.multi/watchpoint-multi.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.multi/watchpoint-multi.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,113 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -13046,7 +13043,7 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.exp
 +	setup_kfail breakpoints/12312 *-*-*
 +	pass $test
 +    }
-+    -re "Hardware access \\(read/write\\) watchpoint \[0-9\]+: c\r\n\r\nValue = 3\r\n(.* in )?__nptl_death_event .*\r\n$gdb_prompt $" {
++    -re "Hardware access \\(read/write\\) watchpoint \[0-9\]+: c\r\n\r\nValue = 3\r\n(.* in )?\\*?(__GI_)?__nptl_death_event .*\r\n$gdb_prompt $" {
 +	setup_kfail breakpoints/12312 *-*-*
 +	fail $test
 +    }
@@ -13062,16 +13059,16 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.multi/watchpoint-multi.exp
 +	setup_kfail breakpoints/12312 *-*-*
 +	pass $test
 +    }
-+    -re "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b\r\n\r\nValue = 2\r\n(.* in )?__nptl_death_event .*\r\n$gdb_prompt $" {
++    -re "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b\r\n\r\nValue = 2\r\n(.* in )?\\*?(__GI_)?__nptl_death_event .*\r\n$gdb_prompt $" {
 +	setup_kfail breakpoints/12312 *-*-*
 +	fail $test
 +    }
 +}
 +
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register-func.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.opt/array-from-register-func.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register-func.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.opt/array-from-register-func.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,22 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -13095,10 +13092,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register-func.c
 +{
 +  return arr[0];
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.opt/array-from-register.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.opt/array-from-register.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,28 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -13128,10 +13125,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register.c
 +
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.opt/array-from-register.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.opt/array-from-register.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,33 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +#
@@ -13166,10 +13163,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.opt/array-from-register.exp
 +# Seen regression:
 +# Address requested for identifier "arr" which is in register $rdi
 +gdb_test "p arr\[0\]" "\\$\[0-9\]+ = 42"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.pascal/arrays.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.pascal/arrays.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.pascal/arrays.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.pascal/arrays.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,104 @@
 +# Copyright 2008, 2009 Free Software Foundation, Inc.
 +#
@@ -13275,10 +13272,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.pascal/arrays.exp
 +}
 +gdb_test "print DynArrChar" ".* = 'abcdefghijklm'" "Print dynamic array of char"
 +
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.pascal/arrays.pas
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.pascal/arrays.pas
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.pascal/arrays.pas	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.pascal/arrays.pas	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,82 @@
 +{
 + Copyright 2008, 2009 Free Software Foundation, Inc.
@@ -13362,10 +13359,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.pascal/arrays.pas
 +  s := 'test'#0'string';
 +  writeln(s); { set breakpoint 2 here }
 +end.
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.python/py-frame.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.python/py-frame.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.python/py-frame.exp	2011-02-26 15:06:28.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.python/py-frame.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.python/py-frame.exp	2011-02-26 15:06:28.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.python/py-frame.exp	2011-07-03 10:33:11.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)"
@@ -13381,10 +13378,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.python/py-frame.exp
  gdb_test "python print 'result =', gdb.selected_frame () == f1" " = True" "test gdb.selected_frame"
 +
 +gdb_test "python print 'result =', f0.block ()" "<gdb.Block object at 0x\[\[:xdigit:\]\]+>" "test Frame.block"
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.python/py-value.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.python/py-value.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/gdb.python/py-value.exp	2011-01-01 16:33:49.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.python/py-value.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/gdb.python/py-value.exp	2011-01-01 16:33:49.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.python/py-value.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -318,6 +318,15 @@ proc test_value_after_death {} {
      "print value's type"
  }
@@ -13409,10 +13406,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.python/py-value.exp
  
  # The following test recompiles the binary to test either C or C++
  # values. 
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-child.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-child.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,127 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13541,10 +13538,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-child.c
 +  i = sigaction (SIGUSR1, &oldact, NULL);
 +  assert (i == 0);
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,174 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13720,10 +13717,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-mt.c
 +  mark_exit ();
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,74 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13799,10 +13796,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-parent.c
 +      marker ();
 +    }
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-st.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-st.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-st.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork-st.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,61 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -13865,10 +13862,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork-st.c
 +  mark_exit ();
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,149 @@
 +# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 +
@@ -14019,10 +14016,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork.exp
 +} else {
 +    untested "child"
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork.h
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork.h	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.threads/watchpoint-fork.h	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 +
@@ -14056,10 +14053,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.threads/watchpoint-fork.h
 +
 +extern void marker (void);
 +extern void forkoff (int nr);
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.trace/stap-trace.c
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.trace/stap-trace.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.trace/stap-trace.c	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.trace/stap-trace.c	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,71 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -14132,10 +14129,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.trace/stap-trace.c
 +
 +  return 0;
 +}
-Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.trace/stap-trace.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/gdb.trace/stap-trace.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.90.20110525/gdb/testsuite/gdb.trace/stap-trace.exp	2011-05-25 17:05:21.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/testsuite/gdb.trace/stap-trace.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -0,0 +1,129 @@
 +# Copyright 2011
 +# Free Software Foundation, Inc.
@@ -14266,10 +14263,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/gdb.trace/stap-trace.exp
 +
 +# Finished!
 +gdb_test "tfind none" ".*" ""
-Index: gdb-7.2.90.20110525/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/lib/gdb.exp	2011-03-25 14:08:11.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/lib/gdb.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/lib/gdb.exp	2011-03-25 14:08:11.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/lib/gdb.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -141,6 +141,11 @@ proc gdb_unload {} {
  	    send_gdb "y\n"
  	    exp_continue
@@ -14282,10 +14279,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/lib/gdb.exp
  	-re "Discard symbol table from .*y or n.*$" {
  	    send_gdb "y\n"
  	    exp_continue
-Index: gdb-7.2.90.20110525/gdb/testsuite/lib/pascal.exp
+Index: gdb-7.2.90.20110703/gdb/testsuite/lib/pascal.exp
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/testsuite/lib/pascal.exp	2011-01-01 16:33:52.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/testsuite/lib/pascal.exp	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/testsuite/lib/pascal.exp	2011-01-01 16:33:52.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/testsuite/lib/pascal.exp	2011-07-03 10:33:11.000000000 +0200
 @@ -37,6 +37,9 @@ proc pascal_init {} {
      global pascal_compiler_is_fpc
      global gpc_compiler
@@ -14317,10 +14314,10 @@ Index: gdb-7.2.90.20110525/gdb/testsuite/lib/pascal.exp
      }
      set pascal_init_done 1
  }   
-Index: gdb-7.2.90.20110525/gdb/thread.c
+Index: gdb-7.2.90.20110703/gdb/thread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/thread.c	2011-04-19 17:24:49.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/thread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/thread.c	2011-04-19 17:24:49.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/thread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -1438,7 +1438,8 @@ update_thread_list (void)
     no thread is selected, or no threads exist.  */
  
@@ -14354,10 +14351,10 @@ Index: gdb-7.2.90.20110525/gdb/thread.c
 -  create_internalvar_type_lazy ("_thread", thread_id_make_value);
 +  create_internalvar_type_lazy ("_thread", &thread_funcs, NULL);
  }
-Index: gdb-7.2.90.20110525/gdb/top.c
+Index: gdb-7.2.90.20110703/gdb/top.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/top.c	2011-03-12 23:59:24.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/top.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/top.c	2011-03-12 23:59:24.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/top.c	2011-07-03 10:33:11.000000000 +0200
 @@ -343,6 +343,9 @@ void
  prepare_execute_command (void)
  {
@@ -14368,10 +14365,10 @@ Index: gdb-7.2.90.20110525/gdb/top.c
  
    /* With multiple threads running while the one we're examining is
       stopped, the dcache can get stale without us being able to detect
-Index: gdb-7.2.90.20110525/gdb/tracepoint.c
+Index: gdb-7.2.90.20110703/gdb/tracepoint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/tracepoint.c	2011-05-20 16:37:42.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/tracepoint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/tracepoint.c	2011-07-02 21:33:10.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/tracepoint.c	2011-07-03 10:33:11.000000000 +0200
 @@ -1603,6 +1603,8 @@ start_tracing (void)
  
    for (ix = 0; VEC_iterate (breakpoint_p, tp_vec, ix, t); ix++)
@@ -14455,10 +14452,10 @@ Index: gdb-7.2.90.20110525/gdb/tracepoint.c
  
    traceframe_number = -1;
    tracepoint_number = -1;
-Index: gdb-7.2.90.20110525/gdb/typeprint.c
+Index: gdb-7.2.90.20110703/gdb/typeprint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/typeprint.c	2011-01-11 22:53:25.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/typeprint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/typeprint.c	2011-01-11 22:53:25.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/typeprint.c	2011-07-03 10:33:11.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "gdb_string.h"
  #include "exceptions.h"
@@ -14512,10 +14509,10 @@ Index: gdb-7.2.90.20110525/gdb/typeprint.c
  }
  
  static void
-Index: gdb-7.2.90.20110525/gdb/utils.c
+Index: gdb-7.2.90.20110703/gdb/utils.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/utils.c	2011-05-17 23:26:28.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/utils.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/utils.c	2011-05-17 23:26:28.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/utils.c	2011-07-03 10:33:11.000000000 +0200
 @@ -2243,6 +2243,36 @@ set_batch_flag_and_make_cleanup_restore_
    return back_to;
  }
@@ -14553,10 +14550,10 @@ Index: gdb-7.2.90.20110525/gdb/utils.c
  /* Set the screen size based on LINES_PER_PAGE and CHARS_PER_LINE.  */
  
  static void
-Index: gdb-7.2.90.20110525/gdb/valarith.c
+Index: gdb-7.2.90.20110703/gdb/valarith.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/valarith.c	2011-02-18 20:10:46.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/valarith.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/valarith.c	2011-02-18 20:10:46.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/valarith.c	2011-07-03 10:33:11.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));
@@ -14580,10 +14577,10 @@ Index: gdb-7.2.90.20110525/gdb/valarith.c
    return binop_types_user_defined_p (op, value_type (arg1), value_type (arg2));
  }
  
-Index: gdb-7.2.90.20110525/gdb/valops.c
+Index: gdb-7.2.90.20110703/gdb/valops.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/valops.c	2011-03-29 19:04:30.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/valops.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/valops.c	2011-03-29 19:04:30.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/valops.c	2011-07-03 10:33:11.000000000 +0200
 @@ -47,6 +47,7 @@
  #include "objfiles.h"
  #include "symtab.h"
@@ -14735,10 +14732,10 @@ Index: gdb-7.2.90.20110525/gdb/valops.c
    if (TYPE_CODE (array_type) == TYPE_CODE_BITSTRING)
      {
        int i;
-Index: gdb-7.2.90.20110525/gdb/valprint.c
+Index: gdb-7.2.90.20110703/gdb/valprint.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/valprint.c	2011-04-29 21:23:05.000000000 +0200
-+++ gdb-7.2.90.20110525/gdb/valprint.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/valprint.c	2011-04-29 21:23:05.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/valprint.c	2011-07-03 10:33:11.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "dfp.h"
  #include "python/python.h"
@@ -14808,10 +14805,10 @@ Index: gdb-7.2.90.20110525/gdb/valprint.c
  }
  
  /* Read LEN bytes of target memory at address MEMADDR, placing the
-Index: gdb-7.2.90.20110525/gdb/value.c
+Index: gdb-7.2.90.20110703/gdb/value.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/value.c	2011-02-27 21:57:15.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/value.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/value.c	2011-02-27 21:57:15.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/value.c	2011-07-03 10:33:11.000000000 +0200
 @@ -43,6 +43,7 @@
  #include "python/python.h"
  #include <ctype.h>
@@ -15087,10 +15084,10 @@ Index: gdb-7.2.90.20110525/gdb/value.c
 +  observer_attach_mark_used (value_types_mark_used);
 +#endif
  }
-Index: gdb-7.2.90.20110525/gdb/value.h
+Index: gdb-7.2.90.20110703/gdb/value.h
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/value.h	2011-03-04 21:07:22.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/value.h	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/value.h	2011-03-04 21:07:22.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/value.h	2011-07-03 10:33:11.000000000 +0200
 @@ -473,6 +473,10 @@ extern struct value *value_from_decfloat
  					  const gdb_byte *decbytes);
  extern struct value *value_from_history_ref (char *, char **);
@@ -15158,10 +15155,10 @@ Index: gdb-7.2.90.20110525/gdb/value.h
  
  extern struct internalvar *lookup_internalvar (const char *name);
  
-Index: gdb-7.2.90.20110525/gdb/windows-tdep.c
+Index: gdb-7.2.90.20110703/gdb/windows-tdep.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/windows-tdep.c	2011-01-12 02:23:29.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/windows-tdep.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/windows-tdep.c	2011-01-12 02:23:29.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/windows-tdep.c	2011-07-03 10:33:11.000000000 +0200
 @@ -268,7 +268,7 @@ static struct lval_funcs tlb_value_funcs
     if there's no object available.  */
  
@@ -15194,10 +15191,10 @@ Index: gdb-7.2.90.20110525/gdb/windows-tdep.c
 -  create_internalvar_type_lazy ("_tlb", tlb_make_value);
 +  create_internalvar_type_lazy ("_tlb", &tlb_funcs, NULL);
  }
-Index: gdb-7.2.90.20110525/gdb/xcoffread.c
+Index: gdb-7.2.90.20110703/gdb/xcoffread.c
 ===================================================================
---- gdb-7.2.90.20110525.orig/gdb/xcoffread.c	2011-03-07 17:17:29.000000000 +0100
-+++ gdb-7.2.90.20110525/gdb/xcoffread.c	2011-05-25 17:05:21.000000000 +0200
+--- gdb-7.2.90.20110703.orig/gdb/xcoffread.c	2011-03-07 17:17:29.000000000 +0100
++++ gdb-7.2.90.20110703/gdb/xcoffread.c	2011-07-03 10:33:11.000000000 +0200
 @@ -3090,6 +3090,7 @@ static const struct sym_fns xcoff_sym_fn
    default_symfile_segments,	/* Get segment information from a file.  */
    aix_process_linenos,
diff --git a/gdb-bz701131-readline62-1of3.patch b/gdb-bz701131-readline62-1of3.patch
index e93ebe3..58ba7bc 100644
--- a/gdb-bz701131-readline62-1of3.patch
+++ b/gdb-bz701131-readline62-1of3.patch
@@ -1,9 +1,11 @@
 archer-jankratochvil-readline62
 b13706abbee9646f4de522c0552ddd68d1a4f43a
 
---- a/gdb/config.in
-+++ b/gdb/config.in
-@@ -947,9 +947,6 @@
+Index: gdb-7.2.90.20110703/gdb/config.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/gdb/config.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/config.in	2011-07-03 10:41:21.000000000 +0200
+@@ -953,9 +953,6 @@
  /* Define to `int' if <sys/types.h> does not define. */
  #undef pid_t
  
@@ -13,9 +15,11 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* Define to the equivalent of the C99 'restrict' keyword, or to
     nothing if this is not supported.  Do not define if restrict is
     supported directly.  */
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -9743,39 +9743,6 @@ if test "$with_system_readline" = yes; then
+Index: gdb-7.2.90.20110703/gdb/configure
+===================================================================
+--- gdb-7.2.90.20110703.orig/gdb/configure	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/configure	2011-07-03 10:41:21.000000000 +0200
+@@ -10235,39 +10235,6 @@ if test "$with_system_readline" = yes; t
    READLINE_DEPS=
    READLINE_CFLAGS=
    READLINE_TEXI_INCFLAG=
@@ -55,9 +59,11 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  else
    READLINE='$(READLINE_DIR)/libreadline.a'
    READLINE_DEPS='$(READLINE)'
---- a/gdb/configure.ac
-+++ b/gdb/configure.ac
-@@ -539,21 +539,6 @@ if test "$with_system_readline" = yes; then
+Index: gdb-7.2.90.20110703/gdb/configure.ac
+===================================================================
+--- gdb-7.2.90.20110703.orig/gdb/configure.ac	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/configure.ac	2011-07-03 10:41:21.000000000 +0200
+@@ -732,21 +732,6 @@ if test "$with_system_readline" = yes; t
    READLINE_DEPS=
    READLINE_CFLAGS=
    READLINE_TEXI_INCFLAG=
@@ -79,9 +85,11 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  else
    READLINE='$(READLINE_DIR)/libreadline.a'
    READLINE_DEPS='$(READLINE)'
---- a/gdb/tui/tui-io.c
-+++ b/gdb/tui/tui-io.c
-@@ -133,7 +133,7 @@ static Function *tui_old_rl_getc_function;
+Index: gdb-7.2.90.20110703/gdb/tui/tui-io.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/gdb/tui/tui-io.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/gdb/tui/tui-io.c	2011-07-03 10:41:21.000000000 +0200
+@@ -133,7 +133,7 @@ static Function *tui_old_rl_getc_functio
  static VFunction *tui_old_rl_redisplay_function;
  static VFunction *tui_old_rl_prep_terminal;
  static VFunction *tui_old_rl_deprep_terminal;
@@ -90,7 +98,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* Readline output stream.
     Should be removed when readline is clean.  */
-@@ -506,8 +506,8 @@ tui_rl_display_match_list (char **matches, int len, int max)
+@@ -506,8 +506,8 @@ tui_rl_display_match_list (char **matche
  void
  tui_setup_io (int mode)
  {
@@ -125,8 +133,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        rl_already_prompted = 0;
  
        /* Save tty for SIGCONT.  */
---- a/readline/CHANGELOG
-+++ b/readline/CHANGELOG
+Index: gdb-7.2.90.20110703/readline/CHANGELOG
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/CHANGELOG	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/CHANGELOG	2011-07-03 10:41:21.000000000 +0200
 @@ -918,3 +918,178 @@ configure.in
  	- changed release status to `release'
  
@@ -306,8 +316,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +				   -----
 +{examples,shlib}/Makefile.in
 +	- Cygwin-based changes from Eric Blake <eblake@redhat.com>
---- a/readline/CHANGES
-+++ b/readline/CHANGES
+Index: gdb-7.2.90.20110703/readline/CHANGES
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/CHANGES	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/CHANGES	2011-07-03 10:41:21.000000000 +0200
 @@ -1,3 +1,320 @@
 +This document details the changes between this version, readline-6.2,
 +and the previous version, readline-6.1.
@@ -629,8 +641,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  This document details the changes between this version, readline-5.1,
  and the previous version, readline-5.0.
  
---- a/readline/COPYING
-+++ b/readline/COPYING
+Index: gdb-7.2.90.20110703/readline/COPYING
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/COPYING	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/COPYING	2011-07-03 10:41:21.000000000 +0200
 @@ -1,285 +1,626 @@
 -		    GNU GENERAL PUBLIC LICENSE
 -		       Version 2, June 1991
@@ -672,14 +686,15 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -this service if you wish), that you receive source code or can get it
 -if you want it, that you can change the software or use pieces of it
 -in new free programs; and that you know you can do these things.
-+them if you wish), that you receive source code or can get it if you
-+want it, that you can change the software or use pieces of it in new
-+free programs, and that you know you can do these things.
- 
+-
 -  To protect your rights, we need to make restrictions that forbid
 -anyone to deny you these rights or to ask you to surrender the rights.
 -These restrictions translate to certain responsibilities for you if you
 -distribute copies of the software, or if you modify it.
++them if you wish), that you receive source code or can get it if you
++want it, that you can change the software or use pieces of it in new
++free programs, and that you know you can do these things.
++
 +  To protect your rights, we need to prevent others from denying you
 +these rights or asking you to surrender the rights.  Therefore, you have
 +certain responsibilities if you distribute copies of the software, or if
@@ -1391,9 +1406,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -those countries, so that distribution is permitted only in or among
 -countries not thus excluded.  In such case, this License incorporates
 -the limitation as if written in the body of this License.
--
--  9. The Free Software Foundation may publish revised and/or new versions
--of the General Public License from time to time.  Such new versions will
 +excuse you from the conditions of this License.  If you cannot convey a
 +covered work so as to satisfy simultaneously your obligations under this
 +License and any other pertinent obligations, then as a consequence you may
@@ -1414,7 +1426,9 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +combination as such.
 +
 +  14. Revised Versions of this License.
-+
+ 
+-  9. The Free Software Foundation may publish revised and/or new versions
+-of the General Public License from time to time.  Such new versions will
 +  The Free Software Foundation may publish revised and/or new versions of
 +the GNU General Public License from time to time.  Such new versions will
  be similar in spirit to the present version, but may differ in detail to
@@ -1518,7 +1532,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    If you develop a new program, and you want it to be of the greatest
  possible use to the public, the best way to achieve this is to make it
-@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
+@@ -287,15 +628,15 @@ free software which everyone can redistr
  
    To do so, attach the following notices to the program.  It is safest
  to attach them to the start of each source file to most effectively
@@ -1538,7 +1552,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
      (at your option) any later version.
  
      This program is distributed in the hope that it will be useful,
-@@ -304,36 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
+@@ -304,36 +645,30 @@ the "copyright" line and a pointer to wh
      GNU General Public License for more details.
  
      You should have received a copy of the GNU General Public License
@@ -1594,8 +1608,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +the library.  If this is what you want to do, use the GNU Lesser General
 +Public License instead of this License.  But first, please read
 +<http://www.gnu.org/philosophy/why-not-lgpl.html>.
---- a/readline/ChangeLog.gdb
-+++ b/readline/ChangeLog.gdb
+Index: gdb-7.2.90.20110703/readline/ChangeLog.gdb
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/ChangeLog.gdb	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/ChangeLog.gdb	2011-07-03 10:41:21.000000000 +0200
 @@ -1,3 +1,12 @@
 +2011-04-30  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
@@ -1606,11 +1622,13 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +
 +	Imported readline 6.2, and upstream patch 001.
 +
- 2011-03-04  Michael Snyder  <msnyder@vmware.com>
+ 2011-06-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
- 	* bind.c (rl_function_dumper): Free allocated memory.
---- a/readline/INSTALL
-+++ b/readline/INSTALL
+ 	Avoid free from a signal handler.
+Index: gdb-7.2.90.20110703/readline/INSTALL
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/INSTALL	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/INSTALL	2011-07-03 10:41:21.000000000 +0200
 @@ -1,7 +1,7 @@
  Basic Installation
  ==================
@@ -1620,8 +1638,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  The simplest way to compile readline is:
  
---- a/readline/MANIFEST
-+++ b/readline/MANIFEST
+Index: gdb-7.2.90.20110703/readline/MANIFEST
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/MANIFEST	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/MANIFEST	2011-07-03 10:41:21.000000000 +0200
 @@ -3,6 +3,7 @@
  #
  doc		d
@@ -1677,27 +1697,21 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  # formatted documentation, from MANIFEST.doc
  doc/readline.ps		f
  doc/history.ps		f
---- a/readline/Makefile.in
-+++ b/readline/Makefile.in
+Index: gdb-7.2.90.20110703/readline/Makefile.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/Makefile.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/Makefile.in	2011-07-03 10:43:36.000000000 +0200
 @@ -1,20 +1,20 @@
  ## -*- text -*- ##
  # Master Makefile for the GNU readline library.
 -# Copyright (C) 1994-2004 Free Software Foundation, Inc.
 +# Copyright (C) 1994-2009 Free Software Foundation, Inc.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
 +#   This program is free software: you can redistribute it and/or modify
 +#   it under the terms of the GNU General Public License as published by
 +#   the Free Software Foundation, either version 3 of the License, or
 +#   (at your option) any later version.
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
++
 +#   This program is distributed in the hope that it will be useful,
 +#   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -1706,6 +1720,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
@@ -1730,7 +1754,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  CTAGS = ctags -tw
  
  CFLAGS = @CFLAGS@
-@@ -100,8 +100,6 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAGS@ @LOCAL_CFLAGS@
+@@ -100,8 +100,6 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
  LIBRARY_NAME = libreadline.a
  STATIC_LIBS = libreadline.a libhistory.a
  
@@ -1739,7 +1763,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
  	   $(srcdir)/vi_mode.c $(srcdir)/parens.c $(srcdir)/rltty.c \
-@@ -109,26 +107,28 @@ CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
+@@ -109,26 +107,28 @@ CSOURCES = $(srcdir)/readline.c $(srcdir
  	   $(srcdir)/display.c $(srcdir)/signals.c $(srcdir)/emacs_keymap.c \
  	   $(srcdir)/vi_keymap.c $(srcdir)/util.c $(srcdir)/kill.c \
  	   $(srcdir)/undo.c $(srcdir)/macro.c $(srcdir)/input.c \
@@ -1803,7 +1827,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  lint:	force
  	$(MAKE) $(MFLAGS) CCFLAGS='$(GCC_LINT_CFLAGS)' static
-@@ -200,6 +196,7 @@ stamp-h: config.status $(srcdir)/config.h.in
+@@ -200,6 +196,7 @@ stamp-h: config.status $(srcdir)/config.
  #$(srcdir)/configure: $(srcdir)/configure.in	## Comment-me-out in distribution
  #	cd $(srcdir) && autoconf	## Comment-me-out in distribution
  
@@ -1849,7 +1873,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
  	$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
  	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
-@@ -250,7 +247,7 @@ installdirs: $(srcdir)/support/mkinstalldirs
+@@ -250,7 +247,7 @@ installdirs: $(srcdir)/support/mkinstall
  		$(DESTDIR)$(includedir)/readline $(DESTDIR)$(libdir) \
  		$(DESTDIR)$(infodir) $(DESTDIR)$(man3dir)
  
@@ -1858,7 +1882,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	-test -n "$(DESTDIR)$(libdir)" && cd $(DESTDIR)$(libdir) && \
  		${RM} libreadline.a libreadline.old libhistory.a libhistory.old $(SHARED_LIBS)
  	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
-@@ -261,6 +258,12 @@ install-shared: installdirs install-headers shared install-doc
+@@ -261,6 +258,12 @@ install-shared: installdirs install-head
  uninstall-shared: maybe-uninstall-headers
  	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
  
@@ -1900,24 +1924,24 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  check:
  installcheck:
  
-@@ -416,6 +421,8 @@ util.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h rlstdc.h
- vi_mode.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
+@@ -417,7 +422,7 @@ vi_mode.o: rldefs.h ${BUILD_DIR}/config.
  vi_mode.o: readline.h keymaps.h rltypedefs.h chardefs.h tilde.h
  vi_mode.o: history.h ansi_stdlib.h rlstdc.h
-+xfree.o: ${BUILD_DIR}/config.h
-+xfree.o: ansi_stdlib.h
  xmalloc.o: ${BUILD_DIR}/config.h
- xmalloc.o: ansi_stdlib.h
+-xmalloc.o: ansi_stdlib.h readline.h
++xmalloc.o: ansi_stdlib.h
  
-@@ -474,6 +481,7 @@ tilde.o: xmalloc.h
+ bind.o: rlshell.h
+ histfile.o: rlshell.h
+@@ -474,6 +479,7 @@ tilde.o: xmalloc.h
  undo.o: xmalloc.h
  util.o: xmalloc.h
  vi_mode.o: xmalloc.h
-+xfree.o: xmalloc.h
++xfree.o: xmalloc.h readline.h
  xmalloc.o: xmalloc.h
  
  complete.o: rlmbutil.h
-@@ -515,6 +523,7 @@ tilde.o: $(srcdir)/tilde.c
+@@ -515,6 +521,7 @@ tilde.o: $(srcdir)/tilde.c
  undo.o: $(srcdir)/undo.c
  util.o: $(srcdir)/util.c
  vi_mode.o: $(srcdir)/vi_mode.c
@@ -1925,7 +1949,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  xmalloc.o: $(srcdir)/xmalloc.c
  
  histexpand.o: $(srcdir)/histexpand.c
-@@ -549,6 +558,7 @@ tilde.o: tilde.c
+@@ -549,6 +556,7 @@ tilde.o: tilde.c
  undo.o: undo.c
  util.o: util.c
  vi_mode.o: vi_mode.c
@@ -1933,8 +1957,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  xmalloc.o: xmalloc.c
  
  histexpand.o: histexpand.c
---- a/readline/NEWS
-+++ b/readline/NEWS
+Index: gdb-7.2.90.20110703/readline/NEWS
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/NEWS	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/NEWS	2011-07-03 10:41:21.000000000 +0200
 @@ -1,32 +1,19 @@
 -This is a terse description of the new features added to readline-5.1 since
 -the release of readline-5.0.
@@ -1982,8 +2008,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +e.  New bindable variable `menu-complete-display-prefix' causes the menu
 +    completion code to display the common prefix of the possible completions
 +    before cycling through the list, instead of after.
---- a/readline/README
-+++ b/readline/README
+Index: gdb-7.2.90.20110703/readline/README
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/README	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/README	2011-07-03 10:41:21.000000000 +0200
 @@ -1,7 +1,7 @@
  Introduction
  ============
@@ -1993,7 +2021,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  The Readline library provides a set of functions for use by applications
  that allow users to edit command lines as they are typed in.  Both
-@@ -16,8 +16,9 @@ may be used without Readline in applications which desire its
+@@ -16,8 +16,9 @@ may be used without Readline in applicat
  capabilities.
  
  The Readline library is free software, distributed under the terms of
@@ -2005,14 +2033,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  To build the library, try typing `./configure', then `make'.  The
  configuration process is automated, so no further intervention should
-@@ -183,4 +184,4 @@ list (mirrored to the Usenet newsgroup gnu.bash.bug) often contains
+@@ -183,4 +184,4 @@ list (mirrored to the Usenet newsgroup g
  Readline bug reports and fixes. 
  
  Chet Ramey
 -chet@po.cwru.edu
 +chet.ramey@case.edu
---- a/readline/aclocal.m4
-+++ b/readline/aclocal.m4
+Index: gdb-7.2.90.20110703/readline/aclocal.m4
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/aclocal.m4	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/aclocal.m4	2011-07-03 10:41:21.000000000 +0200
 @@ -80,6 +80,9 @@ AC_CACHE_VAL(bash_cv_type_$1,
  #if HAVE_INTTYPES_H
  #include <inttypes.h>
@@ -2221,7 +2251,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  AC_CACHE_CHECK([for nl_langinfo and CODESET], bash_cv_langinfo_codeset,
  [AC_TRY_LINK(
  [#include <langinfo.h>],
-@@ -1707,6 +1726,50 @@ if test $bash_cv_langinfo_codeset = yes; then
+@@ -1707,6 +1726,50 @@ if test $bash_cv_langinfo_codeset = yes;
    AC_DEFINE(HAVE_LANGINFO_CODESET)
  fi
  
@@ -2290,7 +2320,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \
  __fsetlocking])
  
-@@ -3964,3 +4027,143 @@ AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+@@ -3964,3 +4027,143 @@ AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG]
        [Define if you have the unsigned long long type.])
    fi
  ])
@@ -2434,8 +2464,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +AC_MSG_RESULT($bash_cv_wexitstatus_offset)
 +AC_DEFINE_UNQUOTED([WEXITSTATUS_OFFSET], [$bash_cv_wexitstatus_offset], [Offset of exit status in wait status word])
 +])
---- a/readline/ansi_stdlib.h
-+++ b/readline/ansi_stdlib.h
+Index: gdb-7.2.90.20110703/readline/ansi_stdlib.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/ansi_stdlib.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/ansi_stdlib.h	2011-07-03 10:41:21.000000000 +0200
 @@ -6,19 +6,19 @@
  
     This file is part of GNU Bash, the Bourne Again SHell.
@@ -2469,8 +2501,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if !defined (_STDLIB_H_)
  #define	_STDLIB_H_ 1
---- a/readline/bind.c
-+++ b/readline/bind.c
+Index: gdb-7.2.90.20110703/readline/bind.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/bind.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/bind.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* bind.c -- key binding and startup file support for the readline library. */
  
@@ -2508,7 +2542,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #define READLINE_LIBRARY
  
-@@ -80,7 +79,7 @@ static int glean_key_from_name PARAMS((char *));
+@@ -80,7 +79,7 @@ static int glean_key_from_name PARAMS((c
  static int find_boolean_var PARAMS((const char *));
  
  static char *_rl_get_string_variable_value PARAMS((const char *));
@@ -2526,7 +2560,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        return -1;
      }
    rl_generic_bind (ISMACR, keyseq, macro_keys, map);
-@@ -347,7 +346,7 @@ rl_generic_bind (type, keyseq, data, map)
+@@ -347,7 +346,7 @@ rl_generic_bind (type, keyseq, data, map
    if (keyseq == 0 || *keyseq == 0)
      {
        if (type == ISMACR)
@@ -2535,7 +2569,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        return -1;
      }
  
-@@ -358,7 +357,7 @@ rl_generic_bind (type, keyseq, data, map)
+@@ -358,7 +357,7 @@ rl_generic_bind (type, keyseq, data, map
       KEYS into KEYS_LEN. */
    if (rl_translate_keyseq (keyseq, keys, &keys_len))
      {
@@ -2544,7 +2578,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        return -1;
      }
  
-@@ -370,7 +369,10 @@ rl_generic_bind (type, keyseq, data, map)
+@@ -370,7 +369,10 @@ rl_generic_bind (type, keyseq, data, map
  
        ic = uc;
        if (ic < 0 || ic >= KEYMAP_SIZE)
@@ -2556,7 +2590,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
        if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
  	{
-@@ -411,11 +413,18 @@ rl_generic_bind (type, keyseq, data, map)
+@@ -411,11 +413,18 @@ rl_generic_bind (type, keyseq, data, map
        else
  	{
  	  if (map[ic].type == ISMACR)
@@ -2576,7 +2610,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	    }
  
  	  map[ic].function = KEYMAP_TO_FUNCTION (data);
-@@ -424,7 +433,7 @@ rl_generic_bind (type, keyseq, data, map)
+@@ -424,7 +433,7 @@ rl_generic_bind (type, keyseq, data, map
  
        rl_binding_keymap = map;
      }
@@ -2635,7 +2669,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	{
  	  *r++ = '\\';
  	  *r++ = 'C';
-@@ -672,7 +700,7 @@ rl_function_of_keyseq (keyseq, map, type)
+@@ -672,7 +700,7 @@ rl_function_of_keyseq (keyseq, map, type
  {
    register int i;
  
@@ -2644,7 +2678,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
      map = _rl_keymap;
  
    for (i = 0; keyseq && keyseq[i]; i++)
-@@ -681,25 +709,27 @@ rl_function_of_keyseq (keyseq, map, type)
+@@ -681,25 +709,27 @@ rl_function_of_keyseq (keyseq, map, type
  
        if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
  	{
@@ -2679,7 +2713,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	    {
  	      if (type)
  		*type = ISKMAP;
-@@ -709,7 +739,12 @@ rl_function_of_keyseq (keyseq, map, type)
+@@ -709,7 +739,12 @@ rl_function_of_keyseq (keyseq, map, type
  	  else
  	    map = FUNCTION_TO_KEYMAP (map, ic);
  	}
@@ -2742,7 +2776,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #if defined (__MSDOS__)
    if (_rl_read_init_file (filename, 0) == 0)
      return 0;
-@@ -832,8 +871,9 @@ _rl_read_init_file (filename, include_level)
+@@ -832,8 +871,9 @@ _rl_read_init_file (filename, include_le
  
    openname = tilde_expand (filename);
    buffer = _rl_read_file (openname, &file_size);
@@ -2753,7 +2787,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    if (buffer == 0)
      return (errno);
    
-@@ -880,7 +920,7 @@ _rl_read_init_file (filename, include_level)
+@@ -880,7 +920,7 @@ _rl_read_init_file (filename, include_le
        current_readline_init_lineno++;
      }
  
@@ -2864,7 +2898,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  };
  
  static int
-@@ -1458,23 +1504,29 @@ typedef int _rl_sv_func_t PARAMS((const char *));
+@@ -1458,23 +1504,29 @@ typedef int _rl_sv_func_t PARAMS((const 
  /* Forward declarations */
  static int sv_bell_style PARAMS((const char *));
  static int sv_combegin PARAMS((const char *));
@@ -3008,7 +3042,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  }
  
  static char *
-@@ -1948,12 +2043,16 @@ rl_invoking_keyseqs_in_map (function, map)
+@@ -1948,12 +2043,16 @@ rl_invoking_keyseqs_in_map (function, ma
  		char *keyname = (char *)xmalloc (6 + strlen (seqs[i]));
  
  		if (key == ESC)
@@ -3031,7 +3065,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		else if (CTRL_CHAR (key))
  		  sprintf (keyname, "\\C-%c", _rl_to_lower (UNCTRL (key)));
  		else if (key == RUBOUT)
-@@ -1971,7 +2070,7 @@ rl_invoking_keyseqs_in_map (function, map)
+@@ -1971,7 +2070,7 @@ rl_invoking_keyseqs_in_map (function, ma
  		  }
  		
  		strcat (keyname, seqs[i]);
@@ -3040,7 +3074,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  		if (result_index + 2 > result_size)
  		  {
-@@ -1983,7 +2082,7 @@ rl_invoking_keyseqs_in_map (function, map)
+@@ -1983,7 +2082,7 @@ rl_invoking_keyseqs_in_map (function, ma
  		result[result_index] = (char *)NULL;
  	      }
  
@@ -3074,7 +3108,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	    }
  	}
      }
-@@ -2111,8 +2210,8 @@ _rl_macro_dumper_internal (print_readably, map, prefix)
+@@ -2111,8 +2210,8 @@ _rl_macro_dumper_internal (print_readabl
  	    fprintf (rl_outstream, "%s%s outputs %s\n", prefix ? prefix : "",
  							keyname,
  							out ? out : "");
@@ -3085,7 +3119,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	  break;
  	case ISFUNC:
  	  break;
-@@ -2135,13 +2234,13 @@ _rl_macro_dumper_internal (print_readably, map, prefix)
+@@ -2135,13 +2234,13 @@ _rl_macro_dumper_internal (print_readabl
  		  out = (char *)xmalloc (strlen (keyname) + prefix_len + 1);
  		  strcpy (out, prefix);
  		  strcpy (out + prefix_len, keyname);
@@ -3158,8 +3192,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  {
    while (*array)
      {
---- a/readline/callback.c
-+++ b/readline/callback.c
+Index: gdb-7.2.90.20110703/readline/callback.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/callback.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/callback.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* callback.c -- functions to use readline as an X `callback' mechanism. */
  
@@ -3284,9 +3320,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +	}
 +#endif
 +      else if (RL_ISSTATE (RL_STATE_NUMERICARG))
- 	{
--	  _rl_internal_char_cleanup ();
--	  _rl_want_redisplay = 1;
++	{
 +	  eof = _rl_arg_callback (_rl_argcxt);
 +	  if (eof == 0 && (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
 +	    rl_callback_read_char ();
@@ -3295,6 +3329,19 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +	    _rl_internal_char_cleanup ();
 +
 +	  return;
++	}
++      else if (RL_ISSTATE (RL_STATE_MULTIKEY))
+ 	{
+-	  _rl_internal_char_cleanup ();
+-	  _rl_want_redisplay = 1;
++	  eof = _rl_dispatch_callback (_rl_kscxt);	/* For now */
++	  while ((eof == -1 || eof == -2) && RL_ISSTATE (RL_STATE_MULTIKEY) && _rl_kscxt && (_rl_kscxt->flags & KSEQ_DISPATCHED))
++	    eof = _rl_dispatch_callback (_rl_kscxt);
++	  if (RL_ISSTATE (RL_STATE_MULTIKEY) == 0)
++	    {
++	      _rl_internal_char_cleanup ();
++	      _rl_want_redisplay = 1;
++	    }
  	}
 -    }
 -  else if (_rl_callback_func)
@@ -3308,26 +3355,9 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -      /* If the function `deregisters' itself, make sure the data is cleaned
 -	 up. */
 -      if (_rl_callback_func == 0)
-+      else if (RL_ISSTATE (RL_STATE_MULTIKEY))
++      else if (_rl_callback_func)
  	{
 -	  if (_rl_callback_data) 	
-+	  eof = _rl_dispatch_callback (_rl_kscxt);	/* For now */
-+	  while ((eof == -1 || eof == -2) && RL_ISSTATE (RL_STATE_MULTIKEY) && _rl_kscxt && (_rl_kscxt->flags & KSEQ_DISPATCHED))
-+	    eof = _rl_dispatch_callback (_rl_kscxt);
-+	  if (RL_ISSTATE (RL_STATE_MULTIKEY) == 0)
- 	    {
--	      _rl_callback_data_dispose (_rl_callback_data);
--	      _rl_callback_data = 0;
-+	      _rl_internal_char_cleanup ();
-+	      _rl_want_redisplay = 1;
- 	    }
--	  _rl_internal_char_cleanup ();
- 	}
--    }
--  else
--    eof = readline_internal_char ();
-+      else if (_rl_callback_func)
-+	{
 +	  /* This allows functions that simply need to read an additional
 +	     character (like quoted-insert) to register a function to be
 +	     called when input is available.  _rl_callback_data is simply a
@@ -3338,15 +3368,21 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +	  /* If the function `deregisters' itself, make sure the data is
 +	     cleaned up. */
 +	  if (_rl_callback_func == 0)
-+	    {
+ 	    {
+-	      _rl_callback_data_dispose (_rl_callback_data);
+-	      _rl_callback_data = 0;
 +	      if (_rl_callback_data) 	
 +		{
 +		  _rl_callback_data_dispose (_rl_callback_data);
 +		  _rl_callback_data = 0;
 +		}
 +	      _rl_internal_char_cleanup ();
-+	    }
-+	}
+ 	    }
+-	  _rl_internal_char_cleanup ();
+ 	}
+-    }
+-  else
+-    eof = readline_internal_char ();
 +      else
 +	eof = readline_internal_char ();
  
@@ -3399,8 +3435,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  }
  
  #endif
---- a/readline/chardefs.h
-+++ b/readline/chardefs.h
+Index: gdb-7.2.90.20110703/readline/chardefs.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/chardefs.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/chardefs.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* chardefs.h -- Character definitions for readline. */
  
@@ -3438,8 +3476,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #ifndef _CHARDEFS_H_
  #define _CHARDEFS_H_
---- a/readline/compat.c
-+++ b/readline/compat.c
+Index: gdb-7.2.90.20110703/readline/compat.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/compat.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/compat.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* compat.c -- backwards compatibility functions. */
  
@@ -3478,8 +3518,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #define READLINE_LIBRARY
  
  #if defined (HAVE_CONFIG_H)
---- a/readline/complete.c
-+++ b/readline/complete.c
+Index: gdb-7.2.90.20110703/readline/complete.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/complete.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/complete.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* complete.c -- filename completion for readline. */
  
@@ -3529,7 +3571,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  static char **gen_completion_matches PARAMS((char *, int, int, rl_compentry_func_t *, int, int));
  
-@@ -119,9 +119,11 @@ static char **remove_duplicate_matches PARAMS((char **));
+@@ -119,9 +119,11 @@ static char **remove_duplicate_matches P
  static void insert_match PARAMS((char *, int, int, char *));
  static int append_to_match PARAMS((char *, int, int, int));
  static void insert_all_matches PARAMS((char **, int, char *));
@@ -3588,7 +3630,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* If non-zero, then this is the address of a function to call when
     completing on a directory name.  The function is called with
     the address of a string (the current directory name) as an arg. */
-@@ -180,6 +206,17 @@ rl_icppfunc_t *rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
+@@ -180,6 +206,17 @@ rl_icppfunc_t *rl_directory_completion_h
  
  rl_icppfunc_t *rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
  
@@ -3606,7 +3648,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* Non-zero means readline completion functions perform tilde expansion. */
  int rl_complete_with_tilde_expansion = 0;
  
-@@ -188,6 +225,10 @@ int rl_complete_with_tilde_expansion = 0;
+@@ -188,6 +225,10 @@ int rl_complete_with_tilde_expansion = 0
     completer. */
  rl_compentry_func_t *rl_completion_entry_function = (rl_compentry_func_t *)NULL;
  
@@ -3823,7 +3865,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        if (extension_char)
  	{
  	  putc (extension_char, rl_outstream);
-@@ -950,7 +1053,7 @@ gen_completion_matches (text, start, end, our_func, found_quote, quote_char)
+@@ -950,7 +1053,7 @@ gen_completion_matches (text, start, end
       rl_compentry_func_t *our_func;
       int found_quote, quote_char;
  {
@@ -3832,7 +3874,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    rl_completion_found_quote = found_quote;
    rl_completion_quote_character = quote_char;
-@@ -960,7 +1063,10 @@ gen_completion_matches (text, start, end, our_func, found_quote, quote_char)
+@@ -960,7 +1063,10 @@ gen_completion_matches (text, start, end
       variable rl_attempted_completion_function. */
    if (rl_attempted_completion_function)
      {
@@ -3843,7 +3885,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
        if (matches || rl_attempted_completion_over)
  	{
-@@ -969,21 +1075,9 @@ gen_completion_matches (text, start, end, our_func, found_quote, quote_char)
+@@ -969,21 +1075,9 @@ gen_completion_matches (text, start, end
  	}
      }
  
@@ -3902,7 +3944,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        temp_array[1] = (char *)NULL;
      }
    return (temp_array);
-@@ -1116,7 +1210,8 @@ compute_lcd_of_matches (match_list, matches, text)
+@@ -1116,7 +1210,8 @@ compute_lcd_of_matches (match_list, matc
  #if defined (HANDLE_MULTIBYTE)
  	    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
  	      {
@@ -3912,7 +3954,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		if (!_rl_compare_chars (match_list[i], si, &ps1, match_list[i+1], si, &ps2))
  		  break;
  		else if ((v = _rl_get_char_len (&match_list[i][si], &ps_back)) > 1)
-@@ -1220,7 +1315,7 @@ postprocess_matches (matchesp, matching_filenames)
+@@ -1220,7 +1315,7 @@ postprocess_matches (matchesp, matching_
    if (rl_ignore_completion_duplicates)
      {
        temp_matches = remove_duplicate_matches (matches);
@@ -3921,7 +3963,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        matches = temp_matches;
      }
  
-@@ -1257,6 +1352,23 @@ postprocess_matches (matchesp, matching_filenames)
+@@ -1257,6 +1352,23 @@ postprocess_matches (matchesp, matching_
    return (1);
  }
  
@@ -3945,7 +3987,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* A convenience function for displaying a list of strings in
     columnar format on readline's output stream.  MATCHES is the list
     of strings, in argv format, LEN is the number of strings in MATCHES,
-@@ -1266,17 +1378,38 @@ rl_display_match_list (matches, len, max)
+@@ -1266,17 +1378,38 @@ rl_display_match_list (matches, len, max
       char **matches;
       int len, max;
  {
@@ -3990,7 +4032,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
       limit will be 0 and a divide-by-zero fault will result. */
    if (limit == 0)
      limit = 1;
-@@ -1289,7 +1422,7 @@ rl_display_match_list (matches, len, max)
+@@ -1289,7 +1422,7 @@ rl_display_match_list (matches, len, max
  	   0 < len <= limit  implies  count = 1. */
  
    /* Sort the items if they are not already sorted. */
@@ -3999,7 +4041,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
      qsort (matches + 1, len, sizeof (char *), (QSFUNC *)_rl_qsort_string_compare);
  
    rl_crlf ();
-@@ -1307,7 +1440,7 @@ rl_display_match_list (matches, len, max)
+@@ -1307,7 +1440,7 @@ rl_display_match_list (matches, len, max
  	      else
  		{
  		  temp = printable_part (matches[l]);
@@ -4008,7 +4050,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  		  if (j + 1 < limit)
  		    for (k = 0; k < max - printed_len; k++)
-@@ -1331,7 +1464,7 @@ rl_display_match_list (matches, len, max)
+@@ -1331,7 +1464,7 @@ rl_display_match_list (matches, len, max
        for (i = 1; matches[i]; i++)
  	{
  	  temp = printable_part (matches[i]);
@@ -4083,7 +4125,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
      }
  }
  
-@@ -1572,7 +1724,7 @@ append_to_match (text, delimiter, quote_char, nontrivial_match)
+@@ -1572,7 +1724,7 @@ append_to_match (text, delimiter, quote_
  	  if (rl_point == rl_end && temp_string_index)
  	    rl_insert_text (temp_string);
  	}
@@ -4212,7 +4254,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    return 0;
  }
  
-@@ -1813,6 +1993,7 @@ rl_completion_matches (text, entry_function)
+@@ -1813,6 +1993,7 @@ rl_completion_matches (text, entry_funct
    match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
    match_list[1] = (char *)NULL;
  
@@ -4220,7 +4262,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    while (string = (*entry_function) (text, matches))
      {
        if (matches + 1 == match_list_size)
-@@ -1822,6 +2003,8 @@ rl_completion_matches (text, entry_function)
+@@ -1822,6 +2003,8 @@ rl_completion_matches (text, entry_funct
        match_list[++matches] = string;
        match_list[matches + 1] = (char *)NULL;
      }
@@ -4229,7 +4271,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    /* If there were any matches, then look through them finding out the
       lowest common denominator.  That then becomes match_list[0]. */
-@@ -1829,7 +2012,7 @@ rl_completion_matches (text, entry_function)
+@@ -1829,7 +2012,7 @@ rl_completion_matches (text, entry_funct
      compute_lcd_of_matches (match_list, matches, text);
    else				/* There were no matches. */
      {
@@ -4238,7 +4280,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        match_list = (char **)NULL;
      }
    return (match_list);
-@@ -1895,6 +2078,62 @@ rl_username_completion_function (text, state)
+@@ -1895,6 +2078,62 @@ rl_username_completion_function (text, s
  #endif /* !__WIN32__ && !__OPENNT */
  }
  
@@ -4301,7 +4343,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* Okay, now we write the entry_function for filename completion.  In the
     general case.  Note that completion in the shell is a little different
     because of all the pathnames that must be followed when looking up the
-@@ -1909,8 +2148,8 @@ rl_filename_completion_function (text, state)
+@@ -1909,8 +2148,8 @@ rl_filename_completion_function (text, s
    static char *dirname = (char *)NULL;
    static char *users_dirname = (char *)NULL;
    static int filename_len;
@@ -4312,7 +4354,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    struct dirent *entry;
  
    /* If we don't have any state, then do some initialization. */
-@@ -1961,26 +2200,52 @@ rl_filename_completion_function (text, state)
+@@ -1961,26 +2200,52 @@ rl_filename_completion_function (text, s
  
        /* We aren't done yet.  We also support the "~user" syntax. */
  
@@ -4372,7 +4414,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        filename_len = strlen (filename);
  
        rl_filename_completion_desired = 1;
-@@ -1997,37 +2262,31 @@ rl_filename_completion_function (text, state)
+@@ -1997,37 +2262,31 @@ rl_filename_completion_function (text, s
    entry = (struct dirent *)NULL;
    while (directory && (entry = readdir (directory)))
      {
@@ -4424,7 +4466,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	}
      }
  
-@@ -2040,17 +2299,17 @@ rl_filename_completion_function (text, state)
+@@ -2040,17 +2299,17 @@ rl_filename_completion_function (text, s
  	}
        if (dirname)
  	{
@@ -4445,7 +4487,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	  users_dirname = (char *)NULL;
  	}
  
-@@ -2084,27 +2343,30 @@ rl_filename_completion_function (text, state)
+@@ -2084,27 +2343,30 @@ rl_filename_completion_function (text, s
  		temp[dirlen++] = '/';
  	    }
  
@@ -4731,8 +4773,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +     arguments for menu-complete, and vice versa. */
 +  return (rl_menu_complete (-count, key));
 +}
---- a/readline/config.h.in
-+++ b/readline/config.h.in
+Index: gdb-7.2.90.20110703/readline/config.h.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/config.h.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/config.h.in	2011-07-03 10:41:21.000000000 +0200
 @@ -4,6 +4,8 @@
     characters, even if the OS supports them. */
  #undef NO_MULTIBYTE_SUPPORT
@@ -4835,8 +4879,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #if defined (__STDC__) && defined (HAVE_STDARG_H)
  #  define PREFER_STDARG
  #  define USE_VARARGS
---- a/readline/configure
-+++ b/readline/configure
+Index: gdb-7.2.90.20110703/readline/configure
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/configure	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/configure	2011-07-03 10:41:21.000000000 +0200
 @@ -1,7 +1,7 @@
  #! /bin/sh
 -# From configure.in for Readline 5.1, version 2.59.
@@ -4934,7 +4980,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  generated by GNU Autoconf 2.64.  Invocation command line was
  
    $ $0 $@
-@@ -2211,7 +2211,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+@@ -2211,7 +2211,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
  ac_config_headers="$ac_config_headers config.h"
  
  
@@ -4943,7 +4989,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-@@ -3622,39 +3622,6 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+@@ -3622,39 +3622,6 @@ $as_echo "$ac_cv_safe_to_define___extens
  
  
  
@@ -4983,7 +5029,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  # If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
  test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"
  
-@@ -4056,6 +4023,40 @@ if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
+@@ -4056,6 +4023,40 @@ if test $ac_cv_c_char_unsigned = yes && 
  
  fi
  
@@ -5230,7 +5276,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of signal functions" >&5
  $as_echo_n "checking for type of signal functions... " >&6; }
-@@ -5078,6 +5278,49 @@ $as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
+@@ -5078,6 +5278,49 @@ $as_echo "#define GWINSZ_IN_SYS_IOCTL 1"
  fi
  
  
@@ -5280,7 +5326,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether signal handlers are of type void" >&5
  $as_echo_n "checking whether signal handlers are of type void... " >&6; }
  if test "${bash_cv_void_sighandler+set}" = set; then :
-@@ -5116,6 +5359,7 @@ $as_echo "#define VOID_SIGHANDLER 1" >>confdefs.h
+@@ -5116,6 +5359,7 @@ $as_echo "#define VOID_SIGHANDLER 1" >>c
  
  fi
  
@@ -5371,7 +5417,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  fi
  
-@@ -5668,55 +5958,89 @@ if test "x$ac_cv_func_wcwidth" = x""yes; then :
+@@ -5668,55 +5958,89 @@ if test "x$ac_cv_func_wcwidth" = x""yes;
  
  fi
  
@@ -5483,7 +5529,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
  $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
  if test "${bash_cv_langinfo_codeset+set}" = set; then :
-@@ -5748,6 +6072,126 @@ if test $bash_cv_langinfo_codeset = yes; then
+@@ -5748,6 +6072,126 @@ if test $bash_cv_langinfo_codeset = yes;
  
  fi
  
@@ -5610,7 +5656,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  
  case "$host_cpu" in
-@@ -6357,7 +6801,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -6357,7 +6801,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
@@ -5628,8 +5674,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  configured by $0, generated by GNU Autoconf 2.64,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
---- a/readline/configure.in
-+++ b/readline/configure.in
+Index: gdb-7.2.90.20110703/readline/configure.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/configure.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/configure.in	2011-07-03 10:41:21.000000000 +0200
 @@ -5,28 +5,26 @@ dnl report bugs to chet@po.cwru.edu
  dnl
  dnl Process this file with autoconf to produce a configure script.
@@ -5641,28 +5689,30 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -# it under the terms of the GNU General Public License as published by
 -# the Free Software Foundation; either version 2, or (at your option)
 -# any later version.
-+#   This program is free software: you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation, either version 3 of the License, or
-+#   (at your option) any later version.
- 
+-
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++#   This program is free software: you can redistribute it and/or modify
++#   it under the terms of the GNU General Public License as published by
++#   the Free Software Foundation, either version 3 of the License, or
++#   (at your option) any later version.
++
 +#   This program is distributed in the hope that it will be useful,
 +#   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +#   GNU General Public License for more details.
  
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
+-AC_REVISION([for Readline 5.1, version 2.59])
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--AC_REVISION([for Readline 5.1, version 2.59])
++
 +AC_REVISION([for Readline 6.2, version 2.67])
  
  m4_include([../config/override.m4])
@@ -5753,8 +5803,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  BASH_HAVE_TIOCSTAT
  BASH_HAVE_FIONREAD
  BASH_CHECK_SPEED_T
---- a/readline/display.c
-+++ b/readline/display.c
+Index: gdb-7.2.90.20110703/readline/display.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/display.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/display.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* display.c -- readline redisplay facility. */
  
@@ -6472,11 +6524,11 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    {
 -    char *vtemp = visible_line;
 -    int *itemp = vis_lbreaks, ntemp = vis_lbsize;
--
--    visible_line = invisible_line;
--    invisible_line = vtemp;
 +    struct line_state *vtemp = line_state_visible;
  
+-    visible_line = invisible_line;
+-    invisible_line = vtemp;
+-
 -    vis_lbreaks = inv_lbreaks;
 -    inv_lbreaks = itemp;
 -
@@ -6495,7 +6547,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    _rl_release_sigint ();
  }
  
-@@ -1169,12 +1275,12 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1169,12 +1275,12 @@ update_line (old, new, current_line, oma
       int current_line, omax, nmax, inv_botlin;
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
@@ -6510,7 +6562,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #endif
  
    /* If we're at the right edge of a terminal that supports xn, we're
-@@ -1185,7 +1291,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1185,7 +1291,7 @@ update_line (old, new, current_line, oma
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
      temp = _rl_last_c_pos;
    else
@@ -6519,7 +6571,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
  	&& _rl_last_v_pos == current_line - 1)
      {
-@@ -1200,8 +1306,8 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1200,8 +1306,8 @@ update_line (old, new, current_line, oma
  	  /* This fixes only double-column characters, but if the wrapped
  	     character comsumes more than three columns, spaces will be
  	     inserted in the string buffer. */
@@ -6530,7 +6582,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  	  memset (&ps, 0, sizeof (mbstate_t));
  	  ret = mbrtowc (&wc, new, MB_CUR_MAX, &ps);
-@@ -1217,7 +1323,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1217,7 +1323,7 @@ update_line (old, new, current_line, oma
  
  	  if (tempwidth > 0)
  	    {
@@ -6539,7 +6591,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	      bytes = ret;
  	      for (count = 0; count < bytes; count++)
  		putc (new[count], rl_outstream);
-@@ -1228,10 +1334,13 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1228,10 +1334,13 @@ update_line (old, new, current_line, oma
  	      if (ret != 0 && bytes != 0)
  		{
  		  if (MB_INVALIDCH (ret))
@@ -6556,7 +6608,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		}
  	    }
  	  else
-@@ -1265,7 +1374,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1265,7 +1374,7 @@ update_line (old, new, current_line, oma
        /* See if the old line is a subset of the new line, so that the
  	 only change is adding characters. */
        temp = (omax < nmax) ? omax : nmax;
@@ -6565,7 +6617,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	{
  	  ofd = old + temp;
  	  nfd = new + temp;
-@@ -1407,30 +1516,48 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1407,30 +1516,48 @@ update_line (old, new, current_line, oma
       sequences (like drawing the `unbold' sequence without a corresponding
       `bold') that manifests itself on certain terminals. */
  
@@ -6618,7 +6670,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    /* if (len (new) > len (old))
       lendiff == difference in buffer
-@@ -1438,7 +1565,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1438,7 +1565,7 @@ update_line (old, new, current_line, oma
       When not using multibyte characters, these are equal */
    lendiff = (nls - nfd) - (ols - ofd);
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -6627,7 +6679,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    else
      col_lendiff = lendiff;
  
-@@ -1463,7 +1590,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1463,7 +1590,7 @@ update_line (old, new, current_line, oma
    /* Insert (diff (len (old), len (new)) ch. */
    temp = ne - nfd;
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -6636,7 +6688,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    else
      col_temp = temp;
  
-@@ -1471,22 +1598,60 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1471,22 +1598,60 @@ update_line (old, new, current_line, oma
      {
        /* Non-zero if we're increasing the number of lines. */
        int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
@@ -6700,7 +6752,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	  else if ((MB_CUR_MAX == 1 || rl_byte_oriented != 0) && *ols == 0 && lendiff > 0)
  	    {
  	      /* At the end of a line the characters do not have to
-@@ -1498,11 +1663,16 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1498,11 +1663,16 @@ update_line (old, new, current_line, oma
  	    }
  	  else
  	    {
@@ -6720,7 +6772,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	      return;
  	    }
  	  /* Copy (new) chars to screen from first diff to last match. */
-@@ -1510,15 +1680,23 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1510,15 +1680,23 @@ update_line (old, new, current_line, oma
  	  if ((temp - lendiff) > 0)
  	    {
  	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
@@ -6749,7 +6801,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	    }
  	}
        else
-@@ -1530,6 +1708,14 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1530,6 +1708,14 @@ update_line (old, new, current_line, oma
  	     char in the current line (which implies we just output some invisible
  	     characters) we need to adjust _rl_last_c_pos, since it represents
  	     a physical character position. */
@@ -6764,7 +6816,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	}
      }
    else				/* Delete characters from line. */
-@@ -1551,8 +1737,22 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1551,8 +1737,22 @@ update_line (old, new, current_line, oma
  	  temp = nls - nfd;
  	  if (temp > 0)
  	    {
@@ -6788,7 +6840,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	    }
  	}
        /* Otherwise, print over the existing material. */
-@@ -1560,16 +1760,37 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
+@@ -1560,16 +1760,37 @@ update_line (old, new, current_line, oma
  	{
  	  if (temp > 0)
  	    {
@@ -7105,8 +7157,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    while (point < start)
      {
        tmp = mbrlen (str + point, max, &ps);
---- a/readline/doc/ChangeLog.gdb
-+++ b/readline/doc/ChangeLog.gdb
+Index: gdb-7.2.90.20110703/readline/doc/ChangeLog.gdb
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/ChangeLog.gdb	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/ChangeLog.gdb	2011-07-03 10:41:21.000000000 +0200
 @@ -1,3 +1,7 @@
 +2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
@@ -7115,8 +7169,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  2006-04-24  Daniel Jacobowitz  <dan@codesourcery.com>
  
  	Imported readline 5.1, and upstream patches 001-004.
---- a/readline/doc/Makefile.in
-+++ b/readline/doc/Makefile.in
+Index: gdb-7.2.90.20110703/readline/doc/Makefile.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/Makefile.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/Makefile.in	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,24 @@
  # This makefile for Readline library documentation is in -*- text -*- mode.
  # Emacs likes it that way.
@@ -7128,23 +7184,25 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -# it under the terms of the GNU General Public License as published by
 -# the Free Software Foundation; either version 2, or (at your option)
 -# any later version.
-+#   This program is free software: you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation, either version 3 of the License, or
-+#   (at your option) any later version.
- 
+-
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
++#   This program is free software: you can redistribute it and/or modify
++#   it under the terms of the GNU General Public License as published by
++#   the Free Software Foundation, either version 3 of the License, or
++#   (at your option) any later version.
++
 +#   This program is distributed in the hope that it will be useful,
 +#   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +#   GNU General Public License for more details.
- 
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
++
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
@@ -7155,7 +7213,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  prefix = @prefix@
  
-@@ -64,9 +63,9 @@ PSPDF       = gs -sPAPERSIZE=${PAPERSIZE} -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -s
+@@ -64,9 +63,9 @@ PSPDF       = gs -sPAPERSIZE=${PAPERSIZE
  
  RLSRC = $(srcdir)/rlman.texi $(srcdir)/rluser.texi \
  	$(srcdir)/rltech.texi $(srcdir)/version.texi \
@@ -7167,7 +7225,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  # This should be a program that converts troff to an ascii-readable format
  NROFF       = groff -Tascii
-@@ -83,7 +82,7 @@ PDFOBJ = readline.pdf history.pdf rluserman.pdf
+@@ -83,7 +82,7 @@ PDFOBJ = readline.pdf history.pdf rluser
  
  INTERMEDIATE_OBJ = rlman.dvi
  
@@ -7176,7 +7234,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  .SUFFIXES:      .0 .3 .ps .txt .dvi .html .pdf
  
-@@ -99,9 +98,11 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ) $(INFOOBJ) $(TEXTOBJ)
+@@ -99,9 +98,11 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ
  	$(RM) $@
  	-${DVIPDF} $<
  
@@ -7214,8 +7272,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		$(RM) $(DIST_DOCS); \
  	fi
  
---- a/readline/doc/fdl.texi
-+++ b/readline/doc/fdl.texi
+Index: gdb-7.2.90.20110703/readline/doc/fdl.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/fdl.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/fdl.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -1,13 +1,12 @@
 +@c The GNU Free Documentation License.
 +@center Version 1.3, 3 November 2008
@@ -7236,7 +7296,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
-@@ -112,6 +111,9 @@ formats which do not have any title page as such, ``Title Page'' means
+@@ -112,6 +111,9 @@ formats which do not have any title page
  the text near the most prominent appearance of the work's title,
  preceding the beginning of the body of the text.
  
@@ -7246,7 +7306,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  A section ``Entitled XYZ'' means a named subunit of the Document whose
  title either is precisely XYZ or contains XYZ in parentheses following
  text that translates XYZ in another language.  (Here XYZ stands for a
-@@ -344,7 +346,7 @@ and independent documents or works, in or on a volume of a storage or
+@@ -344,7 +346,7 @@ and independent documents or works, in o
  distribution medium, is called an ``aggregate'' if the copyright
  resulting from the compilation is not used to limit the legal rights
  of the compilation's users beyond what the individual works permit.
@@ -7293,7 +7353,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @item
  FUTURE REVISIONS OF THIS LICENSE
-@@ -404,11 +423,46 @@ following the terms and conditions either of that specified version or
+@@ -404,11 +423,46 @@ following the terms and conditions eithe
  of any later version that has been published (not as a draft) by the
  Free Software Foundation.  If the Document does not specify a version
  number of this License, you may choose any version ever published (not
@@ -7342,7 +7402,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  To use this License in a document you have written, include a copy of
  the License in the document and put the following copyright and
-@@ -418,16 +472,16 @@ license notices just after the title page:
+@@ -418,16 +472,16 @@ license notices just after the title pag
  @group
    Copyright (C)  @var{year}  @var{your name}.
    Permission is granted to copy, distribute and/or modify this document
@@ -7363,8 +7423,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @smallexample
  @group
---- a/readline/doc/history.3
-+++ b/readline/doc/history.3
+Index: gdb-7.2.90.20110703/readline/doc/history.3
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/history.3	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/history.3	2011-07-03 10:41:21.000000000 +0200
 @@ -6,9 +6,9 @@
  .\"	Case Western Reserve University
  .\"	chet@ins.CWRU.Edu
@@ -7423,7 +7485,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .IR string .
  The trailing \fB?\fP may be omitted if
  .I string
-@@ -569,10 +575,13 @@ The number of entries currently stored in the history list.
+@@ -569,10 +575,13 @@ The number of entries currently stored i
  The maximum number of history entries.  This must be changed using
  \fBstifle_history()\fP.
  
@@ -7438,8 +7500,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  .Vb char history_expansion_char
  The character that introduces a history event.  The default is \fB!\fP.
---- a/readline/doc/history.texi
-+++ b/readline/doc/history.texi
+Index: gdb-7.2.90.20110703/readline/doc/history.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/history.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/history.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -4,8 +4,6 @@
  @settitle GNU History Library
  @c %**end of header (This is for running Texinfo on a region.)
@@ -7449,7 +7513,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @include version.texi
  
  @copying
-@@ -14,7 +12,7 @@ This document describes the GNU History library
+@@ -14,7 +12,7 @@ This document describes the GNU History 
  a programming tool that provides a consistent user interface for
  recalling lines of previously typed input.
  
@@ -7505,8 +7569,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @include fdl.texi
  
---- a/readline/doc/hstech.texi
-+++ b/readline/doc/hstech.texi
+Index: gdb-7.2.90.20110703/readline/doc/hstech.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/hstech.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/hstech.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -1,7 +1,7 @@
  @ignore
  This file documents the user interface to the GNU History library.
@@ -7516,7 +7582,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  Authored by Brian Fox and Chet Ramey.
  
  Permission is granted to make and distribute verbatim copies of this manual
-@@ -426,6 +426,10 @@ The maximum number of history entries.  This must be changed using
+@@ -426,6 +426,10 @@ The maximum number of history entries.  
  If non-zero, timestamps are written to the history file, so they can be
  preserved between sessions.  The default value is 0, meaning that
  timestamps are not saved.
@@ -7527,8 +7593,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end deftypevar
  
  @deftypevar char history_expansion_char
---- a/readline/doc/hsuser.texi
-+++ b/readline/doc/hsuser.texi
+Index: gdb-7.2.90.20110703/readline/doc/hsuser.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/hsuser.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/hsuser.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -1,7 +1,7 @@
  @ignore
  This file documents the user interface to the GNU History library.
@@ -7538,7 +7606,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  Authored by Brian Fox and Chet Ramey.
  
  Permission is granted to make and distribute verbatim copies of this manual
-@@ -97,7 +97,11 @@ to contain no more than @env{$HISTFILESIZE}
+@@ -97,7 +97,11 @@ to contain no more than @env{$HISTFILESI
  lines.  If @env{HISTFILESIZE} is not set, no truncation is performed.
  
  If the @env{HISTTIMEFORMAT} is set, the time stamp information
@@ -7560,7 +7628,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @code{fc -s [@var{pat}=@var{rep}] [@var{command}]}
  @end example
  
-@@ -277,7 +281,10 @@ them, so that they are available for subsequent recall.
+@@ -277,7 +281,10 @@ them, so that they are available for sub
  This is most useful in conjunction with Readline.
  
  The shell allows control of the various characters used by the
@@ -7572,7 +7640,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end ifset
  
  @menu
-@@ -292,6 +299,8 @@ history expansion mechanism with the @code{histchars} variable.
+@@ -292,6 +299,8 @@ history expansion mechanism with the @co
  
  An event designator is a reference to a command line entry in the
  history list.
@@ -7599,7 +7667,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @samp{?} may be omitted if the @var{string} is followed immediately by
  a newline.
  
-@@ -412,7 +426,7 @@ of the following modifiers, each preceded by a @samp{:}.
+@@ -412,7 +426,7 @@ of the following modifiers, each precede
  Remove a trailing pathname component, leaving only the head.
  
  @item t
@@ -7608,8 +7676,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @item r
  Remove a trailing suffix of the form @samp{.@var{suffix}}, leaving
---- a/readline/doc/inc-hist.texinfo
-+++ /dev/null
+Index: gdb-7.2.90.20110703/readline/doc/inc-hist.texinfo
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/inc-hist.texinfo	2011-07-03 10:40:53.000000000 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,457 +0,0 @@
 -@ignore
 -This file documents the user interface to the GNU History library.
@@ -8068,8 +8138,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -Apply the following @samp{s} modifier once to each word in the event.
 -
 -@end table
---- a/readline/doc/readline.3
-+++ b/readline/doc/readline.3
+Index: gdb-7.2.90.20110703/readline/doc/readline.3
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/readline.3	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/readline.3	2011-07-03 10:41:21.000000000 +0200
 @@ -6,9 +6,9 @@
  .\"	Case Western Reserve University
  .\"	chet@ins.CWRU.Edu
@@ -8082,7 +8154,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .\"
  .\" File Name macro.  This used to be `.PN', for Path Name,
  .\" but Sun doesn't seem to like that very much.
-@@ -34,8 +34,8 @@ readline \- get a line from a user with editing
+@@ -34,8 +34,8 @@ readline \- get a line from a user with 
  \fBreadline\fP (\fIconst char *prompt\fP);
  .fi
  .SH COPYRIGHT
@@ -8102,7 +8174,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  keystrokes.  Control keys are denoted by C\-\fIkey\fR, e.g., C\-n
  means Control\-N.  Similarly, 
  .I meta
-@@ -116,6 +116,8 @@ The name of this file is taken from the value of the
+@@ -116,6 +116,8 @@ The name of this file is taken from the 
  .B INPUTRC
  environment variable.  If that variable is unset, the default is
  .IR ~/.inputrc .
@@ -8111,7 +8183,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  When a program which uses the readline library starts up, the
  init file is read, and the key bindings and variables are set.
  There are only a few basic constructs allowed in the
-@@ -168,6 +170,8 @@ command or the text of a macro and a key sequence to which
+@@ -168,6 +170,8 @@ command or the text of a macro and a key
  it should be bound. The name may be specified in one of two ways:
  as a symbolic key name, possibly with \fIMeta\-\fP or \fIControl\-\fP
  prefixes, or as a key sequence.
@@ -8196,7 +8268,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .B horizontal\-scroll\-mode (Off)
  When set to \fBOn\fP, makes readline use a single line for display,
  scrolling the input horizontally on a single screen line when it
-@@ -451,9 +488,15 @@ have a slash appended (subject to the value of
+@@ -451,9 +488,15 @@ have a slash appended (subject to the va
  .B match\-hidden\-files (On)
  This variable, when set to \fBOn\fP, causes readline to match files whose 
  names begin with a `.' (hidden files) when performing filename     
@@ -8213,7 +8285,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .B output\-meta (Off)
  If set to \fBOn\fP, readline will display characters with the
  eighth bit set directly rather than as a meta-prefixed escape
-@@ -467,10 +510,16 @@ to display a screenful of possible completions at a time.
+@@ -467,10 +510,16 @@ to display a screenful of possible compl
  If set to \fBOn\fP, readline will display completions with matches
  sorted horizontally in alphabetical order, rather than down the screen.
  .TP
@@ -8231,7 +8303,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  words which have more than one possible completion cause the
  matches to be listed immediately instead of ringing the bell.
  .TP
-@@ -478,12 +527,20 @@ matches to be listed immediately instead of ringing the bell.
+@@ -478,12 +527,20 @@ matches to be listed immediately instead
  This alters the default behavior of the completion functions in
  a fashion similar to \fBshow\-all\-if\-ambiguous\fP.
  If set to
@@ -8253,7 +8325,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .B visible\-stats (Off)
  If set to \fBOn\fP, a character denoting a file's type as reported  
  by \fIstat\fP(2) is appended to the filename when listing possible
-@@ -530,7 +587,7 @@ library sets the \fIapplication name\fP, and an initialization
+@@ -530,7 +587,7 @@ library sets the \fIapplication name\fP,
  file can test for a particular value.
  This could be used to bind key sequences to functions useful for
  a specific program.  For instance, the following command adds a
@@ -8262,7 +8334,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .sp 1
  .RS
  .nf
-@@ -706,10 +763,14 @@ as if the "!\fIn\fP" history expansion had been specified.
+@@ -706,10 +763,14 @@ as if the "!\fIn\fP" history expansion h
  .B
  yank\-last\-arg (M\-.\^, M\-_\^)
  Insert the last argument to the previous command (the last word of
@@ -8280,7 +8352,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  The history expansion facilities are used to extract the last argument,
  as if the "!$" history expansion had been specified.
  .PD
-@@ -884,6 +945,12 @@ only attempts filename completion under certain circumstances.
+@@ -884,6 +945,12 @@ only attempts filename completion under 
  .TP
  .B possible\-completions (M\-?)
  List the possible completions of the text before point.
@@ -8305,7 +8377,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .B delete\-char\-or\-list
  Deletes the character under the cursor if not at the beginning or
  end of the line (like \fBdelete-char\fP).
-@@ -977,6 +1049,15 @@ character.  A negative count searches for previous occurrences.
+@@ -977,6 +1049,15 @@ character.  A negative count searches fo
  A character is read and point is moved to the previous occurrence of that
  character.  A negative count searches for subsequent occurrences.
  .TP
@@ -8321,8 +8393,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  .B insert\-comment (M\-#)
  Without a numeric argument, the value of the readline
  .B comment\-begin
---- a/readline/doc/rlman.texi
-+++ b/readline/doc/rlman.texi
+Index: gdb-7.2.90.20110703/readline/doc/rlman.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/rlman.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/rlman.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -4,7 +4,6 @@
  @settitle GNU Readline Library
  @comment %**end of header (This is for running Texinfo on a region.)
@@ -8331,7 +8405,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @include version.texi
  
-@@ -14,7 +13,7 @@ This manual describes the GNU Readline Library
+@@ -14,7 +13,7 @@ This manual describes the GNU Readline L
  consistency of user interface across discrete programs which provide
  a command line interface.
  
@@ -8387,8 +8461,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @include fdl.texi
  
---- a/readline/doc/rltech.texi
-+++ b/readline/doc/rltech.texi
+Index: gdb-7.2.90.20110703/readline/doc/rltech.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/rltech.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/rltech.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -1,14 +1,13 @@
  @comment %**start of header (This is for running Texinfo on a region.)
  @setfilename rltech.info
@@ -8405,7 +8481,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  Permission is granted to make and distribute verbatim copies of
  this manual provided the copyright notice and this permission notice
-@@ -351,6 +350,12 @@ The @code{rl_set_prompt()} function (@pxref{Redisplay}) may
+@@ -351,6 +350,12 @@ The @code{rl_set_prompt()} function (@px
  be used to modify the prompt string after calling @code{readline()}.
  @end deftypevar
  
@@ -8448,7 +8524,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end deftypefun
  
  @deftypefun Keymap rl_copy_keymap (Keymap map)
-@@ -617,7 +636,13 @@ the Meta digits bound to produce numeric arguments.
+@@ -617,7 +636,13 @@ the Meta digits bound to produce numeric
  @end deftypefun
  
  @deftypefun void rl_discard_keymap (Keymap keymap)
@@ -8463,7 +8539,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end deftypefun
  
  Readline has several internal keymaps.  These functions allow you to
-@@ -793,7 +818,8 @@ Print the names of all bindable Readline functions to @code{rl_outstream}.
+@@ -793,7 +818,8 @@ Print the names of all bindable Readline
  @deftypefun {const char **} rl_funmap_names (void)
  Return a NULL terminated array of known function names.  The array is
  sorted.  The array itself is allocated, but not the strings inside.  You
@@ -8473,7 +8549,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end deftypefun
  
  @deftypefun int rl_add_funmap_entry (const char *name, rl_command_func_t *function)
-@@ -1033,8 +1059,10 @@ pending input has not already been read with @code{rl_read_key()}.
+@@ -1033,8 +1059,10 @@ pending input has not already been read 
  @deftypefun int rl_set_keyboard_input_timeout (int u)
  While waiting for keyboard input in @code{rl_read_key()}, Readline will
  wait for @var{u} microseconds for input before calling any function
@@ -8513,7 +8589,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @deftypefun void rl_replace_line (const char *text, int clear_undo)
  Replace the contents of @code{rl_line_buffer} with @var{text}.
  The point and mark are preserved, if possible.
-@@ -1082,7 +1130,7 @@ If @var{clear_undo} is non-zero, the undo list associated with the
+@@ -1082,7 +1130,7 @@ If @var{clear_undo} is non-zero, the und
  current line is cleared.
  @end deftypefun
  
@@ -8522,7 +8598,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  Ensure that @code{rl_line_buffer} has enough space to hold @var{len}
  characters, possibly reallocating it if necessary.
  @end deftypefun
-@@ -1109,6 +1157,9 @@ of strings, in argv format, such as a list of completion matches.
+@@ -1109,6 +1157,9 @@ of strings, in argv format, such as a li
  is the length of the longest string in @code{matches}.  This function uses
  the setting of @code{print-completions-horizontally} to select how the
  matches are displayed (@pxref{Readline Init File Syntax}).
@@ -8532,7 +8608,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end deftypefun
  
  The following are implemented as macros, defined in @code{chardefs.h}.
-@@ -1392,6 +1443,13 @@ call @code{rl_resize_terminal()} or @code{rl_set_screen_size()} to force
+@@ -1392,6 +1443,13 @@ call @code{rl_resize_terminal()} or @cod
  Readline to update its idea of the terminal size when a @code{SIGWINCH}
  is received.
  
@@ -8602,7 +8678,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end deftypevar
  
  @deftypevar {rl_compdisp_func_t *} rl_completion_display_matches_hook
-@@ -1822,6 +1914,15 @@ if the application's completion function returns no matches.
+@@ -1822,6 +1914,15 @@ if the application's completion function
  It should be set only by an application's completion function.
  @end deftypevar
  
@@ -8618,7 +8694,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @deftypevar int rl_completion_type
  Set to a character describing the type of completion Readline is currently
  attempting; see the description of @code{rl_complete_internal()}
-@@ -1831,6 +1932,13 @@ completion function is called, allowing such functions to present
+@@ -1831,6 +1932,13 @@ completion function is called, allowing 
  the same interface as @code{rl_complete()}.
  @end deftypevar
  
@@ -8832,8 +8908,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  int
  valid_argument (caller, arg)
       char *caller, *arg;
---- a/readline/doc/rluser.texi
-+++ b/readline/doc/rluser.texi
+Index: gdb-7.2.90.20110703/readline/doc/rluser.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/rluser.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/rluser.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -1,7 +1,6 @@
  @comment %**start of header (This is for running Texinfo on a region.)
  @setfilename rluser.info
@@ -8842,7 +8920,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @ignore
  This file documents the end user interface to the GNU command line
-@@ -10,7 +9,7 @@ use these features.  There is a document entitled "readline.texinfo"
+@@ -10,7 +9,7 @@ use these features.  There is a document
  which contains both end-user and programmer documentation for the
  GNU Readline Library.
  
@@ -8868,7 +8946,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end ifset
  
  @menu
-@@ -336,7 +345,9 @@ file is taken from the value of the shell variable @env{INPUTRC}.  If
+@@ -336,7 +345,9 @@ file is taken from the value of the shel
  @ifclear BashFeatures
  file is taken from the value of the environment variable @env{INPUTRC}.  If
  @end ifclear
@@ -8879,7 +8957,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  When a program which uses the Readline library starts up, the
  init file is read, and the key bindings are set.
-@@ -420,11 +431,34 @@ The string to insert at the beginning of the line when the
+@@ -420,11 +431,34 @@ The string to insert at the beginning of
  @code{insert-comment} command is executed.  The default value
  is @code{"#"}.
  
@@ -8914,7 +8992,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @item completion-query-items
  @vindex completion-query-items
  The number of possible completions that determines when the user is
-@@ -456,12 +490,23 @@ key bindings is used.  By default, Readline starts up in Emacs editing
+@@ -456,12 +490,23 @@ key bindings is used.  By default, Readl
  mode, where the keystrokes are most similar to Emacs.  This variable can be
  set to either @samp{emacs} or @samp{vi}.
  
@@ -8938,7 +9016,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @item expand-tilde
  @vindex expand-tilde
  If set to @samp{on}, tilde expansion is performed when Readline
-@@ -469,10 +514,16 @@ attempts word completion.  The default is @samp{off}.
+@@ -469,10 +514,16 @@ attempts word completion.  The default i
  
  @item history-preserve-point
  @vindex history-preserve-point
@@ -8975,7 +9053,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @item output-meta
  @vindex output-meta
  If set to @samp{on}, Readline will display characters with the
-@@ -556,6 +614,13 @@ If set to @samp{on}, Readline will display completions with matches
+@@ -556,6 +614,13 @@ If set to @samp{on}, Readline will displ
  sorted horizontally in alphabetical order, rather than down the screen.
  The default is @samp{off}.
  
@@ -8989,7 +9067,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @item show-all-if-ambiguous
  @vindex show-all-if-ambiguous
  This alters the default behavior of the completion functions.  If
-@@ -575,6 +640,20 @@ a common prefix) cause the matches to be listed immediately instead
+@@ -575,6 +640,20 @@ a common prefix) cause the matches to be
  of ringing the bell.
  The default value is @samp{off}.
  
@@ -9052,7 +9130,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @item clear-screen (C-l)
  Clear the screen and redraw the current line,
-@@ -1029,10 +1120,14 @@ as if the @samp{!@var{n}} history expansion had been specified.
+@@ -1029,10 +1120,14 @@ as if the @samp{!@var{n}} history expans
  
  @item yank-last-arg (M-. or M-_)
  Insert last argument to the previous command (the last word of the
@@ -9070,7 +9148,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  The history expansion facilities are used to extract the last argument,
  as if the @samp{!$} history expansion had been specified.
  
-@@ -1138,6 +1233,17 @@ Word boundaries are the same as @code{forward-word}.
+@@ -1138,6 +1233,17 @@ Word boundaries are the same as @code{fo
  Kill the word behind point.
  Word boundaries are the same as @code{backward-word}.
  
@@ -9110,7 +9188,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @item delete-char-or-list ()
  Deletes the character under the cursor if not at the beginning or
  end of the line (like @code{delete-char}).
-@@ -1293,6 +1407,11 @@ Attempt completion on the text before point, comparing
+@@ -1293,6 +1407,11 @@ Attempt completion on the text before po
  the text against lines from the history list for possible
  completion matches.
  
@@ -9122,7 +9200,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @item complete-into-braces (M-@{)
  Perform filename completion and insert the list of possible completions
  enclosed within braces so the list is available to the shell
-@@ -1372,6 +1491,15 @@ A character is read and point is moved to the previous occurrence
+@@ -1372,6 +1491,15 @@ A character is read and point is moved t
  of that character.  A negative count searches for subsequent
  occurrences.
  
@@ -9147,7 +9225,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @ifset BashFeatures
  In order to switch interactively between @code{emacs} and @code{vi}
-@@ -1515,10 +1643,15 @@ the programmable completion facilities are invoked.
+@@ -1515,10 +1643,15 @@ the programmable completion facilities a
  First, the command name is identified.
  If a compspec has been defined for that command, the
  compspec is used to generate the list of possible completions for the word.
@@ -9163,7 +9241,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  Once a compspec has been found, it is used to generate the list of
  matching words.
-@@ -1555,9 +1688,9 @@ completed, and the matching words become the possible completions.
+@@ -1555,9 +1688,9 @@ completed, and the matching words become
  
  After these matches have been generated, any shell function or command
  specified with the @option{-F} and @option{-C} options is invoked.
@@ -9185,7 +9263,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  (@pxref{Programmable Completion Builtins}), to generate the matches.
  It must put the possible completions in the @env{COMPREPLY} array
  variable.
-@@ -1622,6 +1755,30 @@ to completed names which are symbolic links to directories, subject to
+@@ -1622,6 +1755,30 @@ to completed names which are symbolic li
  the value of the @var{mark-directories} Readline variable, regardless
  of the setting of the @var{mark-symlinked-directories} Readline variable.
  
@@ -9249,7 +9327,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  Other options, if specified, have the following meanings.
  The arguments to the @option{-G}, @option{-W}, and @option{-X} options
-@@ -1702,9 +1866,10 @@ Perform directory name completion if the compspec generates no matches.
+@@ -1702,9 +1866,10 @@ Perform directory name completion if the
  
  @item filenames
  Tell Readline that the compspec generates filenames, so it can perform any
@@ -9263,7 +9341,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @item nospace
  Tell Readline not to append a space (the default) to words completed at
-@@ -1798,17 +1963,6 @@ User names.  May also be specified as @option{-u}.
+@@ -1798,17 +1963,6 @@ User names.  May also be specified as @o
  Names of all shell variables.  May also be specified as @option{-v}.
  @end table
  
@@ -9298,7 +9376,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @item -P @var{prefix}
  @var{prefix} is added at the beginning of each possible completion
-@@ -1834,6 +1984,21 @@ after all other options have been applied.
+@@ -1834,6 +1984,21 @@ after all other options have been applie
  @item -S @var{suffix}
  @var{suffix} is appended to each possible completion
  after all other options have been applied.
@@ -9320,7 +9398,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end table
  
  The return value is true unless an invalid option is supplied, an option
-@@ -1842,5 +2007,31 @@ argument, an attempt is made to remove a completion specification for
+@@ -1842,5 +2007,31 @@ argument, an attempt is made to remove a
  a @var{name} for which no specification exists, or
  an error occurs adding a completion specification.
  
@@ -9352,8 +9430,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end table
 +
  @end ifset
---- a/readline/doc/rluserman.texi
-+++ b/readline/doc/rluserman.texi
+Index: gdb-7.2.90.20110703/readline/doc/rluserman.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/rluserman.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/rluserman.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -4,8 +4,6 @@
  @settitle GNU Readline Library
  @comment %**end of header (This is for running Texinfo on a region.)
@@ -9363,7 +9443,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @include version.texi
  
  @copying
-@@ -14,7 +12,7 @@ This manual describes the end user interface of the GNU Readline Library
+@@ -14,7 +12,7 @@ This manual describes the end user inter
  consistency of user interface across discrete programs which provide
  a command line interface.
  
@@ -9395,7 +9475,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  @end quotation
  @end copying
  
-@@ -70,18 +69,14 @@ programs which provide a command line interface.
+@@ -70,18 +69,14 @@ programs which provide a command line in
  
  @menu
  * Command Line Editing::	   GNU Readline User's Manual.
@@ -9417,8 +9497,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  @include fdl.texi
  
---- a/readline/doc/texi2dvi
-+++ b/readline/doc/texi2dvi
+Index: gdb-7.2.90.20110703/readline/doc/texi2dvi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/texi2dvi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/texi2dvi	2011-07-03 10:41:21.000000000 +0200
 @@ -5,20 +5,18 @@
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003 Free Software Foundation, Inc.
@@ -9450,8 +9532,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #
  # Original author: Noah Friedman <friedman@gnu.org>.
  #
---- a/readline/doc/texi2html
-+++ b/readline/doc/texi2html
+Index: gdb-7.2.90.20110703/readline/doc/texi2html
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/texi2html	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/texi2html	2011-07-03 10:41:21.000000000 +0200
 @@ -7,20 +7,19 @@
  #
  #    Copyright (C) 1999, 2000  Free Software Foundation, Inc.
@@ -9460,15 +9544,21 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -#    it under the terms of the GNU General Public License as published by
 -#    the Free Software Foundation; either version 2 of the License, or
 -#    (at your option) any later version.
-+#   This program is free software: you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation, either version 3 of the License, or
-+#   (at your option) any later version.
- #
+-#
 -#    This program is distributed in the hope that it will be useful,
 -#    but WITHOUT ANY WARRANTY; without even the implied warranty of
 -#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -#    GNU General Public License for more details.
+-#
+-#    You should have received a copy of the GNU General Public License
+-#    along with this program; if not, write to the Free Software
+-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-# 
++#   This program is free software: you can redistribute it and/or modify
++#   it under the terms of the GNU General Public License as published by
++#   the Free Software Foundation, either version 3 of the License, or
++#   (at your option) any later version.
++#
 +#   This program is distributed in the hope that it will be useful,
 +#   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -9476,11 +9566,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +#
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
--#    You should have received a copy of the GNU General Public License
--#    along with this program; if not, write to the Free Software
--#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--# 
++#
  #-##############################################################################
  
  # This requires perl version 5 or higher
@@ -9493,8 +9579,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		  if ($level == 1 && !$first_index_chapter && 
  		      $name =~ /index/i);
  		if ($in_top && /heading/){
---- a/readline/doc/version.texi
-+++ b/readline/doc/version.texi
+Index: gdb-7.2.90.20110703/readline/doc/version.texi
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/doc/version.texi	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/doc/version.texi	2011-07-03 10:41:21.000000000 +0200
 @@ -1,10 +1,10 @@
  @ignore
 -Copyright (C) 1988-2005 Free Software Foundation, Inc. 
@@ -9512,8 +9600,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
 -@set LASTCHANGE Fri Nov 11 19:50:51 EST 2005
 +@set LASTCHANGE Mon Sep  6 22:07:10 EDT 2010
---- a/readline/emacs_keymap.c
-+++ b/readline/emacs_keymap.c
+Index: gdb-7.2.90.20110703/readline/emacs_keymap.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/emacs_keymap.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/emacs_keymap.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* emacs_keymap.c -- the keymap for emacs_mode in readline (). */
  
@@ -9551,8 +9641,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if !defined (BUFSIZ)
  #include <stdio.h>
---- a/readline/examples/ChangeLog.gdb
-+++ b/readline/examples/ChangeLog.gdb
+Index: gdb-7.2.90.20110703/readline/examples/ChangeLog.gdb
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/ChangeLog.gdb	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/ChangeLog.gdb	2011-07-03 10:41:21.000000000 +0200
 @@ -1,3 +1,7 @@
 +2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
@@ -9561,8 +9653,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  2006-04-24  Daniel Jacobowitz  <dan@codesourcery.com>
  
  	Imported readline 5.1, and upstream patches 001-004.
---- a/readline/examples/Inputrc
-+++ b/readline/examples/Inputrc
+Index: gdb-7.2.90.20110703/readline/examples/Inputrc
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/Inputrc	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/Inputrc	2011-07-03 10:41:21.000000000 +0200
 @@ -4,21 +4,21 @@
  # on which program is running, or what terminal is active.
  #
@@ -9597,28 +9691,22 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  # In all programs, all terminals, make sure this is bound.
  "\C-x\C-r": re-read-init-file
---- a/readline/examples/Makefile.in
-+++ b/readline/examples/Makefile.in
+Index: gdb-7.2.90.20110703/readline/examples/Makefile.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/Makefile.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/Makefile.in	2011-07-03 10:41:21.000000000 +0200
 @@ -1,30 +1,46 @@
  #
  # This is the Makefile for the readline examples subdirectory.
  #
 -# Copyright (C) 1994 Free Software Foundation, Inc.
 +# Copyright (C) 1994,2008,2009 Free Software Foundation, Inc.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
 +#   This program is free software: you can redistribute it and/or modify
 +#   it under the terms of the GNU General Public License as published by
 +#   the Free Software Foundation, either version 3 of the License, or
 +#   (at your option) any later version.
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
++
 +#   This program is distributed in the hope that it will be useful,
 +#   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -9627,6 +9715,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
@@ -9726,8 +9824,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	$(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
  
  clean mostlyclean:
---- /dev/null
-+++ b/readline/examples/autoconf/BASH_CHECK_LIB_TERMCAP
+Index: gdb-7.2.90.20110703/readline/examples/autoconf/BASH_CHECK_LIB_TERMCAP
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/examples/autoconf/BASH_CHECK_LIB_TERMCAP	2011-07-03 10:41:21.000000000 +0200
 @@ -0,0 +1,40 @@
 +AC_DEFUN([BASH_CHECK_LIB_TERMCAP],
 +[
@@ -9769,8 +9869,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +TERMCAP_DEP=
 +fi
 +])
---- /dev/null
-+++ b/readline/examples/autoconf/RL_LIB_READLINE_VERSION
+Index: gdb-7.2.90.20110703/readline/examples/autoconf/RL_LIB_READLINE_VERSION
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/examples/autoconf/RL_LIB_READLINE_VERSION	2011-07-03 10:41:21.000000000 +0200
 @@ -0,0 +1,118 @@
 +dnl need: prefix exec_prefix libdir includedir CC TERMCAP_LIB
 +dnl require:
@@ -9890,8 +9992,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +
 +fi
 +])
---- /dev/null
-+++ b/readline/examples/autoconf/wi_LIB_READLINE
+Index: gdb-7.2.90.20110703/readline/examples/autoconf/wi_LIB_READLINE
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/examples/autoconf/wi_LIB_READLINE	2011-07-03 10:41:21.000000000 +0200
 @@ -0,0 +1,76 @@
 +dnl Borut Razem
 +dnl
@@ -9969,8 +10073,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +    LIBS="$ac_save_LIBS"
 +  fi
 +])
---- a/readline/examples/excallback.c
-+++ b/readline/examples/excallback.c
+Index: gdb-7.2.90.20110703/readline/examples/excallback.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/excallback.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/excallback.c	2011-07-03 10:41:21.000000000 +0200
 @@ -32,6 +32,9 @@ Let me know what you think.
  
  Jeff
@@ -9981,8 +10087,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if defined (HAVE_CONFIG_H)
  #include <config.h>
---- a/readline/examples/fileman.c
-+++ b/readline/examples/fileman.c
+Index: gdb-7.2.90.20110703/readline/examples/fileman.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/fileman.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/fileman.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,22 +1,23 @@
 -/* Copyright (C) 1987-2002 Free Software Foundation, Inc.
 +/* fileman.c - file manager example for readline library. */
@@ -10037,8 +10145,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* The names of functions that actually do the manipulation. */
  int com_list PARAMS((char *));
---- a/readline/examples/histexamp.c
-+++ b/readline/examples/histexamp.c
+Index: gdb-7.2.90.20110703/readline/examples/histexamp.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/histexamp.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/histexamp.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,22 +1,23 @@
 -/* Copyright (C) 1987-2002 Free Software Foundation, Inc.
 +/* histexamp.c - history library example program. */
@@ -10075,8 +10185,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #include <stdio.h>
  
---- a/readline/examples/manexamp.c
-+++ b/readline/examples/manexamp.c
+Index: gdb-7.2.90.20110703/readline/examples/manexamp.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/manexamp.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/manexamp.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* manexamp.c -- The examples which appear in the documentation are here. */
  
@@ -10113,8 +10225,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #include <stdio.h>
  #include <readline/readline.h>
---- a/readline/examples/readlinebuf.h
-+++ b/readline/examples/readlinebuf.h
+Index: gdb-7.2.90.20110703/readline/examples/readlinebuf.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/readlinebuf.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/readlinebuf.h	2011-07-03 10:41:21.000000000 +0200
 @@ -8,7 +8,7 @@
   *
   * This program is free software; you can redistribute it and/or modify
@@ -10124,8 +10238,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
   * (at your option) any later version.
   *
   * This program is distributed in the hope that it will be useful,
---- a/readline/examples/rl.c
-+++ b/readline/examples/rl.c
+Index: gdb-7.2.90.20110703/readline/examples/rl.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rl.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rl.c	2011-07-03 10:41:21.000000000 +0200
 @@ -5,25 +5,24 @@
   * usage: rl [-p prompt] [-u unit] [-d default] [-n nchars]
   */
@@ -10163,8 +10279,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if defined (HAVE_CONFIG_H)
  #  include <config.h>
---- a/readline/examples/rlcat.c
-+++ b/readline/examples/rlcat.c
+Index: gdb-7.2.90.20110703/readline/examples/rlcat.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlcat.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlcat.c	2011-07-03 10:41:21.000000000 +0200
 @@ -4,25 +4,24 @@
   * usage: rlcat
   */
@@ -10202,8 +10320,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if defined (HAVE_CONFIG_H)
  #  include <config.h>
---- /dev/null
-+++ b/readline/examples/rlevent.c
+Index: gdb-7.2.90.20110703/readline/examples/rlevent.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/examples/rlevent.c	2011-07-03 10:41:21.000000000 +0200
 @@ -0,0 +1,166 @@
 +/*
 + * rl - command-line interface to read a line from the standard input
@@ -10371,8 +10491,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +  printf ("%s\n", temp);
 +  exit (0);
 +}
---- a/readline/examples/rlfe/ChangeLog
-+++ b/readline/examples/rlfe/ChangeLog
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/ChangeLog
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/ChangeLog	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/ChangeLog	2011-07-03 10:41:21.000000000 +0200
 @@ -1,14 +1,3 @@
 -2009-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 -
@@ -10388,8 +10510,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  2004-11-04  Per Bothner  <per@bothner.com>
  
  	* pty.c:  Import from screen-4.0.2.
---- a/readline/examples/rlfe/Makefile.in
-+++ b/readline/examples/rlfe/Makefile.in
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/Makefile.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/Makefile.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/Makefile.in	2011-07-03 10:41:21.000000000 +0200
 @@ -25,7 +25,7 @@ CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
  #LDFLAGS = -L$(READLINE_DIR)
@@ -10432,8 +10556,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  ###############################################################################
  
  ### Dependencies:
---- a/readline/examples/rlfe/config.h.in
-+++ b/readline/examples/rlfe/config.h.in
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/config.h.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/config.h.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/config.h.in	2011-07-03 10:41:21.000000000 +0200
 @@ -373,3 +373,7 @@
  #undef PTYRANGE1
  
@@ -10442,8 +10568,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +#undef HAVE_SYS_STROPTS_H
 +
 +#undef HAVE_SYS_WAIT_H
---- a/readline/examples/rlfe/configure
-+++ b/readline/examples/rlfe/configure
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/configure
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/configure	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/configure	2011-07-03 10:41:21.000000000 +0200
 @@ -552,6 +552,42 @@ PACKAGE_BUGREPORT=
  PACKAGE_URL=
  
@@ -10764,8 +10892,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  ac_config_files="$ac_config_files Makefile"
  
  cat >confcache <<\_ACEOF
---- a/readline/examples/rlfe/configure.in
-+++ b/readline/examples/rlfe/configure.in
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/configure.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/configure.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/configure.in	2011-07-03 10:41:21.000000000 +0200
 @@ -437,4 +437,6 @@ main()
  
  fi
@@ -10773,8 +10903,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +AC_CHECK_HEADERS(sys/stropts.h sys/wait.h)
 +
  AC_OUTPUT(Makefile)
---- a/readline/examples/rlfe/extern.h
-+++ b/readline/examples/rlfe/extern.h
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/extern.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/extern.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/extern.h	2011-07-03 10:41:21.000000000 +0200
 @@ -27,7 +27,14 @@
  #define __attribute__(x)
  #endif
@@ -10791,8 +10923,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  extern int   OpenPTY __P((char **));
  extern void  InitPTY __P((int));
 -
---- a/readline/examples/rlfe/os.h
-+++ b/readline/examples/rlfe/os.h
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/os.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/os.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/os.h	2011-07-03 10:41:21.000000000 +0200
 @@ -186,7 +186,7 @@ extern int errno;
   *    terminal handling
   */
@@ -10802,13 +10936,15 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  # include <termios.h>
  # ifdef hpux
  #  include <bsdtty.h>
-@@ -527,4 +527,3 @@ typedef struct fd_set { int fds_bits[1]; } fd_set;
+@@ -527,4 +527,3 @@ typedef struct fd_set { int fds_bits[1];
   * how many characters your pty's can buffer.
   */
  #define IOSIZE		4096
 -
---- a/readline/examples/rlfe/pty.c
-+++ b/readline/examples/rlfe/pty.c
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/pty.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/pty.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/pty.c	2011-07-03 10:41:21.000000000 +0200
 @@ -20,13 +20,15 @@
   *
   ****************************************************************
@@ -10840,8 +10976,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  }
  #endif
 -
---- a/readline/examples/rlfe/rlfe.c
-+++ b/readline/examples/rlfe/rlfe.c
+Index: gdb-7.2.90.20110703/readline/examples/rlfe/rlfe.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlfe/rlfe.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlfe/rlfe.c	2011-07-03 10:41:21.000000000 +0200
 @@ -73,6 +73,11 @@
  #include <termios.h>
  
@@ -10884,8 +11022,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
      }
  
    if (!vi)
---- a/readline/examples/rltest.c
-+++ b/readline/examples/rltest.c
+Index: gdb-7.2.90.20110703/readline/examples/rltest.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rltest.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rltest.c	2011-07-03 10:41:21.000000000 +0200
 @@ -4,25 +4,24 @@
  /*								    */
  /* **************************************************************** */
@@ -10923,8 +11063,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if defined (HAVE_CONFIG_H)
  #include <config.h>
---- a/readline/examples/rlversion.c
-+++ b/readline/examples/rlversion.c
+Index: gdb-7.2.90.20110703/readline/examples/rlversion.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/examples/rlversion.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/examples/rlversion.c	2011-07-03 10:41:21.000000000 +0200
 @@ -2,25 +2,24 @@
   * rlversion -- print out readline's version number
   */
@@ -10962,8 +11104,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if defined (HAVE_CONFIG_H)
  #  include <config.h>
---- a/readline/funmap.c
-+++ b/readline/funmap.c
+Index: gdb-7.2.90.20110703/readline/funmap.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/funmap.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/funmap.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* funmap.c -- attach names to functions. */
  
@@ -11058,8 +11202,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    { "vi-fword", rl_vi_fword },
    { "vi-goto-mark", rl_vi_goto_mark },
    { "vi-insert-beg", rl_vi_insert_beg },
---- a/readline/histexpand.c
-+++ b/readline/histexpand.c
+Index: gdb-7.2.90.20110703/readline/histexpand.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/histexpand.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/histexpand.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* histexpand.c -- history expansion. */
  
@@ -11082,15 +11228,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   History is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   History is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with History.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -11119,7 +11266,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  static char *quote_breaks PARAMS((char *));
  
-@@ -246,7 +245,7 @@ get_history_event (string, caller_index, delimiting_quote)
+@@ -246,7 +245,7 @@ get_history_event (string, caller_index,
  
  #define FAIL_SEARCH() \
    do { \
@@ -11128,7 +11275,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    } while (0)
  
    /* If there is no search string, try to use the previous search string,
-@@ -255,7 +254,7 @@ get_history_event (string, caller_index, delimiting_quote)
+@@ -255,7 +254,7 @@ get_history_event (string, caller_index,
      {
        if (search_string)
          {
@@ -11137,7 +11284,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
            temp = savestring (search_string);
          }
        else
-@@ -286,7 +285,7 @@ get_history_event (string, caller_index, delimiting_quote)
+@@ -286,7 +285,7 @@ get_history_event (string, caller_index,
  	      search_match = history_find_word (entry->line, local_index);
  	    }
  	  else
@@ -11146,7 +11293,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  	  return (entry->line);
  	}
-@@ -306,16 +305,20 @@ get_history_event (string, caller_index, delimiting_quote)
+@@ -306,16 +305,20 @@ get_history_event (string, caller_index,
  /* Extract the contents of STRING as if it is enclosed in single quotes.
     SINDEX, when passed in, is the offset of the character immediately
     following the opening single quote; on exit, SINDEX is left pointing
@@ -11180,7 +11327,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    subst_rhs = new;
    subst_rhs_len = j;
  }
-@@ -564,12 +567,12 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -564,12 +567,12 @@ history_expand_internal (string, start, 
  #if defined (HANDLE_MULTIBYTE)
        if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
  	{
@@ -11197,7 +11344,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	}
        else
  #endif /* HANDLE_MULTIBYTE */	  
-@@ -582,7 +585,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -582,7 +585,7 @@ history_expand_internal (string, start, 
    if (event == 0)
      {
        *ret_string = hist_error (string, start, i, EVENT_NOT_FOUND);
@@ -11206,7 +11353,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        return (-1);
      }
  
-@@ -596,7 +599,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -596,7 +599,7 @@ history_expand_internal (string, start, 
    if (word_spec == (char *)&error_pointer)
      {
        *ret_string = hist_error (string, starting_index, i, BAD_WORD_SPEC);
@@ -11215,7 +11362,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        return (-1);
      }
  
-@@ -629,8 +632,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -629,8 +632,8 @@ history_expand_internal (string, start, 
  	{
  	default:
  	  *ret_string = hist_error (string, i+1, i+2, BAD_MODIFIER);
@@ -11226,7 +11373,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	  return -1;
  
  	case 'q':
-@@ -655,7 +658,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -655,7 +658,7 @@ history_expand_internal (string, start, 
  	    {
  	      tstr++;
  	      t = savestring (tstr);
@@ -11235,7 +11382,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	      temp = t;
  	    }
  	  break;
-@@ -680,7 +683,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -680,7 +683,7 @@ history_expand_internal (string, start, 
  	  if (tstr)
  	    {
  	      t = savestring (tstr);
@@ -11244,7 +11391,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	      temp = t;
  	    }
  	  break;
-@@ -756,8 +759,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -756,8 +759,8 @@ history_expand_internal (string, start, 
  	    if (subst_lhs_len == 0)
  	      {
  		*ret_string = hist_error (string, starting_index, i, NO_PREV_SUBST);
@@ -11255,7 +11402,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		return -1;
  	      }
  
-@@ -766,8 +769,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -766,8 +769,8 @@ history_expand_internal (string, start, 
  	    if (subst_lhs_len > l_temp)
  	      {
  		*ret_string = hist_error (string, starting_index, i, SUBST_FAILED);
@@ -11266,7 +11413,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		return (-1);
  	      }
  
-@@ -808,7 +811,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -808,7 +811,7 @@ history_expand_internal (string, start, 
  			     temp + si + subst_lhs_len,
  			     l_temp - (si + subst_lhs_len));
  		    new_event[len] = '\0';
@@ -11275,7 +11422,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		    temp = new_event;
  
  		    failed = 0;
-@@ -844,8 +847,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -844,8 +847,8 @@ history_expand_internal (string, start, 
  	      continue;		/* don't want to increment i */
  
  	    *ret_string = hist_error (string, starting_index, i, SUBST_FAILED);
@@ -11286,7 +11433,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	    return (-1);
  	  }
  	}
-@@ -866,7 +869,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -866,7 +869,7 @@ history_expand_internal (string, start, 
        else
  	x = savestring (temp);
  
@@ -11295,7 +11442,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        temp = x;
      }
  
-@@ -874,7 +877,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
+@@ -874,7 +877,7 @@ history_expand_internal (string, start, 
    if (n >= result_len)
      result = (char *)xrealloc (result, n + 2);
    strcpy (result, temp);
@@ -11428,7 +11575,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    if (only_printing)
      {
-@@ -1399,8 +1405,8 @@ history_arg_extract (first, last, string)
+@@ -1399,8 +1405,8 @@ history_arg_extract (first, last, string
      }
  
    for (i = 0; i < len; i++)
@@ -11598,8 +11745,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +  xfree (words);
    return s;
  }
---- a/readline/histfile.c
-+++ b/readline/histfile.c
+Index: gdb-7.2.90.20110703/readline/histfile.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/histfile.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/histfile.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* histfile.c - functions to manipulate the history file. */
  
@@ -11622,15 +11771,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   History is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   History is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with History.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -11709,7 +11859,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    return rv;
  }
  
-@@ -434,9 +440,10 @@ history_do_write (filename, nelements, overwrite)
+@@ -434,9 +440,10 @@ history_do_write (filename, nelements, o
    mode = overwrite ? O_WRONLY|O_CREAT|O_TRUNC|O_BINARY : O_WRONLY|O_APPEND|O_BINARY;
  #endif
    output = history_filename (filename);
@@ -11730,8 +11880,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #endif
    }
  
---- a/readline/histlib.h
-+++ b/readline/histlib.h
+Index: gdb-7.2.90.20110703/readline/histlib.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/histlib.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/histlib.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,23 +1,23 @@
  /* histlib.h -- internal definitions for the history library. */
 -/* Copyright (C) 1989, 1992 Free Software Foundation, Inc.
@@ -11747,7 +11899,9 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
+ 
 -   The Library is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -11757,9 +11911,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+
 +   History is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -11771,8 +11922,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if !defined (_HISTLIB_H_)
  #define _HISTLIB_H_
---- a/readline/history.c
-+++ b/readline/history.c
+Index: gdb-7.2.90.20110703/readline/history.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/history.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/history.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* history.c -- standalone history library */
  
@@ -11795,15 +11948,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   History is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   History is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with History.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -11895,7 +12049,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    
  /* Make the history entry at WHICH have LINE and DATA.  This returns
     the old entry so you can dispose of the data.  In the case of an
-@@ -354,6 +387,51 @@ replace_history_entry (which, line, data)
+@@ -354,6 +387,51 @@ replace_history_entry (which, line, data
    return (old_value);
  }
  
@@ -11956,8 +12110,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  int
  unstifle_history ()
  {
---- a/readline/history.h
-+++ b/readline/history.h
+Index: gdb-7.2.90.20110703/readline/history.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/history.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/history.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,23 +1,23 @@
  /* history.h -- the names of functions that you can call in history. */
 -/* Copyright (C) 1989-2003 Free Software Foundation, Inc.
@@ -11973,7 +12129,9 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
+ 
 -   The Library is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -11983,9 +12141,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+
 +   History is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -11997,8 +12152,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #ifndef _HISTORY_H_
  #define _HISTORY_H_
---- a/readline/histsearch.c
-+++ b/readline/histsearch.c
+Index: gdb-7.2.90.20110703/readline/histsearch.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/histsearch.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/histsearch.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* histsearch.c -- searching the history list. */
  
@@ -12014,7 +12171,9 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
+ 
 -   The Library is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -12024,9 +12183,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+
 +   History is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -12038,8 +12194,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #define READLINE_LIBRARY
  
---- a/readline/input.c
-+++ b/readline/input.c
+Index: gdb-7.2.90.20110703/readline/input.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/input.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/input.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* input.c -- character input functions for readline. */
  
@@ -12313,8 +12471,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
      {
        mb[i] = (char)c;
        memset (&ps, 0, sizeof (mbstate_t));
---- a/readline/isearch.c
-+++ b/readline/isearch.c
+Index: gdb-7.2.90.20110703/readline/isearch.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/isearch.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/isearch.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,29 +1,30 @@
 +/* isearch.c - incremental searching */
 +
@@ -12338,16 +12498,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
--   The Library is distributed in the hope that it will be useful, but
--   WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   General Public License for more details.
--
--   The GNU General Public License is often shipped with GNU software, and
--   is generally kept in a file called COPYING or LICENSE.  If you do not
--   have a copy of the license, write to the Free Software Foundation,
--   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 +   the Free Software Foundation, either version 3 of the License, or
 +   (at your option) any later version.
 +
@@ -12359,11 +12509,20 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +   You should have received a copy of the GNU General Public License
 +   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
 +*/
-+
+ 
+-   The Library is distributed in the hope that it will be useful, but
+-   WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   General Public License for more details.
+-
+-   The GNU General Public License is often shipped with GNU software, and
+-   is generally kept in a file called COPYING or LICENSE.  If you do not
+-   have a copy of the license, write to the Free Software Foundation,
+-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
  #define READLINE_LIBRARY
  
  #if defined (HAVE_CONFIG_H)
-@@ -68,14 +69,14 @@ static void _rl_isearch_fini PARAMS((_rl_search_cxt *));
+@@ -68,14 +69,14 @@ static void _rl_isearch_fini PARAMS((_rl
  static int _rl_isearch_cleanup PARAMS((_rl_search_cxt *, int));
  
  /* Last line found by the current incremental search, so we don't `find'
@@ -12400,7 +12559,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  }
  
  /* Search backwards through the history looking for a string which is typed
-@@ -192,7 +196,7 @@ rl_display_search (search_string, reverse_p, where)
+@@ -192,7 +196,7 @@ rl_display_search (search_string, revers
    strcpy (message + msglen, "': ");
  
    rl_message ("%s", message);
@@ -12418,7 +12577,8 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -  if (c >= 0 && _rl_keymap[c].type == ISFUNC)
 +
 +  if (c < 0)
-+    {
+     {
+-      f = _rl_keymap[c].function;
 +      cxt->sflags |= SF_FAILED;
 +      cxt->history_pos = cxt->last_found_line;
 +      return -1;
@@ -12428,8 +12588,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +     This can be a problem if c == ESC and we want to terminate the
 +     incremental search, so we check */
 +  if (c >= 0 && cxt->keymap[c].type == ISKMAP && strchr (cxt->search_terminators, cxt->lastc) == 0)
-     {
--      f = _rl_keymap[c].function;
++    {
 +      cxt->keymap = FUNCTION_TO_KEYMAP (cxt->keymap, c);
 +      cxt->sflags |= SF_CHGKMAP;
 +      /* XXX - we should probably save this sequence, so we can do
@@ -12485,8 +12644,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	     time rl_read_key is called. */
  	  rl_execute_next (cxt->lastc);
  	  return (0);
---- a/readline/keymaps.c
-+++ b/readline/keymaps.c
+Index: gdb-7.2.90.20110703/readline/keymaps.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/keymaps.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/keymaps.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,23 +1,24 @@
  /* keymaps.c -- Functions and keymaps for the GNU Readline library. */
  
@@ -12502,15 +12663,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   under the terms of the GNU General Public License as published by the
 -   Free Software Foundation; either version 2, or (at your option) any
 -   later version.
-+   Readline is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Readline is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
++   Readline is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Readline is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -12578,8 +12740,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +  rl_discard_keymap (map);
 +  xfree ((char *)map);
 +}
---- a/readline/keymaps.h
-+++ b/readline/keymaps.h
+Index: gdb-7.2.90.20110703/readline/keymaps.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/keymaps.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/keymaps.h	2011-07-03 10:41:21.000000000 +0200
 @@ -2,23 +2,22 @@
  
  /* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
@@ -12627,8 +12791,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
  typedef KEYMAP_ENTRY *Keymap;
  
---- a/readline/kill.c
-+++ b/readline/kill.c
+Index: gdb-7.2.90.20110703/readline/kill.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/kill.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/kill.c	2011-07-03 10:41:21.000000000 +0200
 @@ -2,23 +2,23 @@
  
  /* Copyright (C) 1994 Free Software Foundation, Inc.
@@ -12685,7 +12851,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        rl_kill_ring[slot] = new;
      }
    else
-@@ -582,6 +582,7 @@ rl_yank_nth_arg_internal (count, ignore, history_skip)
+@@ -582,6 +582,7 @@ rl_yank_nth_arg_internal (count, ignore,
    if (!arg || !*arg)
      {
        rl_ding ();
@@ -12693,7 +12859,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        return -1;
      }
  
-@@ -600,7 +601,7 @@ rl_yank_nth_arg_internal (count, ignore, history_skip)
+@@ -600,7 +601,7 @@ rl_yank_nth_arg_internal (count, ignore,
  #endif /* VI_MODE */
  
    rl_insert_text (arg);
@@ -12720,8 +12886,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        CloseClipboard ();
      }
    return (0);
---- a/readline/macro.c
-+++ b/readline/macro.c
+Index: gdb-7.2.90.20110703/readline/macro.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/macro.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/macro.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* macro.c -- keyboard macros for readline. */
  
@@ -12787,8 +12955,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        current_macro = (char *) NULL;
      }
    current_macro_size = current_macro_index = 0;
---- a/readline/mbutil.c
-+++ b/readline/mbutil.c
+Index: gdb-7.2.90.20110703/readline/mbutil.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/mbutil.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/mbutil.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* mbutil.c -- readline multibyte character utility functions */
  
@@ -12827,7 +12997,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #define READLINE_LIBRARY
  
  #if defined (HAVE_CONFIG_H)
-@@ -77,7 +77,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
+@@ -77,7 +77,7 @@ _rl_find_next_mbchar_internal (string, s
       char *string;
       int seed, count, find_non_zero;
  {
@@ -12836,7 +13006,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    mbstate_t ps;
    int point;
    wchar_t wc;
-@@ -91,17 +91,21 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
+@@ -91,17 +91,21 @@ _rl_find_next_mbchar_internal (string, s
      return seed;
  
    point = seed + _rl_adjust_point (string, seed, &ps);
@@ -12862,7 +13032,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	  point++;
  	  count--;
  	  /* reset states. */
-@@ -128,12 +132,10 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
+@@ -128,12 +132,10 @@ _rl_find_next_mbchar_internal (string, s
    if (find_non_zero)
      {
        tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
@@ -12876,8 +13046,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	}
      }
  
---- a/readline/misc.c
-+++ b/readline/misc.c
+Index: gdb-7.2.90.20110703/readline/misc.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/misc.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/misc.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* misc.c -- miscellaneous bindable readline functions. */
  
@@ -13021,8 +13193,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #endif /* VI_MODE */
  
    return 0;
---- a/readline/nls.c
-+++ b/readline/nls.c
+Index: gdb-7.2.90.20110703/readline/nls.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/nls.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/nls.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* nls.c -- skeletal internationalization code. */
  
@@ -13070,8 +13244,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    return (legal_lang_values[i] ? 1 : 0);
  
  #endif /* !HAVE_SETLOCALE */
---- a/readline/parens.c
-+++ b/readline/parens.c
+Index: gdb-7.2.90.20110703/readline/parens.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/parens.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/parens.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
 -/* parens.c -- Implementation of matching parentheses feature. */
 +/* parens.c -- implementation of matching parentheses feature. */
@@ -13139,14 +13315,18 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
        orig_point = rl_point;
        rl_point = match_point;
---- /dev/null
-+++ b/readline/patchlevel
+Index: gdb-7.2.90.20110703/readline/patchlevel
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/patchlevel	2011-07-03 10:41:21.000000000 +0200
 @@ -0,0 +1,3 @@
 +# Do not edit -- exists only for use by patch
 +
 +1
---- a/readline/posixdir.h
-+++ b/readline/posixdir.h
+Index: gdb-7.2.90.20110703/readline/posixdir.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/posixdir.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/posixdir.h	2011-07-03 10:41:21.000000000 +0200
 @@ -4,19 +4,19 @@
  
     This file is part of GNU Bash, the Bourne Again SHell.
@@ -13155,15 +13335,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
-+   Bash is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Bash is distributed in the hope that it will be useful, but WITHOUT
 -   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 -   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 -   License for more details.
++   Bash is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Bash is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -13177,8 +13358,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* This file should be included instead of <dirent.h> or <sys/dir.h>. */
  
---- a/readline/posixjmp.h
-+++ b/readline/posixjmp.h
+Index: gdb-7.2.90.20110703/readline/posixjmp.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/posixjmp.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/posixjmp.h	2011-07-03 10:41:21.000000000 +0200
 @@ -4,19 +4,19 @@
  
     This file is part of GNU Bash, the Bourne Again SHell.
@@ -13187,15 +13370,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
-+   Bash is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Bash is distributed in the hope that it will be useful, but WITHOUT
 -   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 -   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 -   License for more details.
++   Bash is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Bash is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -13209,8 +13393,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #ifndef _POSIXJMP_H_
  #define _POSIXJMP_H_
---- /dev/null
-+++ b/readline/posixselect.h
+Index: gdb-7.2.90.20110703/readline/posixselect.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/posixselect.h	2011-07-03 10:41:21.000000000 +0200
 @@ -0,0 +1,47 @@
 +/* posixselect.h -- wrapper for select(2) includes and definitions */
 +
@@ -13259,8 +13445,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +} while (0)
 +
 +#endif /* _POSIXSELECT_H_ */
---- a/readline/posixstat.h
-+++ b/readline/posixstat.h
+Index: gdb-7.2.90.20110703/readline/posixstat.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/posixstat.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/posixstat.h	2011-07-03 10:41:21.000000000 +0200
 @@ -5,19 +5,19 @@
  
     This file is part of GNU Bash, the Bourne Again SHell.
@@ -13269,15 +13457,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
-+   Bash is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Bash is distributed in the hope that it will be useful, but WITHOUT
 -   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 -   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 -   License for more details.
++   Bash is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Bash is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -13291,8 +13480,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* This file should be included instead of <sys/stat.h>.
     It relies on the local sys/stat.h to work though. */
---- a/readline/readline.c
-+++ b/readline/readline.c
+Index: gdb-7.2.90.20110703/readline/readline.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/readline.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/readline.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,25 @@
  /* readline.c -- a general facility for reading lines of input
     with emacs style editing and completion. */
@@ -13562,7 +13753,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    if (r == 0)			/* success! */
      {
        _rl_keyseq_chain_dispose ();
-@@ -724,6 +780,8 @@ _rl_dispatch_subseq (key, map, got_subseq)
+@@ -724,6 +780,8 @@ _rl_dispatch_subseq (key, map, got_subse
  	     remember the last command executed in this variable. */
  	  if (rl_pending_input == 0 && map[key].function != rl_digit_argument)
  	    rl_last_func = map[key].function;
@@ -13571,7 +13762,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	}
        else if (map[ANYOTHERKEY].function)
  	{
-@@ -778,7 +836,7 @@ _rl_dispatch_subseq (key, map, got_subseq)
+@@ -778,7 +836,7 @@ _rl_dispatch_subseq (key, map, got_subse
  	    {
  	      /* Return 0 only the first time, to indicate success to
  		 _rl_callback_read_char.  The rest of the time, we're called
@@ -13580,7 +13771,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  		 special handling is necessary. */
  	      r = RL_ISSTATE (RL_STATE_MULTIKEY) ? -3 : 0;
  	      cxt = _rl_keyseq_cxt_alloc ();
-@@ -842,7 +900,7 @@ _rl_subseq_result (r, map, key, got_subseq)
+@@ -842,7 +900,7 @@ _rl_subseq_result (r, map, key, got_subs
    Keymap m;
    int type, nt;
    rl_command_func_t *func, *nf;
@@ -13600,8 +13791,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
    bind_arrow_keys_internal (vi_insertion_keymap);
  #endif
  }
---- a/readline/readline.h
-+++ b/readline/readline.h
+Index: gdb-7.2.90.20110703/readline/readline.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/readline.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/readline.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* Readline.h -- the names of functions callable from within readline. */
  
@@ -13652,7 +13845,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* Readline data structures. */
  
-@@ -96,6 +95,7 @@ extern int rl_forward_word PARAMS((int, int));
+@@ -96,6 +95,7 @@ extern int rl_forward_word PARAMS((int, 
  extern int rl_backward_word PARAMS((int, int));
  extern int rl_refresh_line PARAMS((int, int));
  extern int rl_clear_screen PARAMS((int, int));
@@ -13660,7 +13853,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  extern int rl_arrow_keys PARAMS((int, int));
  
  /* Bindable commands for inserting and deleting text. */
-@@ -151,7 +151,9 @@ extern int rl_dump_variables PARAMS((int, int));
+@@ -151,7 +151,9 @@ extern int rl_dump_variables PARAMS((int
  extern int rl_complete PARAMS((int, int));
  extern int rl_possible_completions PARAMS((int, int));
  extern int rl_insert_completions PARAMS((int, int));
@@ -13670,7 +13863,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* Bindable commands for killing and yanking text, and managing the kill ring. */
  extern int rl_kill_word PARAMS((int, int));
-@@ -233,6 +235,7 @@ extern int rl_vi_append_mode PARAMS((int, int));
+@@ -233,6 +235,7 @@ extern int rl_vi_append_mode PARAMS((int
  extern int rl_vi_append_eol PARAMS((int, int));
  extern int rl_vi_eof_maybe PARAMS((int, int));
  extern int rl_vi_insertion_mode PARAMS((int, int));
@@ -13678,7 +13871,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  extern int rl_vi_movement_mode PARAMS((int, int));
  extern int rl_vi_arg_digit PARAMS((int, int));
  extern int rl_vi_change_case PARAMS((int, int));
-@@ -420,6 +423,7 @@ extern int rl_set_keyboard_input_timeout PARAMS((int));
+@@ -420,6 +423,7 @@ extern int rl_set_keyboard_input_timeout
  extern void rl_extend_line_buffer PARAMS((int));
  extern int rl_ding PARAMS((void));
  extern int rl_alphabetic PARAMS((int));
@@ -13686,7 +13879,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  /* Readline signal handling, from signals.c */
  extern int rl_set_signals PARAMS((void));
-@@ -427,7 +431,9 @@ extern int rl_clear_signals PARAMS((void));
+@@ -427,7 +431,9 @@ extern int rl_clear_signals PARAMS((void
  extern void rl_cleanup_after_signal PARAMS((void));
  extern void rl_reset_after_signal PARAMS((void));
  extern void rl_free_line_state PARAMS((void));
@@ -13781,7 +13974,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* If non-zero, a slash will be appended to completed filenames that are
     symbolic links to directory names, subject to the value of the
     mark-directories variable (which is user-settable).  This exists so
-@@ -757,6 +796,10 @@ extern int rl_ignore_completion_duplicates;
+@@ -757,6 +796,10 @@ extern int rl_ignore_completion_duplicat
     completion character will be inserted as any other. */
  extern int rl_inhibit_completion;
  
@@ -13819,8 +14012,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -#define RL_STATE_VIMOTION	0x100000	/* reading vi motion arg */
 -#define RL_STATE_MULTIKEY	0x200000	/* reading multiple-key command */
 -#define RL_STATE_VICMDONCE	0x400000	/* entered vi command mode at least once */
--
--#define RL_STATE_DONE		0x800000	/* done; accepted line */
 +#define RL_STATE_INITIALIZING	0x0000001	/* initializing */
 +#define RL_STATE_INITIALIZED	0x0000002	/* initialization done */
 +#define RL_STATE_TERMPREPPED	0x0000004	/* terminal is prepped */
@@ -13845,13 +14036,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +#define RL_STATE_MULTIKEY	0x0200000	/* reading multiple-key command */
 +#define RL_STATE_VICMDONCE	0x0400000	/* entered vi command mode at least once */
 +#define RL_STATE_REDISPLAYING	0x0800000	/* updating terminal display */
-+
+ 
+-#define RL_STATE_DONE		0x800000	/* done; accepted line */
 +#define RL_STATE_DONE		0x1000000	/* done; accepted line */
  
  #define RL_SETSTATE(x)		(rl_readline_state |= (x))
  #define RL_UNSETSTATE(x)	(rl_readline_state &= ~(x))
---- a/readline/rlconf.h
-+++ b/readline/rlconf.h
+Index: gdb-7.2.90.20110703/readline/rlconf.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rlconf.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rlconf.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,23 @@
  /* rlconf.h -- readline configuration definitions */
  
@@ -13876,15 +14070,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   Readline is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   Readline is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -13905,8 +14100,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* If defined, expand tabs to spaces. */
  #define DISPLAY_TABS
  
---- a/readline/rldefs.h
-+++ b/readline/rldefs.h
+Index: gdb-7.2.90.20110703/readline/rldefs.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rldefs.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rldefs.h	2011-07-03 10:41:21.000000000 +0200
 @@ -2,26 +2,24 @@
     for readline.  This should be included after any files that define
     system-specific constants like _POSIX_VERSION or USG. */
@@ -13932,15 +14129,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   Readline is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   Readline is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -13958,8 +14156,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #if defined (_POSIX_VERSION) && !defined (TERMIOS_MISSING)
  #  define TERMIOS_TTY_DRIVER
  #else
---- a/readline/rlmbutil.h
-+++ b/readline/rlmbutil.h
+Index: gdb-7.2.90.20110703/readline/rlmbutil.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rlmbutil.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rlmbutil.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* rlmbutil.h -- utility functions for multibyte characters. */
  
@@ -14032,8 +14232,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
       /* system is supposed to support XPG5 */
  #    define HANDLE_MULTIBYTE      1
  #  endif
---- a/readline/rlprivate.h
-+++ b/readline/rlprivate.h
+Index: gdb-7.2.90.20110703/readline/rlprivate.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rlprivate.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rlprivate.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,24 @@
  /* rlprivate.h -- functions and variables global to the readline library,
  		  but not intended for use by applications. */
@@ -14155,7 +14357,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* display.c */
  extern int rl_display_fixed;
  
-@@ -206,6 +242,7 @@ extern void _rl_callback_data_dispose PARAMS((_rl_callback_generic_arg *));
+@@ -206,6 +242,7 @@ extern void _rl_callback_data_dispose PA
  /* bind.c */
  
  /* complete.c */
@@ -14163,7 +14365,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  extern char _rl_find_completion_word PARAMS((int *, int *));
  extern void _rl_free_match_list PARAMS((char **));
  
-@@ -261,6 +298,8 @@ extern void _rl_start_using_history PARAMS((void));
+@@ -261,6 +298,8 @@ extern void _rl_start_using_history PARA
  extern int _rl_free_saved_history_line PARAMS((void));
  extern void _rl_set_insert_mode PARAMS((int, int));
  
@@ -14172,7 +14374,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* nls.c */
  extern int _rl_init_eightbit PARAMS((void));
  
-@@ -281,6 +320,14 @@ extern int _rl_restore_tty_signals PARAMS((void));
+@@ -281,6 +320,14 @@ extern int _rl_restore_tty_signals PARAM
  /* search.c */
  extern int _rl_nsearch_callback PARAMS((_rl_search_cxt *));
  
@@ -14187,7 +14389,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  /* terminal.c */
  extern void _rl_get_screen_size PARAMS((int, int));
  extern int _rl_init_terminal_io PARAMS((const char *));
-@@ -298,6 +345,7 @@ extern void _rl_set_cursor PARAMS((int, int));
+@@ -298,6 +345,7 @@ extern void _rl_set_cursor PARAMS((int, 
  /* text.c */
  extern void _rl_fix_point PARAMS((int));
  extern int _rl_replace_text PARAMS((const char *, int, int));
@@ -14195,7 +14397,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  extern int _rl_insert_char PARAMS((int, int));
  extern int _rl_overwrite_char PARAMS((int, int));
  extern int _rl_overwrite_rubout PARAMS((int, int));
-@@ -309,8 +357,25 @@ extern int _rl_char_search_internal PARAMS((int, int, int));
+@@ -309,8 +357,25 @@ extern int _rl_char_search_internal PARA
  #endif
  extern int _rl_set_mark_at_pos PARAMS((int));
  
@@ -14221,7 +14423,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  extern char *_rl_strindex PARAMS((const char *, const char *));
  extern int _rl_qsort_string_compare PARAMS((char **, char **));
  extern int (_rl_uppercase_p) PARAMS((int));
-@@ -327,14 +392,15 @@ extern void _rl_vi_reset_last PARAMS((void));
+@@ -327,14 +392,15 @@ extern void _rl_vi_reset_last PARAMS((vo
  extern void _rl_vi_set_last PARAMS((int, int, int));
  extern int _rl_vi_textmod_command PARAMS((int));
  extern void _rl_vi_done_inserting PARAMS((void));
@@ -14318,8 +14520,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +extern _rl_vimotion_cxt *_rl_vimvcxt;
  
  #endif /* _RL_PRIVATE_H_ */
---- a/readline/rlshell.h
-+++ b/readline/rlshell.h
+Index: gdb-7.2.90.20110703/readline/rlshell.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rlshell.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rlshell.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* rlshell.h -- utility functions normally provided by bash. */
  
@@ -14357,8 +14561,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if !defined (_RL_SHELL_H_)
  #define _RL_SHELL_H_
---- a/readline/rlstdc.h
-+++ b/readline/rlstdc.h
+Index: gdb-7.2.90.20110703/readline/rlstdc.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rlstdc.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rlstdc.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,23 +1,23 @@
 -/* stdc.h -- macros to make source compile on both ANSI C and K&R C
 -   compilers. */
@@ -14375,15 +14581,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
-+   Readline is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Bash is distributed in the hope that it will be useful, but WITHOUT
 -   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 -   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
 -   License for more details.
++   Readline is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Readline is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14397,8 +14604,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if !defined (_RL_STDC_H_)
  #define _RL_STDC_H_
---- a/readline/rltty.c
-+++ b/readline/rltty.c
+Index: gdb-7.2.90.20110703/readline/rltty.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rltty.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rltty.c	2011-07-03 10:41:21.000000000 +0200
 @@ -3,23 +3,23 @@
  
  /* Copyright (C) 1992-2005 Free Software Foundation, Inc.
@@ -14544,7 +14753,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #if defined (TIOCLSET)
    if (tiop->flags & LFLAG_SET)
-@@ -302,7 +237,8 @@ prepare_terminal_settings (meta_flag, oldtio, tiop)
+@@ -302,7 +237,8 @@ prepare_terminal_settings (meta_flag, ol
       int meta_flag;
       TIOTYPE oldtio, *tiop;
  {
@@ -14597,7 +14806,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	  tiop->c_lflag &= ~FLUSHO;
  	  break;
  #else
-@@ -580,7 +516,10 @@ prepare_terminal_settings (meta_flag, oldtio, tiop)
+@@ -580,7 +516,10 @@ prepare_terminal_settings (meta_flag, ol
       int meta_flag;
       TIOTYPE oldtio, *tiop;
  {
@@ -14669,8 +14878,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    tty = fileno (rl_instream);
  
---- a/readline/rltty.h
-+++ b/readline/rltty.h
+Index: gdb-7.2.90.20110703/readline/rltty.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rltty.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rltty.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,23 @@
  /* rltty.h - tty driver-related definitions used by some library files. */
  
@@ -14695,15 +14906,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   Readline is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   Readline is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -14718,8 +14930,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -extern void _rl_release_sigint PARAMS((void));
 -
  #endif /* _RLTTY_H_ */
---- a/readline/rltypedefs.h
-+++ b/readline/rltypedefs.h
+Index: gdb-7.2.90.20110703/readline/rltypedefs.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rltypedefs.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rltypedefs.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* rltypedefs.h -- Type declarations for readline functions. */
  
@@ -14757,8 +14971,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  #ifndef _RL_TYPEDEFS_H_
  #define _RL_TYPEDEFS_H_
---- a/readline/rlwinsize.h
-+++ b/readline/rlwinsize.h
+Index: gdb-7.2.90.20110703/readline/rlwinsize.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/rlwinsize.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/rlwinsize.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,26 +1,24 @@
  /* rlwinsize.h -- an attempt to isolate some of the system-specific defines
     for `struct winsize' and TIOCGWINSZ. */
@@ -14784,15 +15000,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
-+   Readline is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
- 
+-
 -   The GNU General Public License is often shipped with GNU software, and
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
++   Readline is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
 +   You should have received a copy of the GNU General Public License
 +   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
 +*/
@@ -14809,8 +15026,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +#endif
  
 +#endif /* _RL_WINSIZE_H */
---- a/readline/savestring.c
-+++ b/readline/savestring.c
+Index: gdb-7.2.90.20110703/readline/savestring.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/savestring.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/savestring.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
 -/* savestring.c  */
 +/* savestring.c - function version of savestring for backwards compatibility */
@@ -14860,8 +15079,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +  strcpy (ret, s);
 +  return ret;
  }
---- a/readline/search.c
-+++ b/readline/search.c
+Index: gdb-7.2.90.20110703/readline/search.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/search.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/search.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,24 @@
  /* search.c - code for non-incremental searching in emacs and vi modes. */
  
@@ -14879,16 +15100,6 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
--   The Library is distributed in the hope that it will be useful, but
--   WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   General Public License for more details.
--
--   The GNU General Public License is often shipped with GNU software, and
--   is generally kept in a file called COPYING or LICENSE.  If you do not
--   have a copy of the license, write to the Free Software Foundation,
--   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 +   the Free Software Foundation, either version 3 of the License, or
 +   (at your option) any later version.
 +
@@ -14900,7 +15111,16 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +   You should have received a copy of the GNU General Public License
 +   along with Readline.  If not, see <http://www.gnu.org/licenses/>.
 +*/
-+
+ 
+-   The Library is distributed in the hope that it will be useful, but
+-   WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   General Public License for more details.
+-
+-   The GNU General Public License is often shipped with GNU software, and
+-   is generally kept in a file called COPYING or LICENSE.  If you do not
+-   have a copy of the license, write to the Free Software Foundation,
+-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
  #define READLINE_LIBRARY
  
  #if defined (HAVE_CONFIG_H)
@@ -14923,8 +15143,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
    RL_SETSTATE(RL_STATE_NSEARCH);
  
---- a/readline/shell.c
-+++ b/readline/shell.c
+Index: gdb-7.2.90.20110703/readline/shell.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/shell.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/shell.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,25 @@
  /* shell.c -- readline utility functions that are normally provided by
  	      bash when readline is linked as part of the shell. */
@@ -14979,8 +15201,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #else /* !HAVE_SETENV */
  #  if defined (HAVE_PUTENV)
    b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1);
---- a/readline/shlib/Makefile.in
-+++ b/readline/shlib/Makefile.in
+Index: gdb-7.2.90.20110703/readline/shlib/Makefile.in
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/shlib/Makefile.in	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/shlib/Makefile.in	2011-07-03 10:41:21.000000000 +0200
 @@ -1,21 +1,20 @@
  ## -*- text -*- ##
  # Makefile for the GNU readline library shared library support.
@@ -14992,23 +15216,25 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 -# it under the terms of the GNU General Public License as published by
 -# the Free Software Foundation; either version 2, or (at your option)
 -# any later version.
-+#   This program is free software: you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation, either version 3 of the License, or
-+#   (at your option) any later version.
- 
+-
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
+-
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
++#   This program is free software: you can redistribute it and/or modify
++#   it under the terms of the GNU General Public License as published by
++#   the Free Software Foundation, either version 3 of the License, or
++#   (at your option) any later version.
++
 +#   This program is distributed in the hope that it will be useful,
 +#   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +#   GNU General Public License for more details.
- 
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
++
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
@@ -15040,7 +15266,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  
  # Support an alternate destination root directory for package building
  DESTDIR =
-@@ -122,8 +122,6 @@ SHARED_READLINE = $(SHLIB_LIBPREF)readline$(SHLIB_DOT)$(SHLIB_LIBVERSION)
+@@ -122,8 +122,6 @@ SHARED_READLINE = $(SHLIB_LIBPREF)readli
  SHARED_HISTORY = $(SHLIB_LIBPREF)history$(SHLIB_DOT)$(SHLIB_LIBVERSION)
  SHARED_LIBS = $(SHARED_READLINE) $(SHARED_HISTORY)
  
@@ -15049,7 +15275,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  # The C code source files for this library.
  CSOURCES = $(topdir)/readline.c $(topdir)/funmap.c $(topdir)/keymaps.c \
  	   $(topdir)/vi_mode.c $(topdir)/parens.c $(topdir)/rltty.c \
-@@ -131,12 +129,12 @@ CSOURCES = $(topdir)/readline.c $(topdir)/funmap.c $(topdir)/keymaps.c \
+@@ -131,12 +129,12 @@ CSOURCES = $(topdir)/readline.c $(topdir
  	   $(topdir)/display.c $(topdir)/signals.c $(topdir)/emacs_keymap.c \
  	   $(topdir)/vi_keymap.c $(topdir)/util.c $(topdir)/kill.c \
  	   $(topdir)/undo.c $(topdir)/macro.c $(topdir)/input.c \
@@ -15112,7 +15338,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  	@echo uninstall: you may need to run ldconfig
  
  clean mostlyclean:	force
-@@ -322,6 +317,8 @@ vi_mode.so: $(topdir)/rldefs.h ${BUILD_DIR}/config.h $(topdir)/rlconf.h
+@@ -322,6 +317,8 @@ vi_mode.so: $(topdir)/rldefs.h ${BUILD_D
  vi_mode.so: $(topdir)/readline.h $(topdir)/keymaps.h $(topdir)/chardefs.h
  vi_mode.so: $(topdir)/history.h $(topdir)/ansi_stdlib.h $(topdir)/tilde.h
  vi_mode.so: $(topdir)/rltypedefs.h
@@ -15145,8 +15371,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  xmalloc.so: xmalloc.c
  
  histexpand.so: histexpand.c
---- a/readline/signals.c
-+++ b/readline/signals.c
+Index: gdb-7.2.90.20110703/readline/signals.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/signals.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/signals.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* signals.c -- signal handling support for readline. */
  
@@ -15201,7 +15429,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
  #if !defined (RETSIGTYPE)
  #  if defined (VOID_SIGHANDLER)
  #    define RETSIGTYPE void
-@@ -80,6 +81,9 @@ typedef struct { SigHandler *sa_handler; int sa_mask, sa_flags; } sighandler_cxt
+@@ -80,6 +81,9 @@ typedef struct { SigHandler *sa_handler;
  static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
  static void rl_maybe_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
  
@@ -15287,7 +15515,7 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
        sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &set);
        sigdelset (&set, sig);
  #else /* !HAVE_POSIX_SIGNALS */
-@@ -251,11 +296,11 @@ rl_set_sighandler (sig, handler, ohandler)
+@@ -251,11 +296,11 @@ rl_set_sighandler (sig, handler, ohandle
    struct sigaction act;
  
    act.sa_handler = handler;
@@ -15529,10 +15757,10 @@ b13706abbee9646f4de522c0552ddd68d1a4f43a
 +
 +  _rl_output_some_chars (cstr, cslen);
 +}
-old mode 100755
-new mode 100644
---- a/readline/support/config.guess
-+++ b/readline/support/config.guess
+Index: gdb-7.2.90.20110703/readline/support/config.guess
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/config.guess	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/config.guess	2011-07-03 10:41:21.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -15607,7 +15835,7 @@ new mode 100644
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
@@ -15615,7 +15843,7 @@ new mode 100644
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -196,68 +200,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -196,68 +200,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
@@ -15702,7 +15930,7 @@ new mode 100644
  	# According to Compaq, /usr/sbin/psrinfo has been available on
  	# OSF/1 and Tru64 systems produced since 1995.  I hope that
  	# covers most systems running today.  This code pipes the CPU
-@@ -295,45 +263,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -295,45 +263,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	    "EV7.9 (21364A)")
  		UNAME_MACHINE="alphaev79" ;;
  	esac
@@ -15766,7 +15994,7 @@ new mode 100644
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -341,32 +313,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -341,32 +313,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -15809,7 +16037,7 @@ new mode 100644
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -375,10 +347,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -375,10 +347,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -15822,7 +16050,7 @@ new mode 100644
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -390,10 +362,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -390,10 +362,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -15835,7 +16063,7 @@ new mode 100644
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -404,40 +376,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -404,40 +376,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
@@ -15888,7 +16116,7 @@ new mode 100644
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -461,32 +433,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -461,32 +433,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
  	  exit (-1);
  	}
  EOF
@@ -16877,7 +17105,7 @@ new mode 100644
      esac
  fi
  
-@@ -1410,7 +1487,9 @@ This script, last modified $timestamp, has failed to recognize
+@@ -1410,7 +1487,9 @@ This script, last modified $timestamp, h
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -16888,10 +17116,10 @@ new mode 100644
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-old mode 100755
-new mode 100644
---- a/readline/support/config.rpath
-+++ b/readline/support/config.rpath
+Index: gdb-7.2.90.20110703/readline/support/config.rpath
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/config.rpath	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/config.rpath	2011-07-03 10:41:21.000000000 +0200
 @@ -6,19 +6,18 @@
  #   Taken from GNU libtool, 2001
  #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -16919,10 +17147,10 @@ new mode 100644
  #
  #   As a special exception to the GNU General Public License, if you
  #   distribute this file as part of a program that contains a
-old mode 100755
-new mode 100644
---- a/readline/support/config.sub
-+++ b/readline/support/config.sub
+Index: gdb-7.2.90.20110703/readline/support/config.sub
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/config.sub	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/config.sub	2011-07-03 10:41:21.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -16955,7 +17183,7 @@ new mode 100644
  # Please send patches to <config-patches@gnu.org>.  Submit a context
  # diff and a properly formatted ChangeLog entry.
  #
-@@ -70,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
+@@ -70,8 +72,8 @@ Report bugs and patches to <config-patch
  version="\
  GNU config.sub ($timestamp)
  
@@ -17528,8 +17756,10 @@ new mode 100644
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
---- a/readline/support/mkdirs
-+++ b/readline/support/mkdirs
+Index: gdb-7.2.90.20110703/readline/support/mkdirs
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/mkdirs	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/mkdirs	2011-07-03 10:41:21.000000000 +0200
 @@ -7,19 +7,18 @@
  
  # Copyright (C) 1996-2002 Free Software Foundation, Inc.
@@ -17560,8 +17790,10 @@ new mode 100644
  
  for dir
  do
---- a/readline/support/mkdist
-+++ b/readline/support/mkdist
+Index: gdb-7.2.90.20110703/readline/support/mkdist
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/mkdist	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/mkdist	2011-07-03 10:41:21.000000000 +0200
 @@ -12,19 +12,19 @@
  
  # Copyright (C) 1996-2002 Free Software Foundation, Inc.
@@ -17593,8 +17825,10 @@ new mode 100644
  
  SRCDIR=src
  ROOTNAME=bash
---- a/readline/support/shlib-install
-+++ b/readline/support/shlib-install
+Index: gdb-7.2.90.20110703/readline/support/shlib-install
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/shlib-install	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/shlib-install	2011-07-03 10:41:21.000000000 +0200
 @@ -3,7 +3,7 @@
  # shlib-install - install a shared library and do any necessary host-specific
  #		  post-installation configuration (like ldconfig)
@@ -17638,7 +17872,7 @@ new mode 100644
  	IMPLIBNAME=`echo ${LIBNAME} \
  		| sed -e 's,^cyg,lib,' -e 's,[0-9]*.dll$,.dll.a,'`
  	if [ -z "$uninstall" ]; then
-@@ -114,8 +116,8 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2'
+@@ -114,8 +116,8 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR &&
  #
  # Create symlinks to the installed library.  This section is incomplete.
  #
@@ -17667,7 +17901,7 @@ new mode 100644
  	# libname.so -> libname.so.M
  	${echo} ${RM} ${INSTALLDIR}/$LINK1
  	if [ -z "$uninstall" ]; then
-@@ -153,7 +155,7 @@ solaris2*|aix4.[2-9]*|osf*|irix[56]*|sysv[45]*|dgux*)
+@@ -153,7 +155,7 @@ solaris2*|aix4.[2-9]*|osf*|irix[56]*|sys
  
  
  # FreeBSD 3.x and above can have either a.out or ELF shared libraries
@@ -17676,7 +17910,7 @@ new mode 100644
  	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
  		# libname.so -> libname.so.M
  		${echo} ${RM} ${INSTALLDIR}/$LINK1
-@@ -175,6 +177,14 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*)
+@@ -175,6 +177,14 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao
  	fi
  	;;
  
@@ -17700,27 +17934,19 @@ new mode 100644
  	# Links to .dlls don't work.  Hence shobj-conf used DLLVERSION.dll
  	# instead of so.SHLIB_MAJOR.SHLIB_MINOR.  The postinstall above
  	# took care of everything else.
-old mode 100755
-new mode 100644
---- a/readline/support/shobj-conf
-+++ b/readline/support/shobj-conf
+Index: gdb-7.2.90.20110703/readline/support/shobj-conf
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/shobj-conf	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/shobj-conf	2011-07-03 10:41:21.000000000 +0200
 @@ -10,21 +10,23 @@
  # Chet Ramey
  # chet@po.cwru.edu
  
 -# Copyright (C) 1996-2002 Free Software Foundation, Inc.
 +#   Copyright (C) 1996-2009 Free Software Foundation, Inc.
- #
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++#
 +#   This file is part of GNU Bash, the Bourne Again SHell.
- #
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
++#
 +#   This program is free software: you can redistribute it and/or modify
 +#   it under the terms of the GNU General Public License as published by
 +#   the Free Software Foundation, either version 3 of the License, or
@@ -17734,6 +17960,16 @@ new mode 100644
 +#   You should have received a copy of the GNU General Public License
 +#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+-#
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
@@ -17799,7 +18035,7 @@ new mode 100644
  	SHOBJ_LD='${CC}'
  
  	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
-@@ -141,7 +145,35 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
+@@ -141,7 +145,35 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdao
  	fi
  	;;
  
@@ -17862,7 +18098,7 @@ new mode 100644
  	SHOBJ_CFLAGS=-fpic
  	SHOBJ_LD='ld'
  	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
-@@ -241,7 +273,7 @@ aix4.[2-9]*-*gcc*)		# lightly tested by jik@cisco.com
+@@ -241,7 +273,7 @@ aix4.[2-9]*-*gcc*)		# lightly tested by 
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
  	;;
  
@@ -17929,8 +18165,10 @@ new mode 100644
  	;;
  
  #
---- a/readline/support/wcwidth.c
-+++ b/readline/support/wcwidth.c
+Index: gdb-7.2.90.20110703/readline/support/wcwidth.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/support/wcwidth.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/support/wcwidth.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,21 +1,73 @@
  /*
 - * This is an implementation of wcwidth() and wcswidth() as defined in
@@ -18013,7 +18251,7 @@ new mode 100644
  };
  
  /* auxiliary function for binary search in interval table */
-@@ -39,7 +91,7 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+@@ -39,7 +91,7 @@ static int bisearch(wchar_t ucs, const s
  }
  
  
@@ -18022,7 +18260,7 @@ new mode 100644
   * character as follows:
   *
   *    - The null character (U+0000) has a column width of 0.
-@@ -51,6 +103,8 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+@@ -51,6 +103,8 @@ static int bisearch(wchar_t ucs, const s
   *      category code Mn or Me in the Unicode database) have a
   *      column width of 0.
   *
@@ -18031,7 +18269,7 @@ new mode 100644
   *    - Other format characters (general category code Cf in the Unicode
   *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
   *
-@@ -58,7 +112,7 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+@@ -58,7 +112,7 @@ static int bisearch(wchar_t ucs, const s
   *      have a column width of 0.
   *
   *    - Spacing characters in the East Asian Wide (W) or East Asian
@@ -18040,7 +18278,7 @@ new mode 100644
   *      Report #11 have a column width of 2.
   *
   *    - All remaining characters (including all printable
-@@ -69,44 +123,59 @@ static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+@@ -69,44 +123,59 @@ static int bisearch(wchar_t ucs, const s
   * in ISO 10646.
   */
  
@@ -18164,7 +18402,7 @@ new mode 100644
        return -1;
      else
        width += w;
-@@ -151,20 +223,21 @@ int wcswidth(const wchar_t *pwcs, size_t n)
+@@ -151,20 +223,21 @@ int wcswidth(const wchar_t *pwcs, size_t
  
  
  /*
@@ -18290,8 +18528,10 @@ new mode 100644
        return -1;
      else
        width += w;
---- a/readline/tcap.h
-+++ b/readline/tcap.h
+Index: gdb-7.2.90.20110703/readline/tcap.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/tcap.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/tcap.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,23 @@
  /* tcap.h -- termcap library functions and variables. */
  
@@ -18309,7 +18549,9 @@ new mode 100644
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
+ 
 -   The Library is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -18319,9 +18561,6 @@ new mode 100644
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+
 +   Readline is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18333,8 +18572,10 @@ new mode 100644
  
  #if !defined (_RLTCAP_H_)
  #define _RLTCAP_H_
---- a/readline/terminal.c
-+++ b/readline/terminal.c
+Index: gdb-7.2.90.20110703/readline/terminal.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/terminal.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/terminal.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* terminal.c -- controlling the terminal with termcap. */
  
@@ -18403,7 +18644,7 @@ new mode 100644
  
  /* **************************************************************** */
  /*								    */
-@@ -93,12 +107,12 @@ static char *term_string_buffer = (char *)NULL;
+@@ -93,12 +107,12 @@ static char *term_string_buffer = (char 
  
  static int tcap_initialized;
  
@@ -18550,8 +18791,10 @@ new mode 100644
      {
        switch (_rl_bell_preference)
          {
---- a/readline/text.c
-+++ b/readline/text.c
+Index: gdb-7.2.90.20110703/readline/text.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/text.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/text.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* text.c -- text handling commands for readline. */
  
@@ -18590,7 +18833,7 @@ new mode 100644
  #define READLINE_LIBRARY
  
  #if defined (HAVE_CONFIG_H)
-@@ -67,6 +67,10 @@ static int _rl_insert_next_callback PARAMS((_rl_callback_generic_arg *));
+@@ -67,6 +67,10 @@ static int _rl_insert_next_callback PARA
  static int _rl_char_search_callback PARAMS((_rl_callback_generic_arg *));
  #endif
  
@@ -18925,7 +19168,7 @@ new mode 100644
  #endif
  
    return 0;
-@@ -1459,6 +1515,9 @@ _rl_char_search_internal (count, dir, schar)
+@@ -1459,6 +1515,9 @@ _rl_char_search_internal (count, dir, sc
    int prepos;
  #endif
  
@@ -18955,8 +19198,10 @@ new mode 100644
    if (count < 0)
      return (_rl_char_search_internal (-count, bdir, c));
    else
---- a/readline/tilde.c
-+++ b/readline/tilde.c
+Index: gdb-7.2.90.20110703/readline/tilde.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/tilde.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/tilde.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,23 +1,23 @@
  /* tilde.c -- Tilde expansion code (~/foo := $HOME/foo). */
  
@@ -18972,15 +19217,16 @@ new mode 100644
 -   under the terms of the GNU General Public License as published by the
 -   Free Software Foundation; either version 2, or (at your option) any
 -   later version.
-+   Readline is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Readline is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
++   Readline is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Readline is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19051,8 +19297,10 @@ new mode 100644
    endpwent ();
  #endif
    return (dirname);
---- a/readline/tilde.h
-+++ b/readline/tilde.h
+Index: gdb-7.2.90.20110703/readline/tilde.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/tilde.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/tilde.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,24 @@
  /* tilde.h: Externally available variables and function in libtilde.a. */
  
@@ -19069,7 +19317,9 @@ new mode 100644
     it under the terms of the GNU General Public License as published by
 -   the Free Software Foundation; either version 2, or (at your option)
 -   any later version.
--
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
+ 
 -   The Library is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -19079,9 +19329,6 @@ new mode 100644
 -   is generally kept in a file called COPYING or LICENSE.  If you do not
 -   have a copy of the license, write to the Free Software Foundation,
 -   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
-+
 +   Readline is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19093,8 +19340,10 @@ new mode 100644
  
  #if !defined (_TILDE_H_)
  #  define _TILDE_H_
---- a/readline/undo.c
-+++ b/readline/undo.c
+Index: gdb-7.2.90.20110703/readline/undo.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/undo.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/undo.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,25 @@
  /* readline.c -- a general facility for reading lines of input
     with emacs style editing and completion. */
@@ -19143,7 +19392,7 @@ new mode 100644
  /* Non-zero tells rl_delete_text and rl_insert_text to not add to
     the undo list. */
  int _rl_doing_an_undo = 0;
-@@ -66,19 +68,35 @@ UNDO_LIST *rl_undo_list = (UNDO_LIST *)NULL;
+@@ -66,19 +68,35 @@ UNDO_LIST *rl_undo_list = (UNDO_LIST *)N
  /*								    */
  /* **************************************************************** */
  
@@ -19286,8 +19535,10 @@ new mode 100644
      rl_ding ();
    else
      {
---- a/readline/util.c
-+++ b/readline/util.c
+Index: gdb-7.2.90.20110703/readline/util.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/util.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/util.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,24 @@
  /* util.c -- readline utility functions */
  
@@ -19488,11 +19739,11 @@ new mode 100644
 -  register char ch1, ch2;
 +  register char *s1, *s2;
 +  int d;
- 
--  while (count)
++
 +  if (count <= 0 || (string1 == string2))
 +    return 0;
-+
+ 
+-  while (count)
 +  s1 = string1;
 +  s2 = string2;
 +  do
@@ -19527,11 +19778,11 @@ new mode 100644
 +
 +  s1 = string1;
 +  s2 = string2;
- 
--  while (*string1 && *string2)
++
 +  if (s1 == s2)
 +    return 0;
-+
+ 
+-  while (*string1 && *string2)
 +  while ((d = _rl_to_lower (*s1) - _rl_to_lower (*s2)) == 0)
      {
 -      ch1 = *string1++;
@@ -19626,8 +19877,10 @@ new mode 100644
 +}
 +
 +#endif
---- a/readline/vi_keymap.c
-+++ b/readline/vi_keymap.c
+Index: gdb-7.2.90.20110703/readline/vi_keymap.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/vi_keymap.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/vi_keymap.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* vi_keymap.c -- the keymap for vi_mode in readline (). */
  
@@ -19665,7 +19918,7 @@ new mode 100644
  
  #if !defined (BUFSIZ)
  #include <stdio.h>
-@@ -151,7 +150,7 @@ KEYMAP_ENTRY_ARRAY vi_movement_keymap = {
+@@ -151,7 +150,7 @@ KEYMAP_ENTRY_ARRAY vi_movement_keymap = 
    { ISFUNC, rl_vi_char_search },		/* f */
    { ISFUNC, (rl_command_func_t *)0x0 },		/* g */
    { ISFUNC, rl_backward_char },			/* h */
@@ -19674,7 +19927,7 @@ new mode 100644
    { ISFUNC, rl_get_next_history },		/* j */
    { ISFUNC, rl_get_previous_history },		/* k */
    { ISFUNC, rl_forward_char },			/* l */
-@@ -327,9 +326,9 @@ KEYMAP_ENTRY_ARRAY vi_insertion_keymap = {
+@@ -327,9 +326,9 @@ KEYMAP_ENTRY_ARRAY vi_insertion_keymap =
    { ISFUNC, rl_insert },			/* Control-k */
    { ISFUNC, rl_insert },			/* Control-l */
    { ISFUNC, rl_newline },			/* Control-m */
@@ -19686,8 +19939,10 @@ new mode 100644
    { ISFUNC, rl_insert },			/* Control-q */
    { ISFUNC, rl_reverse_search_history },	/* Control-r */
    { ISFUNC, rl_forward_search_history },	/* Control-s */
---- a/readline/vi_mode.c
-+++ b/readline/vi_mode.c
+Index: gdb-7.2.90.20110703/readline/vi_mode.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/vi_mode.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/vi_mode.c	2011-07-03 10:41:21.000000000 +0200
 @@ -1,25 +1,25 @@
  /* vi_mode.c -- A vi emulation mode for Bash.
     Derived from code written by Jeff Sparkes (jsparkes@bnr.ca).  */
@@ -19742,7 +19997,7 @@ new mode 100644
  
  /* Keymap used for vi replace characters.  Created dynamically since
     rarely used. */
-@@ -101,7 +103,7 @@ static int _rl_vi_last_key_before_insert;
+@@ -101,7 +103,7 @@ static int _rl_vi_last_key_before_insert
  static int vi_redoing;
  
  /* Text modification commands.  These are the `redoable' commands. */
@@ -19768,7 +20023,7 @@ new mode 100644
  static int _rl_vi_callback_getchar PARAMS((char *, int));
  
  #if defined (READLINE_CALLBACKS)
-@@ -124,12 +130,23 @@ static int _rl_vi_callback_change_char PARAMS((_rl_callback_generic_arg *));
+@@ -124,12 +130,23 @@ static int _rl_vi_callback_change_char P
  static int _rl_vi_callback_char_search PARAMS((_rl_callback_generic_arg *));
  #endif
  
@@ -20061,7 +20316,7 @@ new mode 100644
 +	rl_numeric_arg = _rl_digit_value (c);
 +      rl_explicit_arg = 1;
 +      return 1;		/* keep going */
-+    }
+     }
 +  else
 +    {
 +      rl_clear_message ();
@@ -20088,9 +20343,8 @@ new mode 100644
 +      r = _rl_vi_arg_dispatch (c);
 +      if (r <= 0)
 +	break;
-     }
- 
--  _rl_vi_last_motion = c;
++    }
++
 +  RL_UNSETSTATE(RL_STATE_NUMERICARG);
 +  return (0);
 +}
@@ -20127,7 +20381,8 @@ new mode 100644
 +{
 +  xfree (m);
 +}
-+
+ 
+-  _rl_vi_last_motion = c;
 +static int
 +rl_domove_motion_callback (m)
 +     _rl_vimotion_cxt *m;
@@ -20202,28 +20457,28 @@ new mode 100644
 +#endif
 +      /* Should do everything, including turning off RL_STATE_VIMOTION */
 +      return (rl_domove_motion_callback (m));
-     }
--
--  c = UNMETA (c);
--
--  if (_rl_digit_p (c))
++    }
 +  else if (m->key == c && (m->key == 'd' || m->key == 'y' || m->key == 'c'))
-     {
--      if (rl_explicit_arg)
--	rl_numeric_arg = (rl_numeric_arg * 10) + _rl_digit_value (c);
--      else
--	rl_numeric_arg = _rl_digit_value (c);
++    {
 +      rl_mark = rl_end;
 +      rl_beg_of_line (1, c);
 +      _rl_vi_last_motion = c;
 +      RL_UNSETSTATE (RL_STATE_VIMOTION);
 +      return (vidomove_dispatch (m));
-+    }
+     }
+-
+-  c = UNMETA (c);
+-
+-  if (_rl_digit_p (c))
 +#if defined (READLINE_CALLBACKS)
 +  /* XXX - these need to handle rl_universal_argument bindings */
 +  /* Reading vi motion char continuing numeric argument */
 +  else if (_rl_digit_p (c) && RL_ISSTATE (RL_STATE_CALLBACK) && RL_VIMOVENUMARG())
-+    {
+     {
+-      if (rl_explicit_arg)
+-	rl_numeric_arg = (rl_numeric_arg * 10) + _rl_digit_value (c);
+-      else
+-	rl_numeric_arg = _rl_digit_value (c);
 +      return (_rl_vi_arg_dispatch (c));
 +    }
 +  /* Readine vi motion char starting numeric argument */
@@ -20359,10 +20614,10 @@ new mode 100644
  {
 -  int c, start_pos;
 +  int c, r;
-+
+ 
 +  _rl_vimvcxt = _rl_mvcxt_alloc (VIM_DELETE, key);
 +  _rl_vimvcxt->start = rl_point;
- 
++
 +  rl_mark = rl_point;
    if (_rl_uppercase_p (key))
 -    rl_stuff_char ('$');
@@ -20637,29 +20892,32 @@ new mode 100644
 -        case 't':
 -          _rl_cs_orig_dir = _rl_cs_dir = FTO;
 -          break;
-+	{
-+	case 't':
-+	  _rl_cs_orig_dir = _rl_cs_dir = FTO;
-+	  break;
- 
+-
 -        case 'T':
 -          _rl_cs_orig_dir = _rl_cs_dir = BTO;
 -          break;
-+	case 'T':
-+	  _rl_cs_orig_dir = _rl_cs_dir = BTO;
-+	  break;
- 
+-
 -        case 'f':
 -          _rl_cs_orig_dir = _rl_cs_dir = FFIND;
 -          break;
-+	case 'f':
-+	  _rl_cs_orig_dir = _rl_cs_dir = FFIND;
-+	  break;
- 
+-
 -        case 'F':
 -          _rl_cs_orig_dir = _rl_cs_dir = BFIND;
 -          break;
 -        }
++	{
++	case 't':
++	  _rl_cs_orig_dir = _rl_cs_dir = FTO;
++	  break;
++
++	case 'T':
++	  _rl_cs_orig_dir = _rl_cs_dir = BTO;
++	  break;
++
++	case 'f':
++	  _rl_cs_orig_dir = _rl_cs_dir = FFIND;
++	  break;
++
 +	case 'F':
 +	  _rl_cs_orig_dir = _rl_cs_dir = BFIND;
 +	  break;
@@ -20796,9 +21054,11 @@ new mode 100644
      {
        rl_ding ();
        return -1;
---- /dev/null
-+++ b/readline/xfree.c
-@@ -0,0 +1,50 @@
+Index: gdb-7.2.90.20110703/readline/xfree.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.2.90.20110703/readline/xfree.c	2011-07-03 10:44:45.000000000 +0200
+@@ -0,0 +1,57 @@
 +/* xfree.c -- safe version of free that ignores attempts to free NUL */
 +
 +/* Copyright (C) 1991-2010 Free Software Foundation, Inc.
@@ -20832,7 +21092,10 @@ new mode 100644
 +#  include "ansi_stdlib.h"
 +#endif /* HAVE_STDLIB_H */
 +
++#include <stdio.h>
++
 +#include "xmalloc.h"
++#include "readline.h"
 +
 +/* **************************************************************** */
 +/*								    */
@@ -20846,11 +21109,17 @@ new mode 100644
 +xfree (string)
 +     PTR_T string;
 +{
++  /* Leak a bit.  */
++  if (RL_ISSTATE(RL_STATE_SIGHANDLER))
++    return;
++
 +  if (string)
 +    free (string);
 +}
---- a/readline/xmalloc.c
-+++ b/readline/xmalloc.c
+Index: gdb-7.2.90.20110703/readline/xmalloc.c
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/xmalloc.c	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/xmalloc.c	2011-07-03 10:43:54.000000000 +0200
 @@ -1,23 +1,24 @@
  /* xmalloc.c -- safe versions of malloc and realloc */
  
@@ -20866,15 +21135,16 @@ new mode 100644
 -   under the terms of the GNU General Public License as published by the
 -   Free Software Foundation; either version 2, or (at your option) any
 -   later version.
-+   Readline is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation, either version 3 of the License, or
-+   (at your option) any later version.
- 
+-
 -   Readline is distributed in the hope that it will be useful, but
 -   WITHOUT ANY WARRANTY; without even the implied warranty of
 -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 -   General Public License for more details.
++   Readline is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++
 +   Readline is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20889,22 +21159,50 @@ new mode 100644
  #define READLINE_LIBRARY
  
  #if defined (HAVE_CONFIG_H)
-@@ -76,13 +77,3 @@ xrealloc (pointer, bytes)
+@@ -33,7 +34,6 @@
+ #endif /* HAVE_STDLIB_H */
+ 
+ #include "xmalloc.h"
+-#include "readline.h"
+ 
+ /* **************************************************************** */
+ /*								    */
+@@ -41,9 +41,6 @@
+ /*								    */
+ /* **************************************************************** */
+ 
+-/* xmalloc and xrealloc are provided by GDB.  */
+-#if 0
+-
+ static void
+ memory_error_and_abort (fname)
+      char *fname;
+@@ -80,21 +77,3 @@ xrealloc (pointer, bytes)
      memory_error_and_abort ("xrealloc");
    return (temp);
  }
 -
+-/* xmalloc and xrealloc are provided by GDB.  */
+-#endif /* 0 */
+-
 -/* Use this as the function to call when adding unwind protects so we
 -   don't need to know what free() returns. */
 -void
 -xfree (string)
 -     PTR_T string;
 -{
+-  /* Leak a bit.  */
+-  if (RL_ISSTATE(RL_STATE_SIGHANDLER))
+-    return;
+-
+-#undef free
 -  if (string)
 -    free (string);
 -}
---- a/readline/xmalloc.h
-+++ b/readline/xmalloc.h
+Index: gdb-7.2.90.20110703/readline/xmalloc.h
+===================================================================
+--- gdb-7.2.90.20110703.orig/readline/xmalloc.h	2011-07-03 10:40:53.000000000 +0200
++++ gdb-7.2.90.20110703/readline/xmalloc.h	2011-07-03 10:41:21.000000000 +0200
 @@ -1,24 +1,23 @@
  /* xmalloc.h -- memory allocation that aborts on errors. */
  
@@ -20942,3 +21240,13 @@ new mode 100644
  
  #if !defined (_XMALLOC_H_)
  #define _XMALLOC_H_
+@@ -42,9 +41,6 @@
+ /* xmalloc and xrealloc should be also protected from RL_STATE_SIGHANDLER.  */
+ #define xfree xfree_readline
+ 
+-/* readline-5.1 backport.  */
+-#define free xfree
+-
+ extern PTR_T xmalloc PARAMS((size_t));
+ extern PTR_T xrealloc PARAMS((void *, size_t));
+ extern void xfree PARAMS((void *));
diff --git a/gdb.spec b/gdb.spec
index 25a832d..b7e53a5 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -23,11 +23,11 @@ Name: gdb%{?_with_debug:-debug}
 # Set version to contents of gdb/version.in.
 # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3
 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch).
-Version: 7.2.90.20110525
+Version: 7.2.90.20110703
 
 # 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: 39%{?_with_upstream:.upstream}%{?dist}
+Release: 40%{?_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
@@ -1265,6 +1265,10 @@ fi
 %{_infodir}/gdb.info*
 
 %changelog
+* Sun Jul  3 2011 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.2.90.20110703-40.fc15
+- Rebase to FSF GDB 7.2.90.20110703 (which is a 7.3 pre-release).
+  - Adjust the `print errno' patch due to the DW_AT_linkage_name following again.
+
 * Fri Jun 24 2011 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.2.90.20110525-39.fc15
 - Fix install-info for the gdb-doc subpackage (BZ 715228).
 
diff --git a/sources b/sources
index 98f1a04..02e2fff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 04e5c4b1b9e633422cc48990fe61958d  libstdc++-v3-python-r155978.tar.bz2
-b6128eb0341df56d66f0a3558ebc9899  gdb-7.2.90.20110525.tar.bz2
+be6522ade1ac78a16b10ea1612158d0a  gdb-7.2.90.20110703.tar.bz2