4 files changed, 12 insertions, 73 deletions
diff --git a/util/crossgcc/patches/gdb-7.9.1_amd64.patch b/util/crossgcc/patches/gdb-7.11_amd64.patch
index c3ee93db6e..ef6b26086d 100644
--- a/util/crossgcc/patches/gdb-7.9.1_amd64.patch
+++ b/util/crossgcc/patches/gdb-7.11_amd64.patch
@@ -1,7 +1,7 @@
-diff -urN gdb-7.9.1.orig/gdb/configure.tgt gdb-7.9.1/gdb/configure.tgt
---- gdb-7.9.1.orig/gdb/configure.tgt	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/gdb/configure.tgt	2016-02-27 11:26:26.386113921 -0800
-@@ -683,6 +683,11 @@
+diff -urN gdb-7.11.orig/gdb/configure.tgt gdb-7.11/gdb/configure.tgt
+--- gdb-7.11.orig/gdb/configure.tgt	2016-02-09 19:19:39.000000000 -0800
++++ gdb-7.11/gdb/configure.tgt	2016-04-21 17:42:32.628433139 -0700
+@@ -681,6 +681,11 @@
  			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
  			obsd-tdep.o bsd-uthread.o solib-svr4.o"
  	;;
diff --git a/util/crossgcc/patches/gdb-7.9.1_no-doc.patch b/util/crossgcc/patches/gdb-7.11_no-doc.patch
index 156337a0a3..6cd5e49294 100644
--- a/util/crossgcc/patches/gdb-7.9.1_no-doc.patch
+++ b/util/crossgcc/patches/gdb-7.11_no-doc.patch
@@ -1,7 +1,7 @@
-diff -ur gdb-7.9.1/gdb/Makefile.in gdb-7.9.1/gdb/Makefile.in
---- gdb-7.9.1/gdb/Makefile.in	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/gdb/Makefile.in	2015-06-09 13:22:53.594505278 -0700
-@@ -1065,7 +1065,7 @@
+diff -urN gdb-7.11.orig/gdb/Makefile.in gdb-7.11/gdb/Makefile.in
+--- gdb-7.11.orig/gdb/Makefile.in	2016-02-24 01:55:15.000000000 -0800
++++ gdb-7.11/gdb/Makefile.in	2016-04-21 17:44:32.721472633 -0700
+@@ -1092,7 +1092,7 @@
  
  TSOBS = inflow.o
  
diff --git a/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch b/util/crossgcc/patches/gdb-7.11_pythonhome.patch
index 7e34c7afa6..9bf88be5dd 100644
--- a/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch
+++ b/util/crossgcc/patches/gdb-7.11_pythonhome.patch
@@ -1,7 +1,7 @@
-diff -ur gdb-7.9.1/gdb/python/python.c gdb-7.9.1.patched/gdb/python/python.c
---- gdb-7.9.1/gdb/python/python.c	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1.patched/gdb/python/python.c	2015-06-09 13:13:24.824178760 -0700
-@@ -1681,6 +1681,15 @@
+diff -urN gdb-7.11.orig/gdb/python/python.c gdb-7.11/gdb/python/python.c
+--- gdb-7.11.orig/gdb/python/python.c	2016-02-09 19:19:39.000000000 -0800
++++ gdb-7.11/gdb/python/python.c	2016-04-21 17:45:39.119833428 -0700
+@@ -1748,6 +1748,15 @@
  #endif
  #endif
  
diff --git a/util/crossgcc/patches/gdb-7.9.1_sim-arange.patch b/util/crossgcc/patches/gdb-7.9.1_sim-arange.patch
deleted file mode 100644
index bf56c2db7c..0000000000
--- a/util/crossgcc/patches/gdb-7.9.1_sim-arange.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Mike Frysinger <vapier at gentoo dot org>
-
-With newer versions of gcc (5.x), the extern inline we're using with the
-sim-arange module no longer works.  Since this code really wants the gnu
-inline semantics, use that attribute explicitly.
-
-Reported-by: DJ Delorie <dj@redhat.com>
-Reported-by: Joel Sherrill <joel.sherrill@oarcorp.com>
-
-diff -urN gdb-7.9.1.orig/sim/common/sim-arange.h gdb-7.9.1/sim/common/sim-arange.h
---- gdb-7.9.1.orig/sim/common/sim-arange.h	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/sim/common/sim-arange.h	2016-02-27 12:22:58.090512073 -0800
-@@ -60,22 +60,26 @@
- 				   address_word /*start*/,
- 				   address_word /*end*/);
- 
-+/* TODO: This should get moved into sim-inline.h.  */
-+#ifdef HAVE_INLINE
-+#ifdef SIM_ARANGE_C
-+#define SIM_ARANGE_INLINE INLINE
-+#else
-+#define SIM_ARANGE_INLINE EXTERN_INLINE
-+#endif
-+#else
-+#define SIM_ARANGE_INLINE EXTERN
-+#endif
-+
- /* Return non-zero if ADDR is in range AR, traversing the entire tree.
-    If no range is specified, that is defined to mean "everything".  */
--extern INLINE int
-+SIM_ARANGE_INLINE int
- sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
- #define ADDR_RANGE_HIT_P(ar, addr) \
-   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
- 
- #ifdef HAVE_INLINE
--#ifdef SIM_ARANGE_C
--#define SIM_ARANGE_INLINE INLINE
--#else
--#define SIM_ARANGE_INLINE EXTERN_INLINE
--#endif
- #include "sim-arange.c"
--#else
--#define SIM_ARANGE_INLINE
- #endif
- #define SIM_ARANGE_C_INCLUDED
- 
-diff -urN gdb-7.9.1.orig/sim/common/sim-inline.h gdb-7.9.1/sim/common/sim-inline.h
---- gdb-7.9.1.orig/sim/common/sim-inline.h	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/sim/common/sim-inline.h	2016-02-27 12:23:58.169085087 -0800
-@@ -303,7 +303,9 @@
- /* ??? Temporary, pending decision to always use extern inline and do a vast
-    cleanup of inline support.  */
- #ifndef INLINE2
--#if defined (__GNUC__)
-+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__)
-+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__))
-+#elif defined (__GNUC__)
- #define INLINE2 __inline__
- #else
- #define INLINE2 /*inline*/