diff --git a/gdb-6.3-bz231832-obstack-2gb.patch b/gdb-6.3-bz231832-obstack-2gb.patch
index be94b67..47bd68b 100644
--- a/gdb-6.3-bz231832-obstack-2gb.patch
+++ b/gdb-6.3-bz231832-obstack-2gb.patch
@@ -1,10 +1,12 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=231832
 
 
-diff -u -rup gdb-6.6-orig/gdb/symmisc.c gdb-6.6/gdb/symmisc.c
---- gdb-6.6-orig/gdb/symmisc.c	2005-12-17 17:34:03.000000000 -0500
-+++ gdb-6.6/gdb/symmisc.c	2007-03-12 09:38:26.000000000 -0400
-@@ -233,7 +233,7 @@ print_objfile_statistics (void)
+Index: gdb-6.8/gdb/symmisc.c
+===================================================================
+--- gdb-6.8.orig/gdb/symmisc.c	2008-03-17 16:06:24.000000000 +0100
++++ gdb-6.8/gdb/symmisc.c	2008-07-14 10:27:50.000000000 +0200
+@@ -230,8 +230,8 @@ print_objfile_statistics (void)
+     if (OBJSTAT (objfile, sz_strtab) > 0)
        printf_filtered (_("  Space used by a.out string tables: %d\n"),
  		       OBJSTAT (objfile, sz_strtab));
 -    printf_filtered (_("  Total memory used for objfile obstack: %d\n"),
@@ -14,9 +16,10 @@ diff -u -rup gdb-6.6-orig/gdb/symmisc.c gdb-6.6/gdb/symmisc.c
      printf_filtered (_("  Total memory used for psymbol cache: %d\n"),
  		     bcache_memory_used (objfile->psymbol_cache));
      printf_filtered (_("  Total memory used for macro cache: %d\n"),
-diff -u -rup gdb-6.6-orig/include/obstack.h gdb-6.6/include/obstack.h
---- gdb-6.6-orig/include/obstack.h	2005-05-10 06:21:08.000000000 -0400
-+++ gdb-6.6/include/obstack.h	2007-03-12 09:37:50.000000000 -0400
+Index: gdb-6.8/include/obstack.h
+===================================================================
+--- gdb-6.8.orig/include/obstack.h	2005-05-10 12:21:08.000000000 +0200
++++ gdb-6.8/include/obstack.h	2008-07-14 10:27:50.000000000 +0200
 @@ -188,31 +188,31 @@ struct obstack		/* control current objec
  
  /* Declare the external functions we use; they are in obstack.c.  */
@@ -131,9 +134,10 @@ diff -u -rup gdb-6.6-orig/include/obstack.h gdb-6.6/include/obstack.h
  	    = (h)->temp + (char *) (h)->chunk)				\
     : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
  
-diff -u -rup gdb-6.6-orig/libiberty/obstack.c gdb-6.6/libiberty/obstack.c
---- gdb-6.6-orig/libiberty/obstack.c	2005-05-10 11:33:33.000000000 -0400
-+++ gdb-6.6/libiberty/obstack.c	2007-03-12 09:40:16.000000000 -0400
+Index: gdb-6.8/libiberty/obstack.c
+===================================================================
+--- gdb-6.8.orig/libiberty/obstack.c	2005-05-10 17:33:33.000000000 +0200
++++ gdb-6.8/libiberty/obstack.c	2008-07-14 10:27:50.000000000 +0200
 @@ -44,9 +44,11 @@
  #if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
  #include <gnu-versions.h>
diff --git a/gdb-6.3-gstack-20050411.patch b/gdb-6.3-gstack-20050411.patch
index b4ec10a..9911a1c 100644
--- a/gdb-6.3-gstack-20050411.patch
+++ b/gdb-6.3-gstack-20050411.patch
@@ -4,10 +4,11 @@
 	to install and uninstall.
 	* gstack.sh, gstack.1: New files.
 
-diff -uN -r ../orig/gdb/Makefile.in ./gdb/Makefile.in
---- ../orig/gdb/Makefile.in	2004-11-23 13:31:03.000000000 -0500
-+++ ./gdb/Makefile.in	2004-11-23 15:06:34.623389592 -0500
-@@ -970,7 +970,7 @@
+Index: gdb-6.8/gdb/Makefile.in
+===================================================================
+--- gdb-6.8.orig/gdb/Makefile.in	2008-03-17 13:15:08.000000000 +0100
++++ gdb-6.8/gdb/Makefile.in	2008-07-14 10:25:47.000000000 +0200
+@@ -1161,7 +1161,7 @@ gdb.z:gdb.1
  # time it takes for make to check that all is up to date.
  # install-only is intended to address that need.
  install: all install-only
@@ -16,7 +17,7 @@ diff -uN -r ../orig/gdb/Makefile.in ./gdb/Makefile.in
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e "$$t"` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1002,9 +1002,26 @@
+@@ -1193,9 +1193,26 @@ install-tui:
  			$(DESTDIR)$(man1dir) ; \
  		$(INSTALL_DATA) $(srcdir)/gdb.1 \
  			$(DESTDIR)$(man1dir)/$$transformed_name.1
@@ -44,7 +45,7 @@ diff -uN -r ../orig/gdb/Makefile.in ./gdb/Makefile.in
  	transformed_name=`t='$(program_transform_name)'; \
  			  echo gdb | sed -e $$t` ; \
  		if test "x$$transformed_name" = x; then \
-@@ -1026,6 +1043,17 @@
+@@ -1217,6 +1234,17 @@ uninstall-tui:
  		fi ; \
  		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
  		      $(DESTDIR)$(man1dir)/$$transformed_name.1
@@ -60,10 +61,12 @@ diff -uN -r ../orig/gdb/Makefile.in ./gdb/Makefile.in
 +		rm -f $(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) \
 +		      $(DESTDIR)$(man1dir)/$$transformed_name.1
  
- # We do this by grepping through sources.  If that turns out to be too slow,
- # maybe we could just require every .o file to have an initialization routine
---- /dev/null	2005-04-09 23:51:05.027867440 -0400
-+++ ./gdb/gstack.sh	2005-04-08 18:00:49.000000000 -0400
+ # The C++ name parser can be built standalone for testing.
+ test-cp-name-parser.o: cp-name-parser.c $(safe_ctype_h) $(libiberty_h) \
+Index: gdb-6.8/gdb/gstack.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/gstack.sh	2008-07-14 10:25:47.000000000 +0200
 @@ -0,0 +1,45 @@
 +#!/bin/sh
 +
diff --git a/gdb-6.3-ia64-sigtramp-frame-20050708.patch b/gdb-6.3-ia64-sigtramp-frame-20050708.patch
index 627a551..7a3493f 100644
--- a/gdb-6.3-ia64-sigtramp-frame-20050708.patch
+++ b/gdb-6.3-ia64-sigtramp-frame-20050708.patch
@@ -8,9 +8,11 @@
 	* ia64-tdep.c (ia64_sigtramp_frame_prev_register): Fix an
 	ISO C compliance compilation error.
 
---- gdb-6.3/gdb/ia64-tdep.c.fix	2005-07-08 20:26:37.000000000 -0400
-+++ gdb-6.3/gdb/ia64-tdep.c	2005-07-08 20:27:41.000000000 -0400
-@@ -2037,7 +2037,100 @@ ia64_sigtramp_frame_prev_register (struc
+Index: gdb-6.8/gdb/ia64-tdep.c
+===================================================================
+--- gdb-6.8.orig/gdb/ia64-tdep.c	2008-07-14 10:24:32.000000000 +0200
++++ gdb-6.8/gdb/ia64-tdep.c	2008-07-14 10:26:46.000000000 +0200
+@@ -2043,7 +2043,100 @@ ia64_sigtramp_frame_prev_register (struc
        pc &= ~0xf;
        store_unsigned_integer (valuep, 8, pc);
      }
@@ -112,8 +114,8 @@
  	   (regnum >= V32_REGNUM && regnum <= V127_REGNUM))
      {
        CORE_ADDR addr = 0;
-@@ -2051,6 +2144,39 @@ ia64_sigtramp_frame_prev_register (struc
- 	  read_memory (addr, valuep, register_size (current_gdbarch, regnum));
+@@ -2057,6 +2150,39 @@ ia64_sigtramp_frame_prev_register (struc
+ 	  read_memory (addr, valuep, register_size (gdbarch, regnum));
  	}
      }
 +  else if (VP0_REGNUM <= regnum && regnum <= VP63_REGNUM)
diff --git a/gdb-6.3-ppc64syscall-20040622.patch b/gdb-6.3-ppc64syscall-20040622.patch
index d5b5cc9..99529db 100644
--- a/gdb-6.3-ppc64syscall-20040622.patch
+++ b/gdb-6.3-ppc64syscall-20040622.patch
@@ -6,11 +6,11 @@
 	use to skip over first half of a GNU/Linux syscall and update
 	"func_start".
 
-Index: gdb-6.5/gdb/rs6000-tdep.c
+Index: gdb-6.8/gdb/rs6000-tdep.c
 ===================================================================
---- gdb-6.5.orig/gdb/rs6000-tdep.c	2006-07-11 02:57:24.000000000 -0300
-+++ gdb-6.5/gdb/rs6000-tdep.c	2006-07-11 12:32:05.000000000 -0300
-@@ -76,6 +76,7 @@
+--- gdb-6.8.orig/gdb/rs6000-tdep.c	2008-02-20 15:34:43.000000000 +0100
++++ gdb-6.8/gdb/rs6000-tdep.c	2008-07-14 10:25:29.000000000 +0200
+@@ -124,6 +124,7 @@ static const char *powerpc_vector_abi_st
  
  struct rs6000_framedata
    {
@@ -18,33 +18,31 @@ Index: gdb-6.5/gdb/rs6000-tdep.c
      int offset;			/* total size of frame --- the distance
  				   by which we decrement sp to allocate
  				   the frame */
-@@ -905,7 +906,6 @@ store_param_on_stack_p (unsigned long op
- static CORE_ADDR
- skip_prologue (CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata)
+@@ -1262,7 +1263,6 @@ static CORE_ADDR
+ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
+ 	       struct rs6000_framedata *fdata)
  {
 -  CORE_ADDR orig_pc = pc;
    CORE_ADDR last_prologue_pc = pc;
    CORE_ADDR li_found_pc = 0;
    gdb_byte buf[4];
-@@ -923,6 +923,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+@@ -1280,11 +1280,13 @@ skip_prologue (struct gdbarch *gdbarch, 
    int minimal_toc_loaded = 0;
    int prev_insn_was_prologue_insn = 1;
    int num_skip_non_prologue_insns = 0;
 +  int num_skip_ppc64_gnu_linux_syscall_insn = 0;
    int r0_contains_arg = 0;
-   const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (current_gdbarch);
-   struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
-@@ -943,6 +944,7 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
-     lim_pc = refine_prologue_limit (pc, lim_pc);
+   const struct bfd_arch_info *arch_info = gdbarch_bfd_arch_info (gdbarch);
+   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
  
    memset (fdata, 0, sizeof (struct rs6000_framedata));
 +  fdata->func_start = pc;
    fdata->saved_gpr = -1;
    fdata->saved_fpr = -1;
    fdata->saved_vr = -1;
-@@ -971,6 +973,55 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+@@ -1313,6 +1315,55 @@ skip_prologue (struct gdbarch *gdbarch, 
  	break;
-       op = extract_signed_integer (buf, 4);
+       op = extract_unsigned_integer (buf, 4);
  
 +      /* A PPC64 GNU/Linux system call function is split into two
 +	 sub-functions: a non-threaded fast-path (__NAME_nocancel)
@@ -98,7 +96,7 @@ Index: gdb-6.5/gdb/rs6000-tdep.c
        if ((op & 0xfc1fffff) == 0x7c0802a6)
  	{			/* mflr Rx */
  	  /* Since shared library / PIC code, which needs to get its
-@@ -1138,9 +1189,9 @@ skip_prologue (CORE_ADDR pc, CORE_ADDR l
+@@ -1486,9 +1537,9 @@ skip_prologue (struct gdbarch *gdbarch, 
  	     we have no line table information or the line info tells
  	     us that the subroutine call is not part of the line
  	     associated with the prologue.  */
diff --git a/gdb-6.3-readnever-20050907.patch b/gdb-6.3-readnever-20050907.patch
index 457cea6..a320e53 100644
--- a/gdb-6.3-readnever-20050907.patch
+++ b/gdb-6.3-readnever-20050907.patch
@@ -11,9 +11,11 @@
 
         * gdb.texinfo (File Options): Document --readnever.
 
---- gdb-6.3/gdb/doc/gdb.texinfo.fix	2005-09-07 13:32:23.000000000 -0400
-+++ gdb-6.3/gdb/doc/gdb.texinfo	2005-09-07 13:33:21.000000000 -0400
-@@ -952,6 +952,12 @@ Read each symbol file's entire symbol ta
+Index: gdb-6.8/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.8.orig/gdb/doc/gdb.texinfo	2008-03-26 19:38:21.000000000 +0100
++++ gdb-6.8/gdb/doc/gdb.texinfo	2008-07-14 10:27:01.000000000 +0200
+@@ -983,6 +983,12 @@ Read each symbol file's entire symbol ta
  the default, which is to read it incrementally as it is needed.
  This makes startup slower, but makes future operations faster.
  
@@ -25,10 +27,12 @@
 +
  @end table
  
- You typically combine the @code{-mapped} and @code{-readnow} options in
---- gdb-6.3/gdb/main.c.fix	2005-09-07 13:31:43.000000000 -0400
-+++ gdb-6.3/gdb/main.c	2005-09-07 13:33:21.000000000 -0400
-@@ -250,6 +250,7 @@ captured_main (void *data)
+ @node Mode Options
+Index: gdb-6.8/gdb/main.c
+===================================================================
+--- gdb-6.8.orig/gdb/main.c	2008-07-14 10:26:39.000000000 +0200
++++ gdb-6.8/gdb/main.c	2008-07-14 10:27:01.000000000 +0200
+@@ -296,6 +296,7 @@ captured_main (void *data)
        {"xdb", no_argument, &xdb_commands, 1},
        {"dbx", no_argument, &dbx_commands, 1},
        {"readnow", no_argument, &readnow_symbol_files, 1},
@@ -36,7 +40,7 @@
        {"r", no_argument, &readnow_symbol_files, 1},
        {"quiet", no_argument, &quiet, 1},
        {"q", no_argument, &quiet, 1},
-@@ -861,6 +862,7 @@ Options:\n\n\
+@@ -947,6 +948,7 @@ Options:\n\n\
    fputs_unfiltered (_(" file.\n\
    --quiet            Do not print version number on startup.\n\
    --readnow          Fully read symbol files on first access.\n\
@@ -44,9 +48,11 @@
  "), stream);
    fputs_unfiltered (_("\
    --se=FILE          Use FILE as symbol file and executable file.\n\
---- gdb-6.3/gdb/symfile.c.fix	2005-09-07 13:31:48.000000000 -0400
-+++ gdb-6.3/gdb/symfile.c	2005-09-07 13:33:21.000000000 -0400
-@@ -75,6 +75,7 @@ static void clear_symtab_users_cleanup (
+Index: gdb-6.8/gdb/symfile.c
+===================================================================
+--- gdb-6.8.orig/gdb/symfile.c	2008-07-14 10:26:30.000000000 +0200
++++ gdb-6.8/gdb/symfile.c	2008-07-14 10:27:01.000000000 +0200
+@@ -76,6 +76,7 @@ static void clear_symtab_users_cleanup (
  
  /* Global variables owned by this file */
  int readnow_symbol_files;	/* Read full symbols immediately */
@@ -54,9 +60,11 @@
  
  /* External variables and functions referenced. */
  
---- gdb-6.3/gdb/dwarf2read.c.fix	2005-09-07 13:31:58.000000000 -0400
-+++ gdb-6.3/gdb/dwarf2read.c	2005-09-07 13:34:03.000000000 -0400
-@@ -45,6 +45,7 @@
+Index: gdb-6.8/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.8.orig/gdb/dwarf2read.c	2008-07-14 10:26:09.000000000 +0200
++++ gdb-6.8/gdb/dwarf2read.c	2008-07-14 10:27:01.000000000 +0200
+@@ -43,6 +43,7 @@
  #include "dwarf2loc.h"
  #include "cp-support.h"
  #include "hashtab.h"
@@ -64,7 +72,7 @@
  #include "command.h"
  #include "gdbcmd.h"
  
-@@ -1100,7 +1101,8 @@ dwarf2_has_info (struct objfile *objfile
+@@ -1106,7 +1107,8 @@ dwarf2_has_info (struct objfile *objfile
    dwarf_loc_section = 0;
    
    bfd_map_over_sections (objfile->obfd, dwarf2_locate_sections, NULL);
@@ -74,9 +82,11 @@
  }
  
  /* This function is mapped across the sections and remembers the
---- gdb-6.3/gdb/top.h.fix	2005-09-07 13:32:08.000000000 -0400
-+++ gdb-6.3/gdb/top.h	2005-09-07 13:33:21.000000000 -0400
-@@ -57,6 +57,7 @@ extern void set_prompt (char *);
+Index: gdb-6.8/gdb/top.h
+===================================================================
+--- gdb-6.8.orig/gdb/top.h	2008-01-01 23:53:13.000000000 +0100
++++ gdb-6.8/gdb/top.h	2008-07-14 10:27:01.000000000 +0200
+@@ -59,6 +59,7 @@ extern void set_prompt (char *);
  
  /* From random places.  */
  extern int readnow_symbol_files;
diff --git a/gdb-6.3-rh-testversion-20041202.patch b/gdb-6.3-rh-testversion-20041202.patch
index 450b240..cf25bcd 100644
--- a/gdb-6.3-rh-testversion-20041202.patch
+++ b/gdb-6.3-rh-testversion-20041202.patch
@@ -3,9 +3,11 @@
         * gdb.gdb/selftest.exp: Add matching on specific Red Hat only version
         string.
 
---- ./gdb/testsuite/gdb.gdb/selftest.exp.1	Fri Jul 11 09:44:09 2003
-+++ ./gdb/testsuite/gdb.gdb/selftest.exp	Fri Jul 11 09:44:16 2003
-@@ -314,7 +314,10 @@ proc test_with_self { executable } {
+Index: gdb-6.8/gdb/testsuite/gdb.gdb/selftest.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.gdb/selftest.exp	2008-01-26 14:56:37.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.gdb/selftest.exp	2008-07-14 10:23:50.000000000 +0200
+@@ -354,6 +354,9 @@ proc test_with_self { executable } {
  	-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
  	    pass "printed version with cast"
  	}
diff --git a/gdb-6.3-sepcrc-20050402.patch b/gdb-6.3-sepcrc-20050402.patch
index d980536..df0a667 100644
--- a/gdb-6.3-sepcrc-20050402.patch
+++ b/gdb-6.3-sepcrc-20050402.patch
@@ -4,9 +4,11 @@
 	print a warning.
 	(find_separate_debug_file): Pass in the objfile's name.
 
---- ../gdb-6.3/./gdb/symfile.c	2005-04-02 16:02:22.000000000 -0500
-+++ ./gdb/symfile.c	2005-04-02 13:05:10.000000000 -0500
-@@ -1043,7 +1043,8 @@
+Index: gdb-6.8/gdb/symfile.c
+===================================================================
+--- gdb-6.8.orig/gdb/symfile.c	2008-01-29 23:47:20.000000000 +0100
++++ gdb-6.8/gdb/symfile.c	2008-07-14 10:26:30.000000000 +0200
+@@ -1348,7 +1348,8 @@ get_debug_link_info (struct objfile *obj
  }
  
  static int
@@ -16,7 +18,7 @@
  {
    unsigned long file_crc = 0;
    int fd;
-@@ -1052,6 +1053,12 @@
+@@ -1357,6 +1358,12 @@ separate_debug_file_exists (const char *
  
    fd = open (name, O_RDONLY | O_BINARY);
    if (fd < 0)
@@ -29,7 +31,7 @@
      return 0;
  
    while ((count = read (fd, buffer, sizeof (buffer))) > 0)
-@@ -1059,7 +1066,16 @@
+@@ -1364,7 +1371,16 @@ separate_debug_file_exists (const char *
  
    close (fd);
  
@@ -46,8 +48,8 @@
 +  return 1;
  }
  
- static char *debug_file_directory = NULL;
-@@ -1083,6 +1099,8 @@
+ char *debug_file_directory = NULL;
+@@ -1416,6 +1432,8 @@ find_separate_debug_file (struct objfile
    basename = get_debug_link_info (objfile, &crc32);
  
    if (basename == NULL)
@@ -56,7 +58,7 @@
      return NULL;
  
    dir = xstrdup (objfile->name);
-@@ -1110,7 +1128,7 @@
+@@ -1443,7 +1461,7 @@ find_separate_debug_file (struct objfile
    strcpy (debugfile, dir);
    strcat (debugfile, basename);
  
@@ -65,7 +67,7 @@
      {
        xfree (basename);
        xfree (dir);
-@@ -1123,7 +1141,7 @@
+@@ -1456,7 +1474,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, "/");
    strcat (debugfile, basename);
  
@@ -74,7 +76,7 @@
      {
        xfree (basename);
        xfree (dir);
-@@ -1136,7 +1154,7 @@
+@@ -1469,7 +1487,7 @@ find_separate_debug_file (struct objfile
    strcat (debugfile, dir);
    strcat (debugfile, basename);
  
@@ -83,12 +85,12 @@
      {
        xfree (basename);
        xfree (dir);
-@@ -1952,7 +1952,7 @@ find_separate_debug_file (struct objfile
+@@ -1488,7 +1506,7 @@ find_separate_debug_file (struct objfile
        strcat (debugfile, "/");
        strcat (debugfile, basename);
  
 -      if (separate_debug_file_exists (debugfile, crc32))
 +      if (separate_debug_file_exists (debugfile, crc32, objfile->name))
  	{
- 	  xfree (build_id_filename);
  	  xfree (canon_name);
+ 	  xfree (basename);
diff --git a/gdb-6.3-sigx86-20040621.patch b/gdb-6.3-sigx86-20040621.patch
index f4a704f..6ee56ae 100644
--- a/gdb-6.3-sigx86-20040621.patch
+++ b/gdb-6.3-sigx86-20040621.patch
@@ -6,13 +6,10 @@
 	Register the dwarf2-frame sniffer, but after the signal trampoline
 	sniffer.
 	
-Index: ./gdb/amd64-tdep.c
+Index: gdb-6.8/gdb/amd64-tdep.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/amd64-tdep.c,v
-retrieving revision 1.15
-diff -p -u -r1.15 amd64-tdep.c
---- ./gdb/amd64-tdep.c	7 Jun 2004 02:02:45 -0000	1.15
-+++ ./gdb/amd64-tdep.c	21 Jun 2004 20:16:34 -0000
+--- gdb-6.8.orig/gdb/amd64-tdep.c	2008-03-04 20:49:39.000000000 +0100
++++ gdb-6.8/gdb/amd64-tdep.c	2008-07-14 10:24:54.000000000 +0200
 @@ -34,7 +34,7 @@
  #include "regcache.h"
  #include "regset.h"
@@ -22,8 +19,8 @@ diff -p -u -r1.15 amd64-tdep.c
  #include "gdb_assert.h"
  
  #include "amd64-tdep.h"
-@@ -1171,6 +1171,8 @@ amd64_init_abi (struct gdbarch_info info
-   set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
+@@ -1167,6 +1167,8 @@ amd64_init_abi (struct gdbarch_info info
+   set_gdbarch_unwind_dummy_id (gdbarch, amd64_unwind_dummy_id);
  
    frame_unwind_append_sniffer (gdbarch, amd64_sigtramp_frame_sniffer);
 +  /* Hook in the DWARF CFI frame unwinder after sigtramp.  */
@@ -31,14 +28,11 @@ diff -p -u -r1.15 amd64-tdep.c
    frame_unwind_append_sniffer (gdbarch, amd64_frame_sniffer);
    frame_base_set_default (gdbarch, &amd64_frame_base);
  
-Index: ./gdb/i386-tdep.c
+Index: gdb-6.8/gdb/i386-tdep.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/i386-tdep.c,v
-retrieving revision 1.197
-diff -p -u -r1.197 i386-tdep.c
---- ./gdb/i386-tdep.c	18 Jun 2004 16:06:24 -0000	1.197
-+++ ./gdb/i386-tdep.c	21 Jun 2004 20:16:34 -0000
-@@ -2131,15 +2131,14 @@ i386_gdbarch_init (struct gdbarch_info i
+--- gdb-6.8.orig/gdb/i386-tdep.c	2008-03-04 20:49:39.000000000 +0100
++++ gdb-6.8/gdb/i386-tdep.c	2008-07-14 10:24:54.000000000 +0200
+@@ -2480,15 +2480,14 @@ i386_gdbarch_init (struct gdbarch_info i
    /* Helper for function argument information.  */
    set_gdbarch_fetch_pointer_argument (gdbarch, i386_fetch_pointer_argument);
  
diff --git a/gdb-6.3-test-sepcrc-20050402.patch b/gdb-6.3-test-sepcrc-20050402.patch
index 25afdf5..65e086f 100644
--- a/gdb-6.3-test-sepcrc-20050402.patch
+++ b/gdb-6.3-test-sepcrc-20050402.patch
@@ -1,10 +1,10 @@
-Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp
+Index: gdb-6.8/gdb/testsuite/gdb.base/sepdebug.exp
 ===================================================================
---- gdb-6.6.orig/gdb/testsuite/gdb.base/sepdebug.exp	2006-10-17 22:17:45.000000000 +0200
-+++ gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp	2007-01-20 18:39:26.000000000 +0100
-@@ -953,3 +953,40 @@ if [istarget "*-*-vxworks*"] {
-     send_gdb "set args main\n"
-     gdb_expect -re ".*$gdb_prompt $" {}
+--- gdb-6.8.orig/gdb/testsuite/gdb.base/sepdebug.exp	2008-02-26 09:14:11.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.base/sepdebug.exp	2008-07-14 10:26:19.000000000 +0200
+@@ -981,3 +981,40 @@ if ![string compare $build_id_debug_file
+     # Spare debug files may confuse testsuite runs in the future.
+     remote_exec build "rm -f ${objdir}/${subdir}/${build_id_debug_filename}"
  }
 +
 +
@@ -43,10 +43,10 @@ Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp
 +	exp_continue
 +    }
 +}
-Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug2.c
+Index: gdb-6.8/gdb/testsuite/gdb.base/sepdebug2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.6/gdb/testsuite/gdb.base/sepdebug2.c	2007-01-20 18:41:35.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.base/sepdebug2.c	2008-07-14 10:26:19.000000000 +0200
 @@ -0,0 +1,5 @@
 +int
 +main (int argc, char *argv[], char *envp[])
diff --git a/gdb-6.3-type-fix-20041213.patch b/gdb-6.3-type-fix-20041213.patch
index 9f6fecc..62f2a50 100644
--- a/gdb-6.3-type-fix-20041213.patch
+++ b/gdb-6.3-type-fix-20041213.patch
@@ -3,9 +3,11 @@
 	* dwarf2read.c (read_type_die): Ensure that structures, unions,
 	enumerations, and base types create symbols.
 
---- gdb-6.3/gdb/dwarf2read.c.fix2	Mon Dec 13 19:44:08 2004
-+++ gdb-6.3/gdb/dwarf2read.c	Mon Dec 13 20:00:42 2004
-@@ -7178,9 +7178,11 @@ read_type_die (struct die_info *die, str
+Index: gdb-6.8/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.8.orig/gdb/dwarf2read.c	2008-03-10 15:18:10.000000000 +0100
++++ gdb-6.8/gdb/dwarf2read.c	2008-07-14 10:26:01.000000000 +0200
+@@ -7711,9 +7711,11 @@ read_type_die (struct die_info *die, str
      case DW_TAG_structure_type:
      case DW_TAG_union_type:
        read_structure_type (die, cu);
@@ -17,11 +19,11 @@
        break;
      case DW_TAG_subprogram:
      case DW_TAG_subroutine_type:
-@@ -7215,6 +7217,7 @@ read_type_die (struct die_info *die, str
+@@ -7751,6 +7753,7 @@ read_type_die (struct die_info *die, str
        break;
      case DW_TAG_base_type:
        read_base_type (die, cu);
 +      new_symbol (die, die->type, cu);
        break;
-     default:
-       complaint (&symfile_complaints, "unexepected tag in read_type_die: '%s'",
+     case DW_TAG_unspecified_type:
+       read_unspecified_type (die, cu);
diff --git a/gdb-6.5-bz190810-gdbserver-arch-advice.patch b/gdb-6.5-bz190810-gdbserver-arch-advice.patch
index c54c8ba..607b34c 100644
--- a/gdb-6.5-bz190810-gdbserver-arch-advice.patch
+++ b/gdb-6.5-bz190810-gdbserver-arch-advice.patch
@@ -7,11 +7,11 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=190810
 	(remote_async_wait): Likewise.
 
 
-Index: gdb-6.6/gdb/remote.c
+Index: gdb-6.8/gdb/remote.c
 ===================================================================
---- gdb-6.6.orig/gdb/remote.c	2007-01-20 06:43:04.000000000 +0100
-+++ gdb-6.6/gdb/remote.c	2007-01-20 06:55:50.000000000 +0100
-@@ -3111,8 +3111,13 @@ Packet: '%s'\n"),
+--- gdb-6.8.orig/gdb/remote.c	2008-07-14 10:27:07.000000000 +0200
++++ gdb-6.8/gdb/remote.c	2008-07-14 10:27:17.000000000 +0200
+@@ -3509,8 +3509,13 @@ Packet: '%s'\n"),
  					 reg->regnum, regs);
  		  }
  
@@ -26,8 +26,8 @@ Index: gdb-6.6/gdb/remote.c
  			 buf, p);
  	      }
  	  }
-@@ -3307,8 +3312,13 @@ Packet: '%s'\n"),
- 		    regcache_raw_supply (current_regcache, reg->regnum, regs);
+@@ -3737,8 +3742,13 @@ Packet: '%s'\n"),
+ 					 reg->regnum, regs);
  		  }
  
 +		/* It may also occur on amd64 which defaults to 32-bit i386
diff --git a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
index cbb24e2..5fee1e6 100644
--- a/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
+++ b/gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch
@@ -1,10 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 
 
-diff -u -rup -x testsuite gdb-6.5-orig/gdb/symtab.c gdb-6.5/gdb/symtab.c
---- gdb-6.5-orig/gdb/symtab.c	2006-12-17 11:59:52.000000000 +0100
-+++ gdb-6.5/gdb/symtab.c	2006-12-17 11:56:03.000000000 +0100
-@@ -2139,6 +2139,13 @@ find_pc_sect_line (CORE_ADDR pc, struct 
+Index: gdb-6.8/gdb/symtab.c
+===================================================================
+--- gdb-6.8.orig/gdb/symtab.c	2008-02-05 23:17:40.000000000 +0100
++++ gdb-6.8/gdb/symtab.c	2008-07-14 10:27:32.000000000 +0200
+@@ -2132,6 +2132,13 @@ find_pc_sect_line (CORE_ADDR pc, struct 
  	  /* See above comment about why warning is commented out */
  	  /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_LINKAGE_NAME (msymbol)) */ ;
  	/* fall through */
@@ -16,5 +17,5 @@ diff -u -rup -x testsuite gdb-6.5-orig/gdb/symtab.c gdb-6.5/gdb/symtab.c
 +	  warning ("In stub for %s (0x%s); interlocked, please submit the binary to http://bugzilla.redhat.com", SYMBOL_LINKAGE_NAME (msymbol), paddr (pc));
 +	/* fall through */
  	else
- 	  return find_pc_line (SYMBOL_VALUE (mfunsym), 0);
+ 	  return find_pc_line (SYMBOL_VALUE_ADDRESS (mfunsym), 0);
        }
diff --git a/gdb-6.6-gcore32-test.patch b/gdb-6.6-gcore32-test.patch
index 0785c8d..4ebfbeb 100644
--- a/gdb-6.6-gcore32-test.patch
+++ b/gdb-6.6-gcore32-test.patch
@@ -3,9 +3,11 @@ Test GCORE on 32bit inferiors on 64bit platforms.
 UNSUPPORTED results are valid for `-m64' on 32bit targets.
 
 
---- ./gdb/testsuite/gdb.base/gcore.exp	9 Jan 2007 17:59:11 -0000	1.9
-+++ ./gdb/testsuite/gdb.base/gcore.exp	23 Apr 2007 19:20:12 -0000
-@@ -31,9 +31,14 @@ set testfile "gcore"
+Index: gdb-6.8/gdb/testsuite/gdb.base/gcore.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.base/gcore.exp	2008-01-01 23:53:19.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.base/gcore.exp	2008-07-14 10:28:05.000000000 +0200
+@@ -30,9 +30,14 @@ set testfile "gcore"
  set srcfile  ${testfile}.c
  set binfile  ${objdir}/${subdir}/${testfile}
  
@@ -23,7 +25,7 @@ UNSUPPORTED results are valid for `-m64' on 32bit targets.
  }
  
  # Start with a fresh gdb.
-@@ -48,23 +52,23 @@ send_gdb "help gcore\n"
+@@ -47,23 +52,23 @@ send_gdb "help gcore\n"
  gdb_expect {
      -re "Undefined command: .gcore.*$gdb_prompt $" {
  	# gcore command not supported -- nothing to test here.
@@ -54,7 +56,7 @@ UNSUPPORTED results are valid for `-m64' on 32bit targets.
  }
  
  proc capture_command_output { command prefix } {
-@@ -78,7 +82,7 @@ proc capture_command_output { command pr
+@@ -77,7 +82,7 @@ proc capture_command_output { command pr
  	    set output_string $expect_out(1,string)
  	}
  	default {
@@ -63,9 +65,9 @@ UNSUPPORTED results are valid for `-m64' on 32bit targets.
  	}
      }
      return $output_string
-@@ -109,15 +113,15 @@ set pre_corefile_extern_array \
- set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test]
+@@ -109,22 +114,22 @@ set escapedfilename [string_to_regexp ${
  
+ set core_supported 0
  gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
 -	"save a corefile" \
 +	"${prefix} save a corefile" \
@@ -82,16 +84,15 @@ UNSUPPORTED results are valid for `-m64' on 32bit targets.
      global core_supported
      set core_supported 0
    }
-@@ -125,7 +129,7 @@ gdb_test_multiple "gcore ${objdir}/${sub
+ }
  
- global core_supported
  if {!$core_supported} {
 -  return -1
 +    continue
  }
  
  # Now restart gdb and load the corefile.
-@@ -137,31 +141,31 @@ gdb_load ${binfile}
+@@ -136,31 +141,31 @@ gdb_load ${binfile}
  send_gdb "core ${objdir}/${subdir}/gcore.test\n"
  gdb_expect {
      -re ".* is not a core dump:.*$gdb_prompt $" {
@@ -132,7 +133,7 @@ UNSUPPORTED results are valid for `-m64' on 32bit targets.
      ".*\[\r\n\]+#0 .* terminal_func \\(\\) at "
      ".*\[\r\n\]+#1 .* array_func \\(\\) at "
      ".*\[\r\n\]+#2 .* factorial_func \\(value=1\\) at "
-@@ -175,61 +179,64 @@ gdb_expect_list "where in corefile" ".*$
+@@ -174,61 +179,64 @@ gdb_expect_list "where in corefile" ".*$
  
  set post_corefile_regs [capture_command_output "info registers" ""]
  if ![string compare $pre_corefile_regs $post_corefile_regs] then {
diff --git a/gdb-6.6-vdso-i386-on-amd64-warning.patch b/gdb-6.6-vdso-i386-on-amd64-warning.patch
index 7ba41ff..47ac154 100644
--- a/gdb-6.6-vdso-i386-on-amd64-warning.patch
+++ b/gdb-6.6-vdso-i386-on-amd64-warning.patch
@@ -7,11 +7,11 @@ Fix i386-on-x86_64 debugging giving the warning:
 
 	Port to GDB-6.7.
 
-Index: gdb-6.7/gdb/symfile.c
+Index: gdb-6.8/gdb/symfile.c
 ===================================================================
---- gdb-6.7.orig/gdb/symfile.c	2007-10-16 16:46:30.000000000 +0200
-+++ gdb-6.7/gdb/symfile.c	2007-10-16 20:08:42.000000000 +0200
-@@ -717,6 +717,38 @@ default_symfile_segments (bfd *abfd)
+--- gdb-6.8.orig/gdb/symfile.c	2008-07-14 10:28:15.000000000 +0200
++++ gdb-6.8/gdb/symfile.c	2008-07-14 10:28:21.000000000 +0200
+@@ -715,6 +715,38 @@ default_symfile_segments (bfd *abfd)
    return data;
  }
  
@@ -50,9 +50,9 @@ Index: gdb-6.7/gdb/symfile.c
  /* Process a symbol file, as either the main file or as a dynamically
     loaded file.
  
-@@ -815,32 +847,11 @@ syms_from_objfile (struct objfile *objfi
+@@ -813,32 +845,11 @@ syms_from_objfile (struct objfile *objfi
       happens for the PA64 port.  */
-   if (/*!mainline &&*/ addrs && addrs->other[0].name)
+   if (!mainline && addrs && addrs->other[0].name)
      {
 -      asection *lower_sect;
        asection *sect;
@@ -85,7 +85,7 @@ Index: gdb-6.7/gdb/symfile.c
        /* Calculate offsets for the loadable sections.
   	 FIXME! Sections must be in order of increasing loadable section
   	 so that contiguous sections can use the lower-offset!!!
-@@ -862,6 +873,7 @@ syms_from_objfile (struct objfile *objfi
+@@ -860,6 +871,7 @@ syms_from_objfile (struct objfile *objfi
                      addrs->other[i].addr
                        -= bfd_section_vma (objfile->obfd, sect);
                      lower_offset = addrs->other[i].addr;
@@ -93,7 +93,7 @@ Index: gdb-6.7/gdb/symfile.c
                      /* This is the index used by BFD. */
                      addrs->other[i].sectindex = sect->index ;
                    }
-@@ -874,7 +886,17 @@ syms_from_objfile (struct objfile *objfi
+@@ -872,7 +884,17 @@ syms_from_objfile (struct objfile *objfi
                    }
                }
              else
diff --git a/gdb-6.8-constant-watchpoints.patch b/gdb-6.8-constant-watchpoints.patch
index 69dcefd..cdf1f68 100644
--- a/gdb-6.8-constant-watchpoints.patch
+++ b/gdb-6.8-constant-watchpoints.patch
@@ -18,9 +18,11 @@
 	gdb.base/watchpoint.c (global_ptr_ptr): New variable.
 	(func4): New testing code for GLOBAL_PTR_PTR.
 
---- ./gdb/breakpoint.c	8 Jul 2008 11:09:40 -0000	1.330
-+++ ./gdb/breakpoint.c	10 Jul 2008 08:19:07 -0000
-@@ -824,7 +824,15 @@ is_hardware_watchpoint (struct breakpoin
+Index: gdb-6.8/gdb/breakpoint.c
+===================================================================
+--- gdb-6.8.orig/gdb/breakpoint.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/breakpoint.c	2008-07-14 10:28:36.000000000 +0200
+@@ -846,7 +846,15 @@ is_hardware_watchpoint (struct breakpoin
     If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the
     value chain.  The caller must free the values individually.  If
     VAL_CHAIN is NULL, all generated values will be left on the value
@@ -37,7 +39,7 @@
  
  static void
  fetch_watchpoint_value (struct expression *exp, struct value **valp,
-@@ -5832,7 +5840,7 @@ watch_command_1 (char *arg, int accessfl
+@@ -5705,7 +5713,7 @@ watch_command_1 (char *arg, int accessfl
    struct symtab_and_line sal;
    struct expression *exp;
    struct block *exp_valid_block;
@@ -46,7 +48,7 @@
    struct frame_info *frame;
    struct frame_info *prev_frame = NULL;
    char *exp_start = NULL;
-@@ -5918,6 +5926,27 @@ watch_command_1 (char *arg, int accessfl
+@@ -5791,6 +5799,27 @@ watch_command_1 (char *arg, int accessfl
    exp_valid_block = innermost_block;
    mark = value_mark ();
    fetch_watchpoint_value (exp, &val, NULL, NULL);
@@ -74,8 +76,10 @@
    if (val != NULL)
      release_value (val);
  
---- ./gdb/gdbtypes.h	3 May 2008 22:20:13 -0000	1.87
-+++ ./gdb/gdbtypes.h	10 Jul 2008 08:19:08 -0000
+Index: gdb-6.8/gdb/gdbtypes.h
+===================================================================
+--- gdb-6.8.orig/gdb/gdbtypes.h	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/gdbtypes.h	2008-07-14 10:28:36.000000000 +0200
 @@ -69,7 +69,22 @@ enum type_code
      TYPE_CODE_UNION,		/* C union or Pascal variant part */
      TYPE_CODE_ENUM,		/* Enumeration type */
@@ -100,9 +104,11 @@
      TYPE_CODE_INT,		/* Integer type */
  
      /* Floating type.  This is *NOT* a complex type.  Beware, there are parts
---- ./gdb/doc/gdb.texinfo	7 Jul 2008 12:05:30 -0000	1.506
-+++ ./gdb/doc/gdb.texinfo	10 Jul 2008 08:19:37 -0000
-@@ -3375,6 +3375,18 @@ This command prints a list of watchpoint
+Index: gdb-6.8/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.8.orig/gdb/doc/gdb.texinfo	2008-07-14 10:28:29.000000000 +0200
++++ gdb-6.8/gdb/doc/gdb.texinfo	2008-07-14 10:28:36.000000000 +0200
+@@ -3267,6 +3267,18 @@ This command prints a list of watchpoint
  it is the same as @code{info break} (@pxref{Set Breaks}).
  @end table
  
@@ -121,8 +127,10 @@
  @value{GDBN} sets a @dfn{hardware watchpoint} if possible.  Hardware
  watchpoints execute very quickly, and the debugger reports a change in
  value at the exact instruction where the change occurs.  If @value{GDBN}
---- ./gdb/testsuite/gdb.base/watchpoint.c	3 Mar 2008 13:24:12 -0000	1.3
-+++ ./gdb/testsuite/gdb.base/watchpoint.c	10 Jul 2008 08:19:39 -0000
+Index: gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c	2008-07-14 10:28:36.000000000 +0200
 @@ -40,6 +40,7 @@ struct foo struct1, struct2, *ptr1, *ptr
  int doread = 0;
  
@@ -142,8 +150,10 @@
  }
  
  int main ()
---- ./gdb/testsuite/gdb.base/watchpoint.exp	15 Apr 2008 14:33:54 -0000	1.18
-+++ ./gdb/testsuite/gdb.base/watchpoint.exp	10 Jul 2008 08:19:41 -0000
+Index: gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp	2008-07-14 10:28:36.000000000 +0200
 @@ -644,7 +644,21 @@ proc test_watchpoint_and_breakpoint {} {
  	}
      }
@@ -205,8 +215,8 @@
 +	gdb_test "delete \$global_ptr_ptr_breakpoint_number" ""
      }
  }
-     
-@@ -833,6 +870,17 @@ if [initialize] then {
+ 
+@@ -834,6 +871,17 @@ if [initialize] then {
      }
  
      test_watchpoint_and_breakpoint
diff --git a/gdb-6.8-disable-randomization.patch b/gdb-6.8-disable-randomization.patch
index 87dce3a..2f9e925 100644
--- a/gdb-6.8-disable-randomization.patch
+++ b/gdb-6.8-disable-randomization.patch
@@ -24,9 +24,11 @@
 
 [ Ported for Fedora GDB.  ]
 
---- ./gdb/config.in	5 Jun 2008 22:36:56 -0000	1.100
-+++ ./gdb/config.in	8 Jun 2008 11:27:20 -0000
-@@ -82,6 +82,10 @@
+Index: gdb-6.8/gdb/config.in
+===================================================================
+--- gdb-6.8.orig/gdb/config.in	2008-07-14 10:27:27.000000000 +0200
++++ gdb-6.8/gdb/config.in	2008-07-14 10:28:50.000000000 +0200
+@@ -64,6 +64,10 @@
  /* Define to 1 if you have the <curses.h> header file. */
  #undef HAVE_CURSES_H
  
@@ -37,7 +39,7 @@
  /* Define to 1 if you have the declaration of `free', and to 0 if you don't.
     */
  #undef HAVE_DECL_FREE
-@@ -237,6 +241,9 @@
+@@ -203,6 +207,9 @@
  /* Define to 1 if you have the <nlist.h> header file. */
  #undef HAVE_NLIST_H
  
@@ -47,9 +49,11 @@
  /* Define to 1 if you have the `poll' function. */
  #undef HAVE_POLL
  
---- ./gdb/configure	5 Jun 2008 22:36:56 -0000	1.249
-+++ ./gdb/configure	8 Jun 2008 11:27:41 -0000
-@@ -26701,6 +26701,188 @@ _ACEOF
+Index: gdb-6.8/gdb/configure
+===================================================================
+--- gdb-6.8.orig/gdb/configure	2008-07-14 10:27:27.000000000 +0200
++++ gdb-6.8/gdb/configure	2008-07-14 10:28:50.000000000 +0200
+@@ -22911,6 +22911,188 @@ _ACEOF
  
  fi
  
@@ -238,9 +242,11 @@
  
  
  # Check whether --with-sysroot or --without-sysroot was given.
---- ./gdb/configure.ac	5 Jun 2008 22:36:56 -0000	1.69
-+++ ./gdb/configure.ac	8 Jun 2008 11:27:44 -0000
-@@ -1266,6 +1266,29 @@ if test "x$gdb_cv_sys_syscall_h_has_tkil
+Index: gdb-6.8/gdb/configure.ac
+===================================================================
+--- gdb-6.8.orig/gdb/configure.ac	2008-07-14 10:27:27.000000000 +0200
++++ gdb-6.8/gdb/configure.ac	2008-07-14 10:28:50.000000000 +0200
+@@ -1254,6 +1254,29 @@ if test "x$gdb_cv_sys_syscall_h_has_tkil
    AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.])
  fi
  
@@ -270,8 +276,10 @@
  dnl Handle optional features that can be enabled.
  
  AC_ARG_WITH(sysroot,
---- gdb-6.8/gdb/fork-child.c.orig	2008-01-29 22:11:24.000000000 +0100
-+++ gdb-6.8/gdb/fork-child.c	2008-06-17 15:15:07.000000000 +0200
+Index: gdb-6.8/gdb/fork-child.c
+===================================================================
+--- gdb-6.8.orig/gdb/fork-child.c	2008-01-29 22:11:24.000000000 +0100
++++ gdb-6.8/gdb/fork-child.c	2008-07-14 10:28:50.000000000 +0200
 @@ -32,12 +32,45 @@
  #include "gdbthread.h"
  #include "command.h" /* for dont_repeat () */
@@ -367,11 +375,13 @@
 +			   &show_disable_randomization,
 +			   &setlist, &showlist);
 +}
---- ./gdb/doc/gdb.texinfo	6 Jun 2008 20:58:08 -0000	1.503
-+++ ./gdb/doc/gdb.texinfo	8 Jun 2008 11:28:51 -0000
-@@ -1999,6 +1999,57 @@ environment:
- This command is available when debugging locally on most targets, excluding
- @sc{djgpp}, Cygwin, MS Windows, and QNX Neutrino.
+Index: gdb-6.8/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.8.orig/gdb/doc/gdb.texinfo	2008-07-14 10:28:36.000000000 +0200
++++ gdb-6.8/gdb/doc/gdb.texinfo	2008-07-14 10:28:50.000000000 +0200
+@@ -1820,6 +1820,57 @@ argument to @value{GDBN} (@pxref{Invocat
+ @value{GDBN}}), or by using the @code{file} or @code{exec-file} command
+ (@pxref{Files, ,Commands to Specify Files}).
  
 +@kindex set disable-randomization
 +@item set disable-randomization
@@ -426,9 +436,11 @@
 +
  @end table
  
- @node Arguments
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/randomize.c	8 Jun 2008 11:28:53 -0000
+ If you are running your program in an execution environment that
+Index: gdb-6.8/gdb/testsuite/gdb.base/randomize.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.base/randomize.c	2008-07-14 10:28:50.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -462,8 +474,10 @@
 +
 +  return 0;
 +}
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/randomize.exp	8 Jun 2008 11:28:53 -0000
+Index: gdb-6.8/gdb/testsuite/gdb.base/randomize.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.base/randomize.exp	2008-07-14 10:28:50.000000000 +0200
 @@ -0,0 +1,63 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
diff --git a/gdb-6.8-inlining.patch b/gdb-6.8-inlining.patch
index d45bf7b..70cd8c9 100644
--- a/gdb-6.8-inlining.patch
+++ b/gdb-6.8-inlining.patch
@@ -4,9 +4,10 @@ http://sourceware.org/ml/gdb-patches/2008-06/msg00379.html
 
 [ Backported for gdb-6.8fedora.  ]
 
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Makefile.in gdb-6.8/gdb/Makefile.in
---- gdb-6.8-clean/gdb/Makefile.in	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/Makefile.in	2008-06-17 12:30:08.000000000 +0200
+Index: gdb-6.8/gdb/Makefile.in
+===================================================================
+--- gdb-6.8.orig/gdb/Makefile.in	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/Makefile.in	2008-07-14 10:29:07.000000000 +0200
 @@ -607,6 +607,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr
  	inf-loop.c \
  	infcall.c \
@@ -23,7 +24,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Ma
  	gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \
  	cp-namespace.o \
  	reggroups.o regset.o \
-@@ -2100,13 +2102,13 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_
+@@ -2106,13 +2108,13 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_
  	$(gdbcore_h) $(target_h) $(inferior_h) $(ax_h) $(ax_gdb_h) \
  	$(regcache_h) $(objfiles_h) $(exceptions_h) $(elf_dwarf2_h) \
  	$(dwarf2expr_h) $(dwarf2loc_h) $(gdb_string_h) $(gdb_assert_h) \
@@ -39,7 +40,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Ma
  elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \
  	$(elf_mips_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \
  	$(stabsread_h) $(gdb_stabs_h) $(complaints_h) $(demangle_h) \
-@@ -2155,7 +2157,8 @@ frame.o: frame.c $(defs_h) $(frame_h) $(
+@@ -2161,7 +2163,8 @@ frame.o: frame.c $(defs_h) $(frame_h) $(
  	$(regcache_h) $(gdb_assert_h) $(gdb_string_h) $(user_regs_h) \
  	$(gdb_obstack_h) $(dummy_frame_h) $(sentinel_frame_h) $(gdbcore_h) \
  	$(annotate_h) $(language_h) $(frame_unwind_h) $(frame_base_h) \
@@ -49,7 +50,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Ma
  frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \
  	$(gdb_assert_h) $(dummy_frame_h) $(gdb_obstack_h)
  frv-linux-tdep.o: frv-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \
-@@ -2329,7 +2332,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin
+@@ -2335,7 +2338,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin
  	$(objfiles_h) $(completer_h) $(ui_out_h) $(event_top_h) \
  	$(parser_defs_h) $(regcache_h) $(reggroups_h) $(block_h) \
  	$(solib_h) $(gdb_assert_h) $(observer_h) $(target_descriptions_h) \
@@ -58,7 +59,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Ma
  inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(target_h) $(event_loop_h) \
  	$(event_top_h) $(inf_loop_h) $(remote_h) $(exceptions_h)
  inflow.o: inflow.c $(defs_h) $(frame_h) $(inferior_h) $(command_h) \
-@@ -2347,6 +2350,8 @@ infrun.o: infrun.c $(defs_h) $(gdb_strin
+@@ -2353,6 +2356,8 @@ infrun.o: infrun.c $(defs_h) $(gdb_strin
  inf-ttrace.o: inf-ttrace.c $(defs_h) $(command_h) $(gdbcore_h) \
  	$(gdbthread_h) $(inferior_h) $(target_h) \
  	$(gdb_assert_h) $(gdb_string_h) $(inf_child_h) $(inf_ttrace_h)
@@ -67,9 +68,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/Ma
  interps.o: interps.c $(defs_h) $(gdbcmd_h) $(ui_out_h) $(event_loop_h) \
  	$(event_top_h) $(interps_h) $(completer_h) $(gdb_string_h) \
  	$(gdb_events_h) $(gdb_assert_h) $(top_h) $(exceptions_h)
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/ada-lang.c gdb-6.8/gdb/ada-lang.c
---- gdb-6.8-clean/gdb/ada-lang.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/ada-lang.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/ada-lang.c
+===================================================================
+--- gdb-6.8.orig/gdb/ada-lang.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/ada-lang.c	2008-07-14 10:29:07.000000000 +0200
 @@ -4624,7 +4624,7 @@ remove_irrelevant_renamings (struct ada_
    if (current_block == NULL)
      return nsyms;
@@ -106,9 +108,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/ad
  
    annotate_catchpoint (b->number);
    switch (ex)
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/block.c gdb-6.8/gdb/block.c
---- gdb-6.8-clean/gdb/block.c	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/block.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/block.c
+===================================================================
+--- gdb-6.8.orig/gdb/block.c	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/block.c	2008-07-14 10:29:07.000000000 +0200
 @@ -47,23 +47,40 @@ contained_in (const struct block *a, con
  {
    if (!a || !b)
@@ -164,9 +167,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/bl
  
    return bl;
  }
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/block.h gdb-6.8/gdb/block.h
---- gdb-6.8-clean/gdb/block.h	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/block.h	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/block.h
+===================================================================
+--- gdb-6.8.orig/gdb/block.h	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/block.h	2008-07-14 10:29:07.000000000 +0200
 @@ -65,7 +65,7 @@ struct block
    CORE_ADDR endaddr;
  
@@ -205,9 +209,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/bl
  
  extern int contained_in (const struct block *, const struct block *);
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/blockframe.c gdb-6.8/gdb/blockframe.c
---- gdb-6.8-clean/gdb/blockframe.c	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/blockframe.c	2008-06-24 22:38:08.000000000 +0200
+Index: gdb-6.8/gdb/blockframe.c
+===================================================================
+--- gdb-6.8.orig/gdb/blockframe.c	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/blockframe.c	2008-07-14 10:29:07.000000000 +0200
 @@ -61,11 +61,44 @@ struct block *
  get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block)
  {
@@ -305,10 +310,11 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/bl
  	return frame;
  
        frame = get_prev_frame (frame);
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c
---- gdb-6.8-clean/gdb/breakpoint.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/breakpoint.c	2008-06-23 01:24:59.000000000 +0200
-@@ -2591,18 +2591,21 @@ watchpoint_check (void *p)
+Index: gdb-6.8/gdb/breakpoint.c
+===================================================================
+--- gdb-6.8.orig/gdb/breakpoint.c	2008-07-14 10:28:36.000000000 +0200
++++ gdb-6.8/gdb/breakpoint.c	2008-07-14 10:29:07.000000000 +0200
+@@ -2602,18 +2602,21 @@ watchpoint_check (void *p)
      within_current_scope = 1;
    else
      {
@@ -337,7 +343,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
  
        /* in_function_epilogue_p() returns a non-zero value if we're still
  	 in the function but the stack frame has already been invalidated.
-@@ -2614,10 +2617,9 @@ watchpoint_check (void *p)
+@@ -2625,10 +2628,9 @@ watchpoint_check (void *p)
  	 that the watchpoint frame couldn't be found by frame_find_by_id()
  	 because the current PC is currently in an epilogue.  Calling
  	 gdbarch_in_function_epilogue_p() also when fr == NULL fixes that. */
@@ -350,7 +356,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
  	/* If we end up stopping, the current frame will get selected
  	   in normal_stop.  So this call to select_frame won't affect
  	   the user.  */
-@@ -2918,7 +2920,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -2929,7 +2931,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
        }
  
      if (frame_id_p (b->frame_id)
@@ -359,7 +365,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
        bs->stop = 0;
      else
        {
-@@ -2933,9 +2935,13 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -2944,9 +2946,13 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  
  	if (bl->cond && bl->owner->disposition != disp_del_at_next_stop)
  	  {
@@ -376,7 +382,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
  	    value_is_zero
  	      = catch_errors (breakpoint_cond_eval, (bl->cond),
  			      "Error in testing breakpoint condition:\n",
-@@ -2980,6 +2986,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
+@@ -2991,6 +2997,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
  		bs->print = 0;
  	      }
  	    bs->commands = copy_command_lines (bs->commands);
@@ -388,7 +394,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
  	  }
        }
      /* Print nothing for this entry if we dont stop or if we dont print.  */
-@@ -5629,7 +5640,7 @@ resolve_sal_pc (struct symtab_and_line *
+@@ -5583,7 +5594,7 @@ resolve_sal_pc (struct symtab_and_line *
        bv = blockvector_for_pc_sect (sal->pc, 0, &b, sal->symtab);
        if (bv != NULL)
  	{
@@ -397,15 +403,15 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
  	  if (sym != NULL)
  	    {
  	      fixup_symbol_section (sym, sal->symtab->objfile);
-@@ -5761,7 +5772,6 @@ watch_command_1 (char *arg, int accessfl
+@@ -5715,7 +5726,6 @@ watch_command_1 (char *arg, int accessfl
    struct block *exp_valid_block;
-   struct value *val, *mark;
+   struct value *val, *mark, *val_chain;
    struct frame_info *frame;
 -  struct frame_info *prev_frame = NULL;
    char *exp_start = NULL;
    char *exp_end = NULL;
    char *tok, *id_tok_start, *end_tok;
-@@ -5895,34 +5905,36 @@ watch_command_1 (char *arg, int accessfl
+@@ -5870,34 +5880,36 @@ watch_command_1 (char *arg, int accessfl
      bp_type = bp_watchpoint;
  
    frame = block_innermost_frame (exp_valid_block);
@@ -460,7 +466,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
      }
  
    /* Now set up the breakpoint.  */
-@@ -6095,7 +6107,6 @@ until_break_command (char *arg, int from
+@@ -6070,7 +6082,6 @@ until_break_command (char *arg, int from
    struct symtabs_and_lines sals;
    struct symtab_and_line sal;
    struct frame_info *frame = get_selected_frame (NULL);
@@ -468,7 +474,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
    struct breakpoint *breakpoint;
    struct cleanup *old_chain;
    struct continuation_arg *arg1;
-@@ -6162,11 +6173,14 @@ until_break_command (char *arg, int from
+@@ -6137,11 +6148,14 @@ until_break_command (char *arg, int from
  
    /* Keep within the current frame, or in frames called by the current
       one.  */
@@ -487,9 +493,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/br
  					     bp_until);
        if (!target_can_async_p ())
  	make_cleanup_delete_breakpoint (breakpoint);
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/buildsym.c gdb-6.8/gdb/buildsym.c
---- gdb-6.8-clean/gdb/buildsym.c	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/buildsym.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/buildsym.c
+===================================================================
+--- gdb-6.8.orig/gdb/buildsym.c	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/buildsym.c	2008-07-14 10:29:07.000000000 +0200
 @@ -1141,6 +1141,12 @@ end_symtab (CORE_ADDR end_addr, struct o
  	  struct symbol *sym;
  	  struct dict_iterator iter;
@@ -503,9 +510,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/bu
  	  for (sym = dict_iterator_first (BLOCK_DICT (block), &iter);
  	       sym != NULL;
  	       sym = dict_iterator_next (&iter))
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/doc/gdb.texinfo gdb-6.8/gdb/doc/gdb.texinfo
---- gdb-6.8-clean/gdb/doc/gdb.texinfo	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/doc/gdb.texinfo	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/doc/gdb.texinfo
+===================================================================
+--- gdb-6.8.orig/gdb/doc/gdb.texinfo	2008-07-14 10:28:50.000000000 +0200
++++ gdb-6.8/gdb/doc/gdb.texinfo	2008-07-14 10:29:07.000000000 +0200
 @@ -136,6 +136,7 @@ software in general.  We will miss him.
  * Stack::                       Examining the stack
  * Source::                      Examining source files
@@ -547,7 +555,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/do
  
  Older versions of the @sc{gnu} C compiler permitted a variant option
  @w{@samp{-gg}} for debugging information.  @value{GDBN} no longer supports this
-@@ -7546,6 +7532,100 @@ the data cache operation.
+@@ -7609,6 +7595,100 @@ the data cache operation.
  @end table
  
  
@@ -648,9 +656,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/do
  @node Macros
  @chapter C Preprocessor Macros
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/dwarf2loc.c gdb-6.8/gdb/dwarf2loc.c
---- gdb-6.8-clean/gdb/dwarf2loc.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/dwarf2loc.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/dwarf2loc.c
+===================================================================
+--- gdb-6.8.orig/gdb/dwarf2loc.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/dwarf2loc.c	2008-07-14 10:29:07.000000000 +0200
 @@ -31,6 +31,7 @@
  #include "regcache.h"
  #include "objfiles.h"
@@ -681,9 +690,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/dw
      {
        struct dwarf2_loclist_baton *symbaton;
        struct frame_info *frame = debaton->frame;
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/dwarf2read.c gdb-6.8/gdb/dwarf2read.c
---- gdb-6.8-clean/gdb/dwarf2read.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/dwarf2read.c	2008-06-16 20:41:01.000000000 +0200
+Index: gdb-6.8/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.8.orig/gdb/dwarf2read.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/dwarf2read.c	2008-07-14 10:29:07.000000000 +0200
 @@ -48,6 +48,7 @@
  #include "gdbcmd.h"
  #include "dwarf2block.h"
@@ -834,9 +844,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/dw
  	    }
  	  attr = dwarf2_attr (die, DW_AT_const_value, cu);
  	  if (attr)
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/findvar.c gdb-6.8/gdb/findvar.c
---- gdb-6.8-clean/gdb/findvar.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/findvar.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/findvar.c
+===================================================================
+--- gdb-6.8.orig/gdb/findvar.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/findvar.c	2008-07-14 10:29:07.000000000 +0200
 @@ -518,13 +518,11 @@ addresses have not been bound by the dyn
      case LOC_REGPARM:
      case LOC_REGPARM_ADDR:
@@ -851,9 +862,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/fi
  
  	if (SYMBOL_CLASS (var) == LOC_REGPARM_ADDR)
  	  {
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame-unwind.c gdb-6.8/gdb/frame-unwind.c
---- gdb-6.8-clean/gdb/frame-unwind.c	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/frame-unwind.c	2008-06-23 01:46:54.000000000 +0200
+Index: gdb-6.8/gdb/frame-unwind.c
+===================================================================
+--- gdb-6.8.orig/gdb/frame-unwind.c	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/frame-unwind.c	2008-07-14 10:29:07.000000000 +0200
 @@ -49,8 +49,10 @@ frame_unwind_init (struct obstack *obsta
       can't override this.  */
    table->list = OBSTACK_ZALLOC (obstack, struct frame_unwind_table_entry);
@@ -924,9 +936,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/fr
  	}
      }
    internal_error (__FILE__, __LINE__, _("frame_unwind_find_by_frame failed"));
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame-unwind.h gdb-6.8/gdb/frame-unwind.h
---- gdb-6.8-clean/gdb/frame-unwind.h	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/frame-unwind.h	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/frame-unwind.h
+===================================================================
+--- gdb-6.8.orig/gdb/frame-unwind.h	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/frame-unwind.h	2008-07-14 10:29:07.000000000 +0200
 @@ -143,6 +143,8 @@ struct frame_unwind
    frame_dealloc_cache_ftype *dealloc_cache;
  };
@@ -936,9 +949,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/fr
  /* Register a frame unwinder, _prepending_ it to the front of the
     search list (so it is sniffed before previously registered
     unwinders).  By using a prepend, later calls can install unwinders
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame.c gdb-6.8/gdb/frame.c
---- gdb-6.8-clean/gdb/frame.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/frame.c	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/frame.c
+===================================================================
+--- gdb-6.8.orig/gdb/frame.c	2008-07-14 10:27:07.000000000 +0200
++++ gdb-6.8/gdb/frame.c	2008-07-14 10:29:07.000000000 +0200
 @@ -40,8 +40,13 @@
  #include "observer.h"
  #include "objfiles.h"
@@ -1330,9 +1344,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/fr
  deprecated_update_frame_pc_hack (struct frame_info *frame, CORE_ADDR pc)
  {
    if (frame_debug)
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/frame.h gdb-6.8/gdb/frame.h
---- gdb-6.8-clean/gdb/frame.h	2008-01-01 23:53:09.000000000 +0100
-+++ gdb-6.8/gdb/frame.h	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/frame.h
+===================================================================
+--- gdb-6.8.orig/gdb/frame.h	2008-01-01 23:53:09.000000000 +0100
++++ gdb-6.8/gdb/frame.h	2008-07-14 10:29:07.000000000 +0200
 @@ -122,6 +122,17 @@ struct frame_id
    unsigned int stack_addr_p : 1;
    unsigned int code_addr_p : 1;
@@ -1413,9 +1428,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/fr
 +extern struct symbol *inline_skipped_symbol (void);
 +
  #endif /* !defined (FRAME_H)  */
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/infcall.c gdb-6.8/gdb/infcall.c
---- gdb-6.8-clean/gdb/infcall.c	2008-01-08 20:28:08.000000000 +0100
-+++ gdb-6.8/gdb/infcall.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/infcall.c
+===================================================================
+--- gdb-6.8.orig/gdb/infcall.c	2008-01-08 20:28:08.000000000 +0100
++++ gdb-6.8/gdb/infcall.c	2008-07-14 10:29:07.000000000 +0200
 @@ -757,11 +757,8 @@ call_function_by_hand (struct value *fun
  
  	  if (unwind_on_signal_p)
@@ -1430,9 +1446,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  
  	      /* FIXME: Insert a bunch of wrap_here; name can be very
  		 long if it's a C++ name with arguments and stuff.  */
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/infcmd.c gdb-6.8/gdb/infcmd.c
---- gdb-6.8-clean/gdb/infcmd.c	2008-01-31 14:37:21.000000000 +0100
-+++ gdb-6.8/gdb/infcmd.c	2008-06-23 01:23:52.000000000 +0200
+Index: gdb-6.8/gdb/infcmd.c
+===================================================================
+--- gdb-6.8.orig/gdb/infcmd.c	2008-01-31 14:37:21.000000000 +0100
++++ gdb-6.8/gdb/infcmd.c	2008-07-14 10:29:07.000000000 +0200
 @@ -48,6 +48,7 @@
  #include "observer.h"
  #include "target-descriptions.h"
@@ -1628,9 +1645,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
    sal = find_pc_line (get_frame_pc (frame), 0);
    sal.pc = get_frame_pc (frame);
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/inferior.h gdb-6.8/gdb/inferior.h
---- gdb-6.8-clean/gdb/inferior.h	2008-06-24 22:58:30.000000000 +0200
-+++ gdb-6.8/gdb/inferior.h	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/inferior.h
+===================================================================
+--- gdb-6.8.orig/gdb/inferior.h	2008-07-14 10:25:43.000000000 +0200
++++ gdb-6.8/gdb/inferior.h	2008-07-14 10:29:07.000000000 +0200
 @@ -254,6 +254,8 @@ extern void get_last_target_status(ptid_
  
  extern void follow_inferior_reset_breakpoints (void);
@@ -1640,9 +1658,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  /* From infcmd.c */
  
  extern void tty_command (char *, int);
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/infrun.c gdb-6.8/gdb/infrun.c
---- gdb-6.8-clean/gdb/infrun.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/infrun.c	2008-06-17 11:35:38.000000000 +0200
+Index: gdb-6.8/gdb/infrun.c
+===================================================================
+--- gdb-6.8.orig/gdb/infrun.c	2008-07-14 10:28:15.000000000 +0200
++++ gdb-6.8/gdb/infrun.c	2008-07-14 10:29:07.000000000 +0200
 @@ -276,6 +276,11 @@ static int stop_print_frame;
  
  static struct breakpoint *step_resume_breakpoint = NULL;
@@ -1767,7 +1786,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  	  && step_resume_breakpoint == NULL)
  	{
  	  /* The inferior is about to take a signal that will take it
-@@ -2423,12 +2458,7 @@ process_event_stop_test:
+@@ -2418,12 +2453,7 @@ process_event_stop_test:
       until we exit the run time loader code and reach the callee's
       address.  */
    if (step_over_calls == STEP_OVER_UNDEBUGGABLE
@@ -1781,7 +1800,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
      {
        CORE_ADDR pc_after_resolver =
  	gdbarch_skip_solib_resolver (current_gdbarch, stop_pc);
-@@ -2472,11 +2502,12 @@ process_event_stop_test:
+@@ -2467,11 +2497,12 @@ process_event_stop_test:
       previous frame's ID is sufficient - but it is a common case and
       cheaper than checking the previous frame's ID.
  
@@ -1797,7 +1816,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
      {
        CORE_ADDR real_stop_pc;
  
-@@ -2521,13 +2552,7 @@ process_event_stop_test:
+@@ -2516,13 +2547,7 @@ process_event_stop_test:
        if (real_stop_pc != 0)
  	ecs->stop_func_start = real_stop_pc;
  
@@ -1812,7 +1831,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  	{
  	  struct symtab_and_line sr_sal;
  	  init_sal (&sr_sal);
-@@ -2675,9 +2700,82 @@ process_event_stop_test:
+@@ -2670,9 +2695,82 @@ process_event_stop_test:
        return;
      }
  
@@ -1897,7 +1916,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
      {
        /* We are at the start of a different line.  So stop.  Note that
           we don't stop if we step into the middle of a different line.
-@@ -2700,13 +2798,11 @@ process_event_stop_test:
+@@ -2695,13 +2793,11 @@ process_event_stop_test:
  
    step_range_start = ecs->sal.pc;
    step_range_end = ecs->sal.end;
@@ -1913,7 +1932,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  #if 0
    /* NOTE: cagney/2003-10-16: I think this frame ID inner test is too
       generous.  It will trigger on things like a step into a frameless
-@@ -2723,13 +2819,6 @@ process_event_stop_test:
+@@ -2718,13 +2814,6 @@ process_event_stop_test:
       and we're willing to introduce frame unwind logic into this
       function.  Fortunately, those days are nearly upon us.  */
  #endif
@@ -1927,7 +1946,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  
    if (debug_infrun)
       fprintf_unfiltered (gdb_stdlog, "infrun: keep going\n");
-@@ -3150,17 +3239,6 @@ normal_stop (void)
+@@ -3145,17 +3234,6 @@ normal_stop (void)
        previous_inferior_ptid = inferior_ptid;
      }
  
@@ -1945,7 +1964,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
    if (target_has_execution)
      {
        if (remove_breakpoints ())
-@@ -3195,7 +3273,7 @@ Further execution is probably impossible
+@@ -3190,7 +3268,7 @@ Further execution is probably impossible
       display the frame below, but the current SAL will be incorrect
       during a user hook-stop function.  */
    if (target_has_stack && !stop_stack_dummy)
@@ -1954,7 +1973,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  
    /* Look up the hook_stop and run it (CLI internally handles problem
       of stop_command's pre-hook not existing).  */
-@@ -3205,7 +3283,6 @@ Further execution is probably impossible
+@@ -3200,7 +3278,6 @@ Further execution is probably impossible
  
    if (!target_has_stack)
      {
@@ -1962,7 +1981,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
        goto done;
      }
  
-@@ -3216,7 +3293,7 @@ Further execution is probably impossible
+@@ -3211,7 +3288,7 @@ Further execution is probably impossible
  
    if (!stop_stack_dummy)
      {
@@ -1971,7 +1990,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  
        /* Print current location without a level number, if
           we have changed functions or hit a breakpoint.
-@@ -3251,7 +3328,7 @@ Further execution is probably impossible
+@@ -3246,7 +3323,7 @@ Further execution is probably impossible
  	         should) use that when doing a frame comparison.  */
  	      if (stop_step
  		  && frame_id_eq (step_frame_id,
@@ -1980,7 +1999,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  		  && step_start_function == find_pc_function (stop_pc))
  		source_flag = SRC_LINE;	/* finished step, just print source line */
  	      else
-@@ -3310,7 +3387,7 @@ Further execution is probably impossible
+@@ -3305,7 +3382,7 @@ Further execution is probably impossible
           Can't rely on restore_inferior_status because that only gets
           called if we don't stop in the called function.  */
        stop_pc = read_pc ();
@@ -1989,7 +2008,7 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
      }
  
  done:
-@@ -3824,7 +3901,7 @@ restore_inferior_status (struct inferior
+@@ -3819,7 +3896,7 @@ restore_inferior_status (struct inferior
  	   RETURN_MASK_ERROR) == 0)
  	/* Error in restoring the selected frame.  Select the innermost
  	   frame.  */
@@ -1998,9 +2017,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
  
      }
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/inline-frame.c gdb-6.8/gdb/inline-frame.c
---- gdb-6.8-clean/gdb/inline-frame.c	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/inline-frame.c	2008-06-24 22:59:37.000000000 +0200
+Index: gdb-6.8/gdb/inline-frame.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/inline-frame.c	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,353 @@
 +/* Inline frame unwinder for GDB.
 +
@@ -2355,9 +2375,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/in
 +{
 +  return inline_skip_symbol;
 +}
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/mi/mi-cmd-stack.c gdb-6.8/gdb/mi/mi-cmd-stack.c
---- gdb-6.8-clean/gdb/mi/mi-cmd-stack.c	2008-01-01 23:53:14.000000000 +0100
-+++ gdb-6.8/gdb/mi/mi-cmd-stack.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/mi/mi-cmd-stack.c
+===================================================================
+--- gdb-6.8.orig/gdb/mi/mi-cmd-stack.c	2008-01-01 23:53:14.000000000 +0100
++++ gdb-6.8/gdb/mi/mi-cmd-stack.c	2008-07-14 10:29:07.000000000 +0200
 @@ -65,7 +65,7 @@ mi_cmd_stack_list_frames (char *command,
    /* Let's position fi on the frame at which to start the
       display. Could be the innermost frame if the whole stack needs
@@ -2385,9 +2406,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/mi
         fi && i < frame_low;
         i++, fi = get_prev_frame (fi));
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/minsyms.c gdb-6.8/gdb/minsyms.c
---- gdb-6.8-clean/gdb/minsyms.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/minsyms.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/minsyms.c
+===================================================================
+--- gdb-6.8.orig/gdb/minsyms.c	2008-07-14 10:27:27.000000000 +0200
++++ gdb-6.8/gdb/minsyms.c	2008-07-14 10:29:07.000000000 +0200
 @@ -677,7 +677,7 @@ prim_record_minimal_symbol_and_info (con
  
    if (msym_bunch_index == BUNCH_SIZE)
@@ -2397,9 +2419,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/mi
        msym_bunch_index = 0;
        new->next = msym_bunch;
        msym_bunch = new;
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/s390-tdep.c gdb-6.8/gdb/s390-tdep.c
---- gdb-6.8-clean/gdb/s390-tdep.c	2008-06-24 22:58:30.000000000 +0200
-+++ gdb-6.8/gdb/s390-tdep.c	2008-06-16 20:15:07.000000000 +0200
+Index: gdb-6.8/gdb/s390-tdep.c
+===================================================================
+--- gdb-6.8.orig/gdb/s390-tdep.c	2008-07-14 10:26:09.000000000 +0200
++++ gdb-6.8/gdb/s390-tdep.c	2008-07-14 10:29:07.000000000 +0200
 @@ -1216,6 +1216,7 @@ s390_prologue_frame_unwind_cache (struct
  	 needed, instead the code should simpliy rely on its
  	 analysis.  */
@@ -2416,9 +2439,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/s3
      {
        /* See the comment in s390_in_function_epilogue_p on why this is
  	 not completely reliable ...  */
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/stack.c gdb-6.8/gdb/stack.c
---- gdb-6.8-clean/gdb/stack.c	2008-03-17 16:06:24.000000000 +0100
-+++ gdb-6.8/gdb/stack.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/stack.c
+===================================================================
+--- gdb-6.8.orig/gdb/stack.c	2008-03-17 16:06:24.000000000 +0100
++++ gdb-6.8/gdb/stack.c	2008-07-14 10:29:07.000000000 +0200
 @@ -96,6 +96,30 @@ print_stack_frame_stub (void *args)
    return 0;
  }
@@ -2565,9 +2589,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/st
    /* Compute the return value.  If the computation triggers an error,
       let it bail.  If the return type can't be handled, set
       RETURN_VALUE to NULL, and QUERY_PREFIX to an informational
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/symtab.c gdb-6.8/gdb/symtab.c
---- gdb-6.8-clean/gdb/symtab.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/symtab.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/symtab.c
+===================================================================
+--- gdb-6.8.orig/gdb/symtab.c	2008-07-14 10:27:32.000000000 +0200
++++ gdb-6.8/gdb/symtab.c	2008-07-14 10:29:07.000000000 +0200
 @@ -1264,10 +1264,13 @@ lookup_symbol_aux_local (const char *nam
  				     symtab);
        if (sym != NULL)
@@ -2773,9 +2798,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/sy
  	  /* The case in which compiler's optimizer/scheduler has
  	     moved instructions into the prologue.  We look ahead in
  	     the function looking for address ranges whose
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/symtab.h gdb-6.8/gdb/symtab.h
---- gdb-6.8-clean/gdb/symtab.h	2008-02-05 23:17:40.000000000 +0100
-+++ gdb-6.8/gdb/symtab.h	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/symtab.h
+===================================================================
+--- gdb-6.8.orig/gdb/symtab.h	2008-02-05 23:17:40.000000000 +0100
++++ gdb-6.8/gdb/symtab.h	2008-07-14 10:29:07.000000000 +0200
 @@ -623,9 +623,15 @@ struct symbol
  
    ENUM_BITFIELD(address_class) aclass : 6;
@@ -2795,9 +2821,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/sy
  
    unsigned short line;
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.cp/annota2.exp gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp
---- gdb-6.8-clean/gdb/testsuite/gdb.cp/annota2.exp	2008-03-04 21:06:22.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.cp/annota2.exp	2008-03-04 21:06:22.000000000 +0100
++++ gdb-6.8/gdb/testsuite/gdb.cp/annota2.exp	2008-07-14 10:29:07.000000000 +0200
 @@ -119,13 +119,14 @@ gdb_expect {
  # continue until exit
  # this will test:
@@ -2816,9 +2843,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
  }
  
  #
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/Makefile.in gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/Makefile.in	2007-10-25 22:30:26.000000000 +0200
-+++ gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/gdb.opt/Makefile.in	2007-10-25 22:30:26.000000000 +0200
++++ gdb-6.8/gdb/testsuite/gdb.opt/Makefile.in	2008-07-14 10:29:07.000000000 +0200
 @@ -1,7 +1,7 @@
  VPATH = @srcdir@
  srcdir = @srcdir@
@@ -2828,9 +2856,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
  
  MISCELLANEOUS =
  
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.c gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.c	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.c	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,54 @@
 +/* Copyright (C) 2007 Free Software Foundation, Inc.
 +
@@ -2886,9 +2915,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
 +
 +  return 0;
 +}
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-bt.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-bt.exp	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,61 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -2951,9 +2981,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
 +gdb_test "info frame" ".*inlined into frame.*" "func1 inlined (3)"
 +gdb_test "up" "#2  .*func2.*" "up from func1 (3)"
 +gdb_test "info frame" ".*inlined into frame.*" "func2 inlined (3)"
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.c gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.c	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.c	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,107 @@
 +/* Copyright (C) 2007 Free Software Foundation, Inc.
 +
@@ -3062,9 +3093,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
 +
 +  return 0;
 +}
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-cmds.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-cmds.exp	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,261 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -3327,9 +3359,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
 +gdb_test "info frame" ".*inlined into frame.*" "outer_inline2 inlined"
 +gdb_test "up" "#4  main.*" "up from outer_inline2"
 +gdb_test "info frame" ".*\n caller of frame.*" "main not inlined"
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.c gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.c	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.c	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,59 @@
 +/* Copyright (C) 2007 Free Software Foundation, Inc.
 +
@@ -3390,9 +3423,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
 +
 +  return 0;
 +}
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.exp gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp
---- gdb-6.8-clean/gdb/testsuite/gdb.opt/inline-locals.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp	2008-06-23 01:20:22.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-6.8/gdb/testsuite/gdb.opt/inline-locals.exp	2008-07-14 10:29:07.000000000 +0200
 @@ -0,0 +1,95 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -3489,9 +3523,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
 +    setup_kfail *-*-* "gcc/debug.optimization"
 +}
 +gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)"
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/testsuite/lib/gdb.exp gdb-6.8/gdb/testsuite/lib/gdb.exp
---- gdb-6.8-clean/gdb/testsuite/lib/gdb.exp	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/testsuite/lib/gdb.exp	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/testsuite/lib/gdb.exp
+===================================================================
+--- gdb-6.8.orig/gdb/testsuite/lib/gdb.exp	2008-07-14 10:28:15.000000000 +0200
++++ gdb-6.8/gdb/testsuite/lib/gdb.exp	2008-07-14 10:29:07.000000000 +0200
 @@ -1357,6 +1357,37 @@ proc skip_hp_tests {} {
      return $skip_hp
  }
@@ -3530,9 +3565,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/te
  set compiler_info		"unknown"
  set gcc_compiled		0
  set hp_cc_compiler		0
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/thread.c gdb-6.8/gdb/thread.c
---- gdb-6.8-clean/gdb/thread.c	2008-06-24 22:58:30.000000000 +0200
-+++ gdb-6.8/gdb/thread.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/thread.c
+===================================================================
+--- gdb-6.8.orig/gdb/thread.c	2008-07-14 10:24:32.000000000 +0200
++++ gdb-6.8/gdb/thread.c	2008-07-14 10:29:07.000000000 +0200
 @@ -582,7 +582,7 @@ thread_apply_all_command (char *cmd, int
    do_cleanups (old_chain);
    /* Print stack frame only if we changed thread.  */
@@ -3551,9 +3587,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/th
  }
  
  /* Switch to the specified thread.  Will dispatch off to thread_apply_command
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/tracepoint.c gdb-6.8/gdb/tracepoint.c
---- gdb-6.8-clean/gdb/tracepoint.c	2008-02-05 17:05:56.000000000 +0100
-+++ gdb-6.8/gdb/tracepoint.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/tracepoint.c
+===================================================================
+--- gdb-6.8.orig/gdb/tracepoint.c	2008-02-05 17:05:56.000000000 +0100
++++ gdb-6.8/gdb/tracepoint.c	2008-07-14 10:29:07.000000000 +0200
 @@ -2165,7 +2165,7 @@ trace_find_line_command (char *args, int
      {
        if (args == 0 || *args == 0)
@@ -3563,9 +3600,10 @@ diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/tr
  	  sals.nelts = 1;
  	  sals.sals = (struct symtab_and_line *)
  	    xmalloc (sizeof (struct symtab_and_line));
-diff -up -u -X /home/jkratoch/.diffi.list -ruNp -x Makefile gdb-6.8-clean/gdb/valops.c gdb-6.8/gdb/valops.c
---- gdb-6.8-clean/gdb/valops.c	2008-06-24 22:58:31.000000000 +0200
-+++ gdb-6.8/gdb/valops.c	2008-06-16 20:11:43.000000000 +0200
+Index: gdb-6.8/gdb/valops.c
+===================================================================
+--- gdb-6.8.orig/gdb/valops.c	2008-07-14 10:28:30.000000000 +0200
++++ gdb-6.8/gdb/valops.c	2008-07-14 10:29:07.000000000 +0200
 @@ -845,7 +845,7 @@ value_of_variable (struct symbol *var, s
        frame = block_innermost_frame (b);
        if (!frame)
diff --git a/gdb-6.8-upstream.patch b/gdb-6.8-upstream.patch
index 8c9107d..2dbf142 100644
--- a/gdb-6.8-upstream.patch
+++ b/gdb-6.8-upstream.patch
@@ -702,14 +702,11 @@ diff -u -r1.86 -r1.87
  		    delete_thread (retval);
  		    status->kind = TARGET_WAITKIND_SPURIOUS;
  		    return retval;
+Index: gdb-6.8/gdb/thread.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/thread.c,v
-retrieving revision 1.63
-retrieving revision 1.64
-diff -u -r1.63 -r1.64
---- src/gdb/thread.c	2008/03/17 18:41:29	1.63
-+++ src/gdb/thread.c	2008/03/21 15:44:53	1.64
-@@ -132,10 +132,12 @@
+--- gdb-6.8.orig/gdb/thread.c	2008-03-12 23:22:06.000000000 +0100
++++ gdb-6.8/gdb/thread.c	2008-07-14 10:24:32.000000000 +0200
+@@ -131,16 +131,24 @@ add_thread_silent (ptid_t ptid)
  }
  
  struct thread_info *
@@ -722,8 +719,7 @@ diff -u -r1.63 -r1.64
 +
    if (print_thread_events)
      printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid));
- 
-@@ -144,6 +146,12 @@
+   
    return result;
  }
  
diff --git a/gdb.spec b/gdb.spec
index 03220a5..c0dfd42 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -13,7 +13,7 @@ Version: 6.8
 
 # 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: 16%{?_with_upstream:.upstream}%{?dist}
+Release: 17%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -832,6 +832,9 @@ fi
 %endif
 
 %changelog
+* Mon Jul 14 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8-17
+- Refresh the patchset with fuzz 0 (for new rpmbuild).
+
 * Mon Jul 14 2008 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8-16
 - Rebuild with the new rpm-4.5.90 in the buildroot.