3 files changed, 6 insertions, 14 deletions
diff --git a/toolchain/gdb/patches/100-no_extern_inline.patch b/toolchain/gdb/patches/100-no_extern_inline.patch
index 8c18c6e2e7..4036f70301 100644
--- a/toolchain/gdb/patches/100-no_extern_inline.patch
+++ b/toolchain/gdb/patches/100-no_extern_inline.patch
@@ -1,24 +1,16 @@
 --- a/sim/common/sim-arange.c
 +++ b/sim/common/sim-arange.c
-@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a
+@@ -277,9 +277,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a
    build_search_tree (ar);
  }
  
--#endif /* DEFINE_NON_INLINE_P */
--
--#if DEFINE_INLINE_P
+-#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;
-@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad
-   return 0;
- }
- 
--#endif /* DEFINE_INLINE_P */
-+#endif /* DEFINE_NON_INLINE_P */
 --- a/sim/common/sim-arange.h
 +++ b/sim/common/sim-arange.h
 @@ -73,7 +73,7 @@ extern void sim_addr_range_delete (ADDR_
diff --git a/toolchain/gdb/patches/110-no_testsuite.patch b/toolchain/gdb/patches/110-no_testsuite.patch
index bcb10e69b4..f4a2cde5c8 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
-@@ -915,8 +915,7 @@ MAKEINFOFLAGS
+@@ -918,8 +918,7 @@ MAKEINFOFLAGS
  YACC
  YFLAGS
  XMKMF'
 -ac_subdirs_all='testsuite
 -gdbtk
 +ac_subdirs_all='gdbtk
- multi-ice
  gdbserver'
  
-@@ -6577,7 +6576,7 @@ $as_echo "$with_auto_load_safe_path" >&6
+ # Initialize some variables set by options.
+@@ -6628,7 +6627,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 d971e28d88..2b6610673c 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
-@@ -2508,7 +2508,7 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2511,7 +2511,7 @@ $as_echo "$as_me: error: \`$ac_var' was
        ac_cache_corrupted=: ;;
      ,);;
      *)