3 files changed, 8 insertions, 32 deletions
diff --git a/toolchain/gdb/patches/100-no_extern_inline.patch b/toolchain/gdb/patches/100-no_extern_inline.patch
deleted file mode 100644
index 4036f70301..0000000000
--- a/toolchain/gdb/patches/100-no_extern_inline.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/sim/common/sim-arange.c
-+++ b/sim/common/sim-arange.c
-@@ -277,9 +277,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a
-   build_search_tree (ar);
- }
- 
--#else /* SIM_ARANGE_C_INCLUDED */
--
--SIM_ARANGE_INLINE int
-+int
- sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr)
- {
-   ADDR_RANGE_TREE *t = ar->range_tree;
---- a/sim/common/sim-arange.h
-+++ b/sim/common/sim-arange.h
-@@ -73,7 +73,7 @@ extern void sim_addr_range_delete (ADDR_
- 
- /* Return non-zero if ADDR is in range AR, traversing the entire tree.
-    If no range is specified, that is defined to mean "everything".  */
--SIM_ARANGE_INLINE int
-+extern 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)))
diff --git a/toolchain/gdb/patches/110-no_testsuite.patch b/toolchain/gdb/patches/110-no_testsuite.patch
index f4a2cde5c8..90a2574caf 100644
--- a/toolchain/gdb/patches/110-no_testsuite.patch
+++ b/toolchain/gdb/patches/110-no_testsuite.patch
@@ -1,16 +1,16 @@
 --- a/gdb/configure
 +++ b/gdb/configure
-@@ -918,8 +918,7 @@ MAKEINFOFLAGS
+@@ -952,8 +952,7 @@ DEBUGINFOD_LIBS
  YACC
  YFLAGS
  XMKMF'
 -ac_subdirs_all='testsuite
--gdbtk
-+ac_subdirs_all='gdbtk
- gdbserver'
+-gdbtk'
++ac_subdirs_all='gdbtk'
  
  # Initialize some variables set by options.
-@@ -6628,7 +6627,7 @@ $as_echo "$with_auto_load_safe_path" >&6
+ ac_init_help=
+@@ -6668,7 +6667,7 @@ $as_echo "$with_auto_load_safe_path" >&6
  
  
  
diff --git a/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch b/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch
index 2b6610673c..99c91a0304 100644
--- a/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch
+++ b/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch
@@ -1,6 +1,6 @@
---- a/gdb/gdbserver/configure
-+++ b/gdb/gdbserver/configure
-@@ -2511,7 +2511,7 @@ $as_echo "$as_me: error: \`$ac_var' was
+--- a/gdbserver/configure
++++ b/gdbserver/configure
+@@ -2661,7 +2661,7 @@ $as_echo "$as_me: error: \`$ac_var' was
        ac_cache_corrupted=: ;;
      ,);;
      *)