Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

29 files changed, 304 insertions, 306 deletions

diff --git a/packages/gdb/6.8a/100-dwarf-stack-overflow.patch b/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
index 344d5a3..b409c5b 100644
--- a/packages/gdb/6.8a/100-dwarf-stack-overflow.patch
+++ b/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
@@ -11,9 +11,12 @@ for gdb/ChangeLog:
 	* dwarfread.c (locval): Likewise.
 
 -= END original header =-
-diff -durN gdb-6.8.orig/gdb/dwarf2read.c 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-06-17 16:07:31.000000000 +0200
+---
+ gdb/dwarf2read.c |   15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
 @@ -9124,8 +9124,7 @@
     callers will only want a very basic result and this can become a
     complaint.
diff --git a/packages/gdb/6.8a/110-security-errata-20050610.patch b/packages/gdb/6.8a/0001-security-errata-20050610.patch
index 27e8174..eab3e09 100644
--- a/packages/gdb/6.8a/110-security-errata-20050610.patch
+++ b/packages/gdb/6.8a/0001-security-errata-20050610.patch
@@ -19,9 +19,16 @@ Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/35_all_gdb-6.3-security
         FROM_TTY is -1.
 
 -= END original header =-
-diff -durN gdb-6.8.orig/gdb/Makefile.in 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-06-17 16:07:33.000000000 +0200
+---
+ gdb/Makefile.in                       |    2 
+ gdb/cli/cli-cmds.c                    |   22 +++++++
+ gdb/main.c                            |    4 -
+ gdb/testsuite/gdb.base/gdbinit.exp    |   98 ++++++++++++++++++++++++++++++++++
+ gdb/testsuite/gdb.base/gdbinit.sample |    1 
+ 5 files changed, 123 insertions(+), 4 deletions(-)
+
+--- a/gdb/Makefile.in
++++ b/gdb/Makefile.in
 @@ -3004,7 +3004,7 @@
  	$(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \
  	$(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \
@@ -31,9 +38,8 @@ diff -durN gdb-6.8.orig/gdb/Makefile.in gdb-6.8/gdb/Makefile.in
  	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c
  cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \
  	$(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \
-diff -durN gdb-6.8.orig/gdb/cli/cli-cmds.c gdb-6.8/gdb/cli/cli-cmds.c
---- gdb-6.8.orig/gdb/cli/cli-cmds.c	2008-01-01 23:53:14.000000000 +0100
-+++ gdb-6.8/gdb/cli/cli-cmds.c	2008-06-17 16:07:33.000000000 +0200
+--- a/gdb/cli/cli-cmds.c
++++ b/gdb/cli/cli-cmds.c
 @@ -36,6 +36,7 @@
  #include "objfiles.h"
  #include "source.h"
@@ -75,9 +81,8 @@ diff -durN gdb-6.8.orig/gdb/cli/cli-cmds.c gdb-6.8/gdb/cli/cli-cmds.c
    stream = fdopen (fd, FOPEN_RT);
    script_from_file (stream, file);
  
-diff -durN gdb-6.8.orig/gdb/main.c gdb-6.8/gdb/main.c
---- gdb-6.8.orig/gdb/main.c	2008-01-05 17:49:53.000000000 +0100
-+++ gdb-6.8/gdb/main.c	2008-06-17 16:07:33.000000000 +0200
+--- a/gdb/main.c
++++ b/gdb/main.c
 @@ -690,7 +690,7 @@
  
        if (!inhibit_gdbinit)
@@ -96,9 +101,8 @@ diff -durN gdb-6.8.orig/gdb/main.c gdb-6.8/gdb/main.c
        }
  
    for (i = 0; i < ncmd; i++)
-diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.8/gdb/testsuite/gdb.base/gdbinit.exp
---- gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/gdbinit.exp	2008-06-17 16:07:33.000000000 +0200
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdbinit.exp
 @@ -0,0 +1,98 @@
 +#   Copyright 2005
 +#   Free Software Foundation, Inc.
@@ -198,8 +202,7 @@ diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.8/gdb/testsuite
 +}
 +
 +remote_exec build "rm .gdbinit"
-diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.sample gdb-6.8/gdb/testsuite/gdb.base/gdbinit.sample
---- gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.sample	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/gdbinit.sample	2008-06-17 16:07:33.000000000 +0200
+--- /dev/null
++++ b/gdb/testsuite/gdb.base/gdbinit.sample
 @@ -0,0 +1 @@
 +echo "\nin gdbinit"
diff --git a/packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch b/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
index 61fdef4..dcdcc1d 100644
--- a/packages/gdb/6.8a/120-tdep-opcode-include-workaround.patch
+++ b/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
@@ -5,9 +5,13 @@ workaround build failure
 http://bugs.gentoo.org/216368
 
 -= END original header =-
-diff -durN gdb-6.8.orig/gdb/frv-tdep.c gdb-6.8/gdb/frv-tdep.c
---- gdb-6.8.orig/gdb/frv-tdep.c	2008-01-11 14:19:59.000000000 +0100
-+++ gdb-6.8/gdb/frv-tdep.c	2008-06-17 16:07:34.000000000 +0200
+---
+ gdb/frv-tdep.c |    2 +-
+ gdb/mep-tdep.c |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/gdb/frv-tdep.c
++++ b/gdb/frv-tdep.c
 @@ -32,7 +32,7 @@
  #include "gdb_assert.h"
  #include "sim-regno.h"
@@ -17,9 +21,8 @@ diff -durN gdb-6.8.orig/gdb/frv-tdep.c gdb-6.8/gdb/frv-tdep.c
  #include "symtab.h"
  #include "elf-bfd.h"
  #include "elf/frv.h"
-diff -durN gdb-6.8.orig/gdb/mep-tdep.c gdb-6.8/gdb/mep-tdep.c
---- gdb-6.8.orig/gdb/mep-tdep.c	2008-01-11 14:20:02.000000000 +0100
-+++ gdb-6.8/gdb/mep-tdep.c	2008-06-17 16:07:34.000000000 +0200
+--- a/gdb/mep-tdep.c
++++ b/gdb/mep-tdep.c
 @@ -53,8 +53,8 @@
  
  /* Get the user's customized MeP coprocessor register names from
diff --git a/packages/gdb/6.8a/130-reg-no-longer-active.patch b/packages/gdb/6.8a/0003-reg-no-longer-active.patch
index 1c7e7e0..9bb48e8 100644
--- a/packages/gdb/6.8a/130-reg-no-longer-active.patch
+++ b/packages/gdb/6.8a/0003-reg-no-longer-active.patch
@@ -4,10 +4,13 @@ See: http://sourceware.org/ml/crossgcc/2009-05/msg00055.html
 
 Fix from: http://cvs.fedoraproject.org/viewvc/devel/gdb/gdb-6.8-bz436037-reg-no-longer-active.patch?revision=1.1
 
-diff -d -urpN src.0/gdb/valops.c src.1/gdb/valops.c
---- src.0/gdb/valops.c	2008-07-27 04:00:03.000000000 +0200
-+++ src.1/gdb/valops.c	2008-07-31 15:17:42.000000000 +0200
-@@ -813,10 +813,18 @@ value_assign (struct value *toval, struc
+---
+ gdb/valops.c |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/gdb/valops.c
++++ b/gdb/valops.c
+@@ -675,10 +675,18 @@
  	struct frame_info *frame;
  	int value_reg;
  
diff --git a/packages/gdb/6.8a/140-sim-ppc-have-config-h.patch b/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
index f3723b5..4bba827 100644
--- a/packages/gdb/6.8a/140-sim-ppc-have-config-h.patch
+++ b/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
@@ -2,9 +2,24 @@ Fix for canadian cross build of sim/ppc
 
 Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
 
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
+---
+ sim/ppc/Makefile.in       |    6 +++---
+ sim/ppc/basics.h          |    2 ++
+ sim/ppc/debug.c           |    2 ++
+ sim/ppc/dgen.c            |    2 ++
+ sim/ppc/filter.c          |    2 ++
+ sim/ppc/filter_filename.c |    2 ++
+ sim/ppc/igen.c            |    2 ++
+ sim/ppc/inline.c          |    2 ++
+ sim/ppc/lf.c              |    2 ++
+ sim/ppc/misc.c            |    2 ++
+ sim/ppc/misc.h            |    2 ++
+ sim/ppc/sim-endian.c      |    2 ++
+ sim/ppc/table.c           |    2 ++
+ 13 files changed, 27 insertions(+), 3 deletions(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
 @@ -61,7 +61,7 @@
  AR = @AR@
  AR_FLAGS = rc
@@ -25,9 +40,8 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
  
  BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+--- a/sim/ppc/basics.h
++++ b/sim/ppc/basics.h
 @@ -86,7 +86,9 @@
  
  /* Basic configuration */
@@ -38,9 +52,8 @@ diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
  #include "ppc-config.h"
  #include "inline.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+--- a/sim/ppc/debug.c
++++ b/sim/ppc/debug.c
 @@ -22,7 +22,9 @@
  #ifndef _DEBUG_C_
  #define _DEBUG_C_
@@ -51,9 +64,8 @@ diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
  #include "basics.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+--- a/sim/ppc/dgen.c
++++ b/sim/ppc/dgen.c
 @@ -27,7 +27,9 @@
  #include <ctype.h>
  #include <stdarg.h>
@@ -64,9 +76,8 @@ diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
  #include "misc.h"
  #include "lf.h"
  #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+--- a/sim/ppc/filter.c
++++ b/sim/ppc/filter.c
 @@ -21,7 +21,9 @@
  
  #include <stdio.h>
@@ -77,9 +88,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
  
  #ifdef HAVE_STRING_H
  #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+--- a/sim/ppc/filter_filename.c
++++ b/sim/ppc/filter_filename.c
 @@ -18,7 +18,9 @@
   
      */
@@ -90,9 +100,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_file
  #include "ppc-config.h"
  #include "filter_filename.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+--- a/sim/ppc/igen.c
++++ b/sim/ppc/igen.c
 @@ -25,7 +25,9 @@
  #include "misc.h"
  #include "lf.h"
@@ -103,9 +112,8 @@ diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
  
  #include "filter.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+--- a/sim/ppc/inline.c
++++ b/sim/ppc/inline.c
 @@ -22,7 +22,9 @@
  #ifndef _INLINE_C_
  #define _INLINE_C_
@@ -116,9 +124,8 @@ diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
  #include "ppc-config.h"
  
  #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+--- a/sim/ppc/lf.c
++++ b/sim/ppc/lf.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -129,9 +136,8 @@ diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
  #include "misc.h"
  #include "lf.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+--- a/sim/ppc/misc.c
++++ b/sim/ppc/misc.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -142,9 +148,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
  #include "misc.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+--- a/sim/ppc/misc.h
++++ b/sim/ppc/misc.h
 @@ -21,7 +21,9 @@
  
  /* Frustrating header junk */
@@ -155,9 +160,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
  
  #include <stdio.h>
  #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+--- a/sim/ppc/sim-endian.c
++++ b/sim/ppc/sim-endian.c
 @@ -22,7 +22,9 @@
  #ifndef _SIM_ENDIAN_C_
  #define _SIM_ENDIAN_C_
@@ -168,9 +172,8 @@ diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
  #include "basics.h"
  
  
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+--- a/sim/ppc/table.c
++++ b/sim/ppc/table.c
 @@ -25,7 +25,9 @@
  #include <fcntl.h>
  #include <ctype.h>
diff --git a/packages/gdb/6.8a/150-handle-stpcpy-define.patch b/packages/gdb/6.8a/0005-handle-stpcpy-define.patch
index 88d703f..11142e2 100644
--- a/packages/gdb/6.8a/150-handle-stpcpy-define.patch
+++ b/packages/gdb/6.8a/0005-handle-stpcpy-define.patch
@@ -1,6 +1,9 @@
-diff -ru gdb-6.8.orig/bfd/sysdep.h gdb-6.8/bfd/sysdep.h
---- gdb-6.8.orig/bfd/sysdep.h	2007-07-03 16:26:42.000000000 +0200
-+++ gdb-6.8/bfd/sysdep.h	2011-08-21 13:33:47.000000000 +0200
+---
+ bfd/sysdep.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/bfd/sysdep.h
++++ b/bfd/sysdep.h
 @@ -131,7 +131,7 @@
  extern PTR realloc ();
  #endif
diff --git a/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
index f3723b5..2d068e7 100644
--- a/packages/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
+++ b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
@@ -2,10 +2,25 @@ Fix for canadian cross build of sim/ppc
 
 Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
 
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
+---
+ sim/ppc/Makefile.in       |    6 +++---
+ sim/ppc/basics.h          |    2 ++
+ sim/ppc/debug.c           |    2 ++
+ sim/ppc/dgen.c            |    2 ++
+ sim/ppc/filter.c          |    2 ++
+ sim/ppc/filter_filename.c |    2 ++
+ sim/ppc/igen.c            |    2 ++
+ sim/ppc/inline.c          |    2 ++
+ sim/ppc/lf.c              |    2 ++
+ sim/ppc/misc.c            |    2 ++
+ sim/ppc/misc.h            |    2 ++
+ sim/ppc/sim-endian.c      |    2 ++
+ sim/ppc/table.c           |    2 ++
+ 13 files changed, 27 insertions(+), 3 deletions(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
+@@ -62,7 +62,7 @@
  AR = @AR@
  AR_FLAGS = rc
  CC = @CC@
@@ -14,7 +29,7 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  BISON = bison
-@@ -115,8 +115,8 @@
+@@ -116,8 +116,8 @@
    $(DEVZERO_CFLAGS)
  SIM_FPU_CFLAGS = @sim_fpu_cflags@
  
@@ -25,9 +40,8 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
  
  BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+--- a/sim/ppc/basics.h
++++ b/sim/ppc/basics.h
 @@ -86,7 +86,9 @@
  
  /* Basic configuration */
@@ -38,9 +52,8 @@ diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
  #include "ppc-config.h"
  #include "inline.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+--- a/sim/ppc/debug.c
++++ b/sim/ppc/debug.c
 @@ -22,7 +22,9 @@
  #ifndef _DEBUG_C_
  #define _DEBUG_C_
@@ -51,9 +64,8 @@ diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
  #include "basics.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+--- a/sim/ppc/dgen.c
++++ b/sim/ppc/dgen.c
 @@ -27,7 +27,9 @@
  #include <ctype.h>
  #include <stdarg.h>
@@ -64,9 +76,8 @@ diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
  #include "misc.h"
  #include "lf.h"
  #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+--- a/sim/ppc/filter.c
++++ b/sim/ppc/filter.c
 @@ -21,7 +21,9 @@
  
  #include <stdio.h>
@@ -77,9 +88,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
  
  #ifdef HAVE_STRING_H
  #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+--- a/sim/ppc/filter_filename.c
++++ b/sim/ppc/filter_filename.c
 @@ -18,7 +18,9 @@
   
      */
@@ -90,9 +100,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_file
  #include "ppc-config.h"
  #include "filter_filename.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+--- a/sim/ppc/igen.c
++++ b/sim/ppc/igen.c
 @@ -25,7 +25,9 @@
  #include "misc.h"
  #include "lf.h"
@@ -103,9 +112,8 @@ diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
  
  #include "filter.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+--- a/sim/ppc/inline.c
++++ b/sim/ppc/inline.c
 @@ -22,7 +22,9 @@
  #ifndef _INLINE_C_
  #define _INLINE_C_
@@ -116,9 +124,8 @@ diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
  #include "ppc-config.h"
  
  #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+--- a/sim/ppc/lf.c
++++ b/sim/ppc/lf.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -129,9 +136,8 @@ diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
  #include "misc.h"
  #include "lf.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+--- a/sim/ppc/misc.c
++++ b/sim/ppc/misc.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -142,9 +148,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
  #include "misc.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+--- a/sim/ppc/misc.h
++++ b/sim/ppc/misc.h
 @@ -21,7 +21,9 @@
  
  /* Frustrating header junk */
@@ -155,9 +160,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
  
  #include <stdio.h>
  #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+--- a/sim/ppc/sim-endian.c
++++ b/sim/ppc/sim-endian.c
 @@ -22,7 +22,9 @@
  #ifndef _SIM_ENDIAN_C_
  #define _SIM_ENDIAN_C_
@@ -168,9 +172,8 @@ diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
  #include "basics.h"
  
  
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+--- a/sim/ppc/table.c
++++ b/sim/ppc/table.c
 @@ -25,7 +25,9 @@
  #include <fcntl.h>
  #include <ctype.h>
diff --git a/packages/gdb/7.0a/100-sim-ppc-have-config-h.patch b/packages/gdb/7.0a/0000-sim-ppc-have-config-h.patch
index f3723b5..2d068e7 100644
--- a/packages/gdb/7.0a/100-sim-ppc-have-config-h.patch
+++ b/packages/gdb/7.0a/0000-sim-ppc-have-config-h.patch
@@ -2,10 +2,25 @@ Fix for canadian cross build of sim/ppc
 
 Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
 
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
+---
+ sim/ppc/Makefile.in       |    6 +++---
+ sim/ppc/basics.h          |    2 ++
+ sim/ppc/debug.c           |    2 ++
+ sim/ppc/dgen.c            |    2 ++
+ sim/ppc/filter.c          |    2 ++
+ sim/ppc/filter_filename.c |    2 ++
+ sim/ppc/igen.c            |    2 ++
+ sim/ppc/inline.c          |    2 ++
+ sim/ppc/lf.c              |    2 ++
+ sim/ppc/misc.c            |    2 ++
+ sim/ppc/misc.h            |    2 ++
+ sim/ppc/sim-endian.c      |    2 ++
+ sim/ppc/table.c           |    2 ++
+ 13 files changed, 27 insertions(+), 3 deletions(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
+@@ -62,7 +62,7 @@
  AR = @AR@
  AR_FLAGS = rc
  CC = @CC@
@@ -14,7 +29,7 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  BISON = bison
-@@ -115,8 +115,8 @@
+@@ -116,8 +116,8 @@
    $(DEVZERO_CFLAGS)
  SIM_FPU_CFLAGS = @sim_fpu_cflags@
  
@@ -25,9 +40,8 @@ diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
  BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
  
  BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
+--- a/sim/ppc/basics.h
++++ b/sim/ppc/basics.h
 @@ -86,7 +86,9 @@
  
  /* Basic configuration */
@@ -38,9 +52,8 @@ diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
  #include "ppc-config.h"
  #include "inline.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
+--- a/sim/ppc/debug.c
++++ b/sim/ppc/debug.c
 @@ -22,7 +22,9 @@
  #ifndef _DEBUG_C_
  #define _DEBUG_C_
@@ -51,9 +64,8 @@ diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
  #include "basics.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
+--- a/sim/ppc/dgen.c
++++ b/sim/ppc/dgen.c
 @@ -27,7 +27,9 @@
  #include <ctype.h>
  #include <stdarg.h>
@@ -64,9 +76,8 @@ diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
  #include "misc.h"
  #include "lf.h"
  #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
+--- a/sim/ppc/filter.c
++++ b/sim/ppc/filter.c
 @@ -21,7 +21,9 @@
  
  #include <stdio.h>
@@ -77,9 +88,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
  
  #ifdef HAVE_STRING_H
  #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
+--- a/sim/ppc/filter_filename.c
++++ b/sim/ppc/filter_filename.c
 @@ -18,7 +18,9 @@
   
      */
@@ -90,9 +100,8 @@ diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_file
  #include "ppc-config.h"
  #include "filter_filename.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
+--- a/sim/ppc/igen.c
++++ b/sim/ppc/igen.c
 @@ -25,7 +25,9 @@
  #include "misc.h"
  #include "lf.h"
@@ -103,9 +112,8 @@ diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
  
  #include "filter.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
+--- a/sim/ppc/inline.c
++++ b/sim/ppc/inline.c
 @@ -22,7 +22,9 @@
  #ifndef _INLINE_C_
  #define _INLINE_C_
@@ -116,9 +124,8 @@ diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
  #include "ppc-config.h"
  
  #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
+--- a/sim/ppc/lf.c
++++ b/sim/ppc/lf.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -129,9 +136,8 @@ diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
  #include "misc.h"
  #include "lf.h"
  
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
+--- a/sim/ppc/misc.c
++++ b/sim/ppc/misc.c
 @@ -23,7 +23,9 @@
  #include <stdarg.h>
  #include <ctype.h>
@@ -142,9 +148,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
  #include "misc.h"
  
  #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
+--- a/sim/ppc/misc.h
++++ b/sim/ppc/misc.h
 @@ -21,7 +21,9 @@
  
  /* Frustrating header junk */
@@ -155,9 +160,8 @@ diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
  
  #include <stdio.h>
  #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
+--- a/sim/ppc/sim-endian.c
++++ b/sim/ppc/sim-endian.c
 @@ -22,7 +22,9 @@
  #ifndef _SIM_ENDIAN_C_
  #define _SIM_ENDIAN_C_
@@ -168,9 +172,8 @@ diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
  #include "basics.h"
  
  
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
+--- a/sim/ppc/table.c
++++ b/sim/ppc/table.c
 @@ -25,7 +25,9 @@
  #include <fcntl.h>
  #include <ctype.h>
diff --git a/packages/gdb/8.0.1/100-musl_fix.patch b/packages/gdb/7.10.1/0000-musl_fix.patch
index c0c1e0a..9f1b930 100644
--- a/packages/gdb/8.0.1/100-musl_fix.patch
+++ b/packages/gdb/7.10.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
diff --git a/packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
index 1182a45..afa7083 100644
--- a/packages/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ b/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
@@ -17,14 +17,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.h | 3 ++-
+ gdb/xtensa-tdep.h |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
-index adacaf8..3b6ea66 100644
 --- a/gdb/xtensa-tdep.h
 +++ b/gdb/xtensa-tdep.h
-@@ -246,7 +246,8 @@ struct gdbarch_tdep
+@@ -246,7 +246,8 @@
  	  .spill_location = -1,					\
  	  .spill_size = (spillsz),				\
  	  .unused = 0,						\
@@ -34,6 +32,3 @@ index adacaf8..3b6ea66 100644
  	  .debug_interrupt_level = XCHAL_DEBUGLEVEL,		\
  	  .icache_line_bytes = XCHAL_ICACHE_LINESIZE,		\
  	  .dcache_line_bytes = XCHAL_DCACHE_LINESIZE,		\
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..653f0e2 100644
--- a/packages/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3175,6 +3175,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c..f47b494 100644
--- a/packages/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.10.1/100-musl_fix.patch b/packages/gdb/7.11.1/0000-musl_fix.patch
index c0c1e0a..6829780 100644
--- a/packages/gdb/7.10.1/100-musl_fix.patch
+++ b/packages/gdb/7.11.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
@@ -8,7 +13,7 @@
  #include "defs.h"
  #include "inferior.h"
  #include "infrun.h"
-@@ -73,6 +74,10 @@
+@@ -71,6 +72,10 @@
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
  
diff --git a/packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/7.11.1/0001-uclibc-no-gettimeofday-clobber.patch
index ff59907..e191e5c 100644
--- a/packages/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/7.11.1/0001-uclibc-no-gettimeofday-clobber.patch
@@ -5,8 +5,12 @@ gdb-native step otherwise fails when linking the libinproctrace.so
 
 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
 
---- a/gdb/gnulib/configure	2016-02-25 18:17:04.145903807 +0100
-+++ b/gdb/gnulib/configure	2016-02-25 18:17:28.545903821 +0100
+---
+ gdb/gnulib/configure |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/gdb/gnulib/configure
++++ b/gdb/gnulib/configure
 @@ -13520,8 +13520,9 @@
    if test "$cross_compiling" = yes; then :
    # When cross-compiling:
diff --git a/packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.11.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..653f0e2 100644
--- a/packages/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.11.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3175,6 +3175,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.11.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c..f47b494 100644
--- a/packages/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.11.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.11.1/100-musl_fix.patch b/packages/gdb/7.12.1/0000-musl_fix.patch
index c0c1e0a..6829780 100644
--- a/packages/gdb/7.11.1/100-musl_fix.patch
+++ b/packages/gdb/7.12.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
@@ -8,7 +13,7 @@
  #include "defs.h"
  #include "inferior.h"
  #include "infrun.h"
-@@ -73,6 +74,10 @@
+@@ -71,6 +72,10 @@
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
  
diff --git a/packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/7.12.1/0001-uclibc-no-gettimeofday-clobber.patch
index cd7a4c6..d6e7072 100644
--- a/packages/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/7.12.1/0001-uclibc-no-gettimeofday-clobber.patch
@@ -6,10 +6,14 @@ gdb-native step otherwise fails when linking the libinproctrace.so
 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
 Signed-off-by: Alexey Neyman <stilor@att.net>
 
-diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
---- gdb-7.12.orig/gdb/gnulib/configure	2017-01-13 13:42:11.773027566 -0800
-+++ gdb-7.12/gdb/gnulib/configure	2017-01-13 13:44:32.518082618 -0800
-@@ -13522,6 +13522,7 @@ else
+---
+ gdb/gnulib/configure                 |    1 +
+ gdb/gnulib/import/m4/gettimeofday.m4 |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/gdb/gnulib/configure
++++ b/gdb/gnulib/configure
+@@ -13522,6 +13522,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
@@ -17,10 +21,9 @@ diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
                  # If we don't know, assume the worst.
          *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
        esac
-diff -urpN gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4 gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4
---- gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:42:11.777027595 -0800
-+++ gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:43:55.781797640 -0800
-@@ -111,6 +111,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
+--- a/gdb/gnulib/import/m4/gettimeofday.m4
++++ b/gdb/gnulib/import/m4/gettimeofday.m4
+@@ -111,6 +111,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
diff --git a/packages/gdb/8.0.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/7.12.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..19eb69d 100644
--- a/packages/gdb/8.0.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/7.12.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3174,6 +3174,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/8.0.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/7.12.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c..f47b494 100644
--- a/packages/gdb/8.0.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/7.12.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.12.1/200-allow-android.patch b/packages/gdb/7.12.1/0004-allow-android.patch
index 7954477..9beb41b 100644
--- a/packages/gdb/7.12.1/200-allow-android.patch
+++ b/packages/gdb/7.12.1/0004-allow-android.patch
@@ -1,7 +1,11 @@
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/configure
---- gdb-7.12.1.orig/gdb/gdbserver/configure	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure	2017-05-14 17:03:22.147058607 -0700
-@@ -6671,17 +6671,6 @@ fi
+---
+ gdb/gdbserver/configure    |   11 -----------
+ gdb/gdbserver/configure.ac |   11 -----------
+ 2 files changed, 22 deletions(-)
+
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -6671,17 +6671,6 @@
  
  
  case "${target}" in
@@ -19,10 +23,9 @@ diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/conf
    *)
      ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
  
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure.ac gdb-7.12.1/gdb/gdbserver/configure.ac
---- gdb-7.12.1.orig/gdb/gdbserver/configure.ac	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure.ac	2017-05-14 17:03:53.219361720 -0700
-@@ -179,17 +179,6 @@ AC_CHECK_TYPES(socklen_t, [], [],
+--- a/gdb/gdbserver/configure.ac
++++ b/gdb/gdbserver/configure.ac
+@@ -179,17 +179,6 @@
  ])
  
  case "${target}" in
diff --git a/packages/gdb/7.2a/100-sim-ppc-lz-fix.patch b/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
index 6f08ef8..3cff518 100644
--- a/packages/gdb/7.2a/100-sim-ppc-lz-fix.patch
+++ b/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
@@ -2,14 +2,18 @@ Fix for psim build failure due to -lz
 
 See http://sourceware.org/bugzilla/show_bug.cgi?id=12202
 
---- gdb-7.2.orig/sim/ppc/Makefile.in
-+++ gdb-7.2/sim/ppc/Makefile.in
+---
+ sim/ppc/Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sim/ppc/Makefile.in
++++ b/sim/ppc/Makefile.in
 @@ -551,7 +551,7 @@
  PACKAGE_OBJ = @sim_pk_obj@
-
-
+ 
+ 
 -psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP)
 +psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
  	$(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
-
+ 
  run: psim
diff --git a/packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch b/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
index 81a92db..a430d94 100644
--- a/packages/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
+++ b/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
@@ -29,10 +29,8 @@ gdbserver/
 	(struct linux_target_ops) <siginfo_fixup>: Use siginfo_t instead of
 	struct siginfo.
 ---
- gdb/ChangeLog                 |   15 +++++++++++++++
  gdb/amd64-linux-nat.c         |    4 ++--
  gdb/arm-linux-nat.c           |    2 +-
- gdb/gdbserver/ChangeLog       |   11 +++++++++++
  gdb/gdbserver/linux-arm-low.c |    2 +-
  gdb/gdbserver/linux-low.c     |   10 +++++-----
  gdb/gdbserver/linux-low.h     |    5 ++---
@@ -42,13 +40,11 @@ gdbserver/
  gdb/linux-nat.h               |    6 +++---
  gdb/ppc-linux-nat.c           |    2 +-
  gdb/procfs.c                  |    2 +-
- 13 files changed, 53 insertions(+), 28 deletions(-)
+ 11 files changed, 27 insertions(+), 28 deletions(-)
 
-diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
-index f954483..5ebba3a 100644
 --- a/gdb/amd64-linux-nat.c
 +++ b/gdb/amd64-linux-nat.c
-@@ -731,13 +731,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+@@ -671,13 +671,13 @@
     INF.  */
  
  static int
@@ -64,11 +60,9 @@ index f954483..5ebba3a 100644
  
        if (direction == 0)
  	compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
-diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index c5ce21c..f9f6ba5 100644
 --- a/gdb/arm-linux-nat.c
 +++ b/gdb/arm-linux-nat.c
-@@ -1137,7 +1137,7 @@ arm_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw,
+@@ -1137,7 +1137,7 @@
  static int
  arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
  {
@@ -77,11 +71,9 @@ index c5ce21c..f9f6ba5 100644
    int slot = siginfo_p->si_errno;
  
    /* This must be a hardware breakpoint.  */
-diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
-index ff2437d..01208ef 100644
 --- a/gdb/gdbserver/linux-arm-low.c
 +++ b/gdb/gdbserver/linux-arm-low.c
-@@ -631,7 +631,7 @@ static int
+@@ -631,7 +631,7 @@
  arm_stopped_by_watchpoint (void)
  {
    struct lwp_info *lwp = get_thread_lwp (current_inferior);
@@ -90,11 +82,9 @@ index ff2437d..01208ef 100644
  
    /* We must be able to set hardware watchpoints.  */
    if (arm_linux_get_hw_watchpoint_count () == 0)
-diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
-index d2d4c1d..4734f15 100644
 --- a/gdb/gdbserver/linux-low.c
 +++ b/gdb/gdbserver/linux-low.c
-@@ -4779,7 +4779,7 @@ linux_qxfer_osdata (const char *annex,
+@@ -4522,7 +4522,7 @@
     layout of the inferiors' architecture.  */
  
  static void
@@ -103,7 +93,7 @@ index d2d4c1d..4734f15 100644
  {
    int done = 0;
  
-@@ -4791,9 +4791,9 @@ siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
+@@ -4534,9 +4534,9 @@
    if (!done)
      {
        if (direction == 1)
@@ -115,7 +105,7 @@ index d2d4c1d..4734f15 100644
      }
  }
  
-@@ -4802,8 +4802,8 @@ linux_xfer_siginfo (const char *annex, unsigned char *readbuf,
+@@ -4545,8 +4545,8 @@
  		    unsigned const char *writebuf, CORE_ADDR offset, int len)
  {
    int pid;
@@ -126,8 +116,6 @@ index d2d4c1d..4734f15 100644
  
    if (current_inferior == NULL)
      return -1;
-diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
-index 677d261..3aeae70 100644
 --- a/gdb/gdbserver/linux-low.h
 +++ b/gdb/gdbserver/linux-low.h
 @@ -20,6 +20,7 @@
@@ -138,7 +126,7 @@ index 677d261..3aeae70 100644
  
  #include "gdb_proc_service.h"
  
-@@ -46,8 +47,6 @@ struct regset_info
+@@ -46,8 +47,6 @@
  extern struct regset_info target_regsets[];
  #endif
  
@@ -147,7 +135,7 @@ index 677d261..3aeae70 100644
  struct process_info_private
  {
    /* Arch-specific additions.  */
-@@ -109,7 +108,7 @@ struct linux_target_ops
+@@ -103,7 +102,7 @@
       Returns true if any conversion was done; false otherwise.
       If DIRECTION is 1, then copy from INF to NATIVE.
       If DIRECTION is 0, copy from NATIVE to INF.  */
@@ -156,11 +144,9 @@ index 677d261..3aeae70 100644
  
    /* Hook to call when a new process is created or attached to.
       If extra per-process architecture-specific data is needed,
-diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
-index ed1f8a8..b466b5d 100644
 --- a/gdb/gdbserver/linux-x86-low.c
 +++ b/gdb/gdbserver/linux-x86-low.c
-@@ -918,13 +918,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+@@ -906,13 +906,13 @@
     INF.  */
  
  static int
@@ -176,11 +162,9 @@ index ed1f8a8..b466b5d 100644
  	fatal ("unexpected difference in siginfo");
  
        if (direction == 0)
-diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
-index 8773195..19b827f 100644
 --- a/gdb/ia64-linux-nat.c
 +++ b/gdb/ia64-linux-nat.c
-@@ -637,7 +637,7 @@ static int
+@@ -637,7 +637,7 @@
  ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
  {
    CORE_ADDR psr;
@@ -189,11 +173,9 @@ index 8773195..19b827f 100644
    struct regcache *regcache = get_current_regcache ();
  
    siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
-index f80c0c1..d81d55e 100644
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
-@@ -188,7 +188,7 @@ static void (*linux_nat_prepare_to_resume) (struct lwp_info *);
+@@ -179,7 +179,7 @@
  /* The method to call, if any, when the siginfo object needs to be
     converted between the layout returned by ptrace, and the layout in
     the architecture of the inferior.  */
@@ -202,7 +184,7 @@ index f80c0c1..d81d55e 100644
  				       gdb_byte *,
  				       int);
  
-@@ -4232,7 +4232,7 @@ linux_nat_mourn_inferior (struct target_ops *ops)
+@@ -4138,7 +4138,7 @@
     layout of the inferiors' architecture.  */
  
  static void
@@ -211,7 +193,7 @@ index f80c0c1..d81d55e 100644
  {
    int done = 0;
  
-@@ -4244,9 +4244,9 @@ siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
+@@ -4150,9 +4150,9 @@
    if (!done)
      {
        if (direction == 1)
@@ -223,7 +205,7 @@ index f80c0c1..d81d55e 100644
      }
  }
  
-@@ -4256,8 +4256,8 @@ linux_xfer_siginfo (struct target_ops *ops, enum target_object object,
+@@ -4162,8 +4162,8 @@
  		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
  {
    int pid;
@@ -234,7 +216,7 @@ index f80c0c1..d81d55e 100644
  
    gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
    gdb_assert (readbuf || writebuf);
-@@ -5266,7 +5266,7 @@ linux_nat_set_new_thread (struct target_ops *t,
+@@ -5852,7 +5852,7 @@
     inferior.  */
  void
  linux_nat_set_siginfo_fixup (struct target_ops *t,
@@ -243,7 +225,7 @@ index f80c0c1..d81d55e 100644
  						   gdb_byte *,
  						   int))
  {
-@@ -5285,7 +5285,7 @@ linux_nat_set_prepare_to_resume (struct target_ops *t,
+@@ -5861,7 +5861,7 @@
  }
  
  /* Return the saved siginfo associated with PTID.  */
@@ -252,11 +234,9 @@ index f80c0c1..d81d55e 100644
  linux_nat_get_siginfo (ptid_t ptid)
  {
    struct lwp_info *lp = find_lwp_pid (ptid);
-diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
-index c9878d9..d87f0cf 100644
 --- a/gdb/linux-nat.h
 +++ b/gdb/linux-nat.h
-@@ -78,7 +78,7 @@ struct lwp_info
+@@ -76,7 +76,7 @@
  
    /* Non-zero si_signo if this LWP stopped with a trap.  si_addr may
       be the address of a hardware watchpoint.  */
@@ -265,7 +245,7 @@ index c9878d9..d87f0cf 100644
  
    /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
       watchpoint trap.  */
-@@ -184,7 +184,7 @@ void linux_nat_set_new_thread (struct target_ops *, void (*) (struct lwp_info *)
+@@ -171,7 +171,7 @@
     that ptrace returns, and the layout in the architecture of the
     inferior.  */
  void linux_nat_set_siginfo_fixup (struct target_ops *,
@@ -274,7 +254,7 @@ index c9878d9..d87f0cf 100644
  					   gdb_byte *,
  					   int));
  
-@@ -198,7 +198,7 @@ void linux_nat_set_prepare_to_resume (struct target_ops *,
+@@ -180,7 +180,7 @@
  void linux_nat_switch_fork (ptid_t new_ptid);
  
  /* Return the saved siginfo associated with PTID.  */
@@ -283,11 +263,9 @@ index c9878d9..d87f0cf 100644
  
  /* Compute and return the processor core of a given thread.  */
  int linux_nat_core_of_thread_1 (ptid_t ptid);
-diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index 1bd157b..9bd11fd 100644
 --- a/gdb/ppc-linux-nat.c
 +++ b/gdb/ppc-linux-nat.c
-@@ -2218,7 +2218,7 @@ ppc_linux_thread_exit (struct thread_info *tp, int silent)
+@@ -2213,7 +2213,7 @@
  static int
  ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
  {
@@ -296,11 +274,9 @@ index 1bd157b..9bd11fd 100644
  
    siginfo_p = linux_nat_get_siginfo (inferior_ptid);
  
-diff --git a/gdb/procfs.c b/gdb/procfs.c
-index 903621d..cb4bc7c 100644
 --- a/gdb/procfs.c
 +++ b/gdb/procfs.c
-@@ -266,7 +266,7 @@ typedef struct sigaction gdb_sigaction_t;
+@@ -262,7 +262,7 @@
  #ifdef HAVE_PR_SIGINFO64_T
  typedef pr_siginfo64_t gdb_siginfo_t;
  #else
@@ -309,6 +285,3 @@ index 903621d..cb4bc7c 100644
  #endif
  
  /* On mips-irix, praddset and prdelset are defined in such a way that
--- 
-1.7.9.7
-
diff --git a/packages/gdb/7.4.1/05_all_readline-headers.patch b/packages/gdb/7.4.1/0001-all_readline-headers.patch
index e65adf6..4aa0572 100644
--- a/packages/gdb/7.4.1/05_all_readline-headers.patch
+++ b/packages/gdb/7.4.1/0001-all_readline-headers.patch
@@ -1,3 +1,9 @@
+---
+ readline/complete.c |    5 +++++
+ readline/display.c  |    5 +++++
+ readline/mbutil.c   |    5 +++++
+ 3 files changed, 15 insertions(+)
+
 --- a/readline/complete.c
 +++ b/readline/complete.c
 @@ -25,6 +25,11 @@
diff --git a/packages/gdb/7.12.1/100-musl_fix.patch b/packages/gdb/8.0.1/0000-musl_fix.patch
index c0c1e0a..6829780 100644
--- a/packages/gdb/7.12.1/100-musl_fix.patch
+++ b/packages/gdb/8.0.1/0000-musl_fix.patch
@@ -1,3 +1,8 @@
+---
+ gdb/linux-nat.c |    5 +++++
+ gdb/stopcode.h  |    4 ++++
+ 2 files changed, 9 insertions(+)
+
 --- a/gdb/linux-nat.c
 +++ b/gdb/linux-nat.c
 @@ -17,6 +17,7 @@
@@ -8,7 +13,7 @@
  #include "defs.h"
  #include "inferior.h"
  #include "infrun.h"
-@@ -73,6 +74,10 @@
+@@ -71,6 +72,10 @@
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
  
diff --git a/packages/gdb/8.0.1/101-uclibc-no-gettimeofday-clobber.patch b/packages/gdb/8.0.1/0001-uclibc-no-gettimeofday-clobber.patch
index cd7a4c6..01fdfa1 100644
--- a/packages/gdb/8.0.1/101-uclibc-no-gettimeofday-clobber.patch
+++ b/packages/gdb/8.0.1/0001-uclibc-no-gettimeofday-clobber.patch
@@ -6,10 +6,14 @@ gdb-native step otherwise fails when linking the libinproctrace.so
 Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
 Signed-off-by: Alexey Neyman <stilor@att.net>
 
-diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
---- gdb-7.12.orig/gdb/gnulib/configure	2017-01-13 13:42:11.773027566 -0800
-+++ gdb-7.12/gdb/gnulib/configure	2017-01-13 13:44:32.518082618 -0800
-@@ -13522,6 +13522,7 @@ else
+---
+ gdb/gnulib/configure                 |    1 +
+ gdb/gnulib/import/m4/gettimeofday.m4 |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/gdb/gnulib/configure
++++ b/gdb/gnulib/configure
+@@ -13868,6 +13868,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
@@ -17,10 +21,9 @@ diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
                  # If we don't know, assume the worst.
          *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
        esac
-diff -urpN gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4 gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4
---- gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:42:11.777027595 -0800
-+++ gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:43:55.781797640 -0800
-@@ -111,6 +111,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
+--- a/gdb/gnulib/import/m4/gettimeofday.m4
++++ b/gdb/gnulib/import/m4/gettimeofday.m4
+@@ -111,6 +111,7 @@
        case "$host_os" in
                  # Guess all is fine on glibc systems.
          *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
diff --git a/packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/8.0.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
index 982bd7f..d056737 100644
--- a/packages/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/8.0.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
@@ -13,14 +13,12 @@ gdb/
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 3 +++
+ gdb/xtensa-tdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
+@@ -3166,6 +3166,9 @@
  	tdep->num_regs = n;
      }
  
@@ -30,6 +28,3 @@ index 55e7d98..41f5ec1 100644
    /* Number of pseudo registers.  */
    tdep->num_pseudo_regs = n - tdep->num_regs;
  
--- 
-1.8.1.4
-
diff --git a/packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/8.0.1/0003-WIP-end-of-prologue-detection-hack.patch
index 506a57c..f47b494 100644
--- a/packages/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/8.0.1/0003-WIP-end-of-prologue-detection-hack.patch
@@ -10,14 +10,12 @@ see
 
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 ---
- gdb/xtensa-tdep.c | 2 +-
+ gdb/xtensa-tdep.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
+@@ -2410,7 +2410,7 @@
    /* Find out, if we have an information about the prologue from DWARF.  */
    prologue_sal = find_pc_line (start, 0);
    if (prologue_sal.line != 0) /* Found debug info.  */
@@ -26,6 +24,3 @@ index 41f5ec1..6a7dba7 100644
  
    /* If we are going to analyze the prologue in general without knowing about
       the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/packages/gdb/8.0.1/200-allow-android.patch b/packages/gdb/8.0.1/0004-allow-android.patch
index 7954477..b97871c 100644
--- a/packages/gdb/8.0.1/200-allow-android.patch
+++ b/packages/gdb/8.0.1/0004-allow-android.patch
@@ -1,7 +1,11 @@
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/configure
---- gdb-7.12.1.orig/gdb/gdbserver/configure	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure	2017-05-14 17:03:22.147058607 -0700
-@@ -6671,17 +6671,6 @@ fi
+---
+ gdb/gdbserver/configure    |   11 -----------
+ gdb/gdbserver/configure.ac |   11 -----------
+ 2 files changed, 22 deletions(-)
+
+--- a/gdb/gdbserver/configure
++++ b/gdb/gdbserver/configure
+@@ -7539,17 +7539,6 @@
  
  
  case "${target}" in
@@ -19,10 +23,9 @@ diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/conf
    *)
      ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
  
-diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure.ac gdb-7.12.1/gdb/gdbserver/configure.ac
---- gdb-7.12.1.orig/gdb/gdbserver/configure.ac	2017-05-14 17:02:46.742711695 -0700
-+++ gdb-7.12.1/gdb/gdbserver/configure.ac	2017-05-14 17:03:53.219361720 -0700
-@@ -179,17 +179,6 @@ AC_CHECK_TYPES(socklen_t, [], [],
+--- a/gdb/gdbserver/configure.ac
++++ b/gdb/gdbserver/configure.ac
+@@ -176,17 +176,6 @@
  ])
  
  case "${target}" in