diff --git a/config/comp_libs.in b/config/comp_libs.in
index 55ca2273..6dd8099e 100644
--- a/config/comp_libs.in
+++ b/config/comp_libs.in
@@ -52,6 +52,10 @@ config GMP_NEEDED
     def_bool y
     select COMP_LIBS_GMP
 
+config GMP_TARGET
+    bool
+    select COMP_LIBS_GMP
+
 config MPFR_NEEDED
     def_bool y
     select GMP_NEEDED
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index 917a770b..d2447904 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -10,6 +10,7 @@ config GDB_NATIVE
     select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later
     select EXPAT_TARGET
     select NCURSES_TARGET
+    select GMP_TARGET if GDB_11_1_or_later
     help
       Build and install a native gdb for the target, to run on the target.
 
diff --git a/packages/gdb-linaro/7.3-2011.12/chksum b/packages/gdb-linaro/7.3-2011.12/chksum
deleted file mode 100644
index fe49c7e0..00000000
--- a/packages/gdb-linaro/7.3-2011.12/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.3-2011.12.tar.bz2 92a7803933fdc6e25568a863174b0e26
-sha1 gdb-linaro-7.3-2011.12.tar.bz2 bf16c4d294a0cba9ad3789ef579b6cc5fb15dcae
-sha256 gdb-linaro-7.3-2011.12.tar.bz2 00f949a7296422daa2b4a25a5c89d02eba7ad3284a9f3c3cd3f2860e63788ee9
-sha512 gdb-linaro-7.3-2011.12.tar.bz2 f2f0f1e4aa4635adb64c278269fd724a03e2b91c584cea12698e6a2d433e47874375f649bd1ebf27ecee24e1a1396f79132a80ca67af56cfad3ec8b22e26a861
diff --git a/packages/gdb-linaro/7.3-2011.12/version.desc b/packages/gdb-linaro/7.3-2011.12/version.desc
deleted file mode 100644
index a114052d..00000000
--- a/packages/gdb-linaro/7.3-2011.12/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.4-2012.06/chksum b/packages/gdb-linaro/7.4-2012.06/chksum
deleted file mode 100644
index afba81f8..00000000
--- a/packages/gdb-linaro/7.4-2012.06/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.4-2012.06.tar.bz2 f18fb5745da8bf3576f83971201acf12
-sha1 gdb-linaro-7.4-2012.06.tar.bz2 64c64e9ecaca7ba575e1ca5240897dcd0ee8581b
-sha256 gdb-linaro-7.4-2012.06.tar.bz2 831c8c00fe744eb657c69f13090aaa1a326a7d4add23f7ce820d9d75bedbd56a
-sha512 gdb-linaro-7.4-2012.06.tar.bz2 0a2954c092cb392f364864fea4e58e0bf244db9a046c076c6e490f3d9a80806ebf59f88462ffc2a8a63008b22e66e61a931629c13a6144986a3a3e3b9ddf5e47
diff --git a/packages/gdb-linaro/7.4-2012.06/version.desc b/packages/gdb-linaro/7.4-2012.06/version.desc
deleted file mode 100644
index a114052d..00000000
--- a/packages/gdb-linaro/7.4-2012.06/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.5-2012.12/chksum b/packages/gdb-linaro/7.5-2012.12/chksum
deleted file mode 100644
index 1cf50d7a..00000000
--- a/packages/gdb-linaro/7.5-2012.12/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.5-2012.12.tar.bz2 086f7eb19adfb670f62cfa06c2563e23
-sha1 gdb-linaro-7.5-2012.12.tar.bz2 aba6f78c649e1ea45ca10d8ed2d89f4bcb050353
-sha256 gdb-linaro-7.5-2012.12.tar.bz2 0ef9e001289dbe3a998e3448907593e0d79f3134f74c600ee1a2756b4678345d
-sha512 gdb-linaro-7.5-2012.12.tar.bz2 257e1cc3b70d5225650a74e3b9ec5220bb427aa6ab76b7311cb23cb88da1dbb0d09cfd621353a3aa36dcd6f4872bc44e2fdfd083b747f7f88bf15aa6f50b5af5
diff --git a/packages/gdb-linaro/7.5-2012.12/version.desc b/packages/gdb-linaro/7.5-2012.12/version.desc
deleted file mode 100644
index a114052d..00000000
--- a/packages/gdb-linaro/7.5-2012.12/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.6.1-2013.10/chksum b/packages/gdb-linaro/7.6.1-2013.10/chksum
deleted file mode 100644
index 55d7d023..00000000
--- a/packages/gdb-linaro/7.6.1-2013.10/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.6.1-2013.10.tar.bz2 d735bed03e94d05fbefbb3b2eb897f99
-sha1 gdb-linaro-7.6.1-2013.10.tar.bz2 64d37cdcece5ca7e8aa1a71c00225a118a6941bd
-sha256 gdb-linaro-7.6.1-2013.10.tar.bz2 dcaad3f40a5ceef7923b3f7863df28ea26919e973dd475256c8affc90ed6c78f
-sha512 gdb-linaro-7.6.1-2013.10.tar.bz2 00374f20b9df81ed3387ffe77cc292fe68b2e4207a242d0727048498664870de091332896b3ba3aa1d5d02d76fee95b3cf51fe37ad746e982c740d00ae257d31
diff --git a/packages/gdb-linaro/7.6.1-2013.10/version.desc b/packages/gdb-linaro/7.6.1-2013.10/version.desc
deleted file mode 100644
index a114052d..00000000
--- a/packages/gdb-linaro/7.6.1-2013.10/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.7.1-2014.06-1/chksum b/packages/gdb-linaro/7.7.1-2014.06-1/chksum
deleted file mode 100644
index 7594be01..00000000
--- a/packages/gdb-linaro/7.7.1-2014.06-1/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.7.1-2014.06-1.tar.bz2 efc3c547c501ead7b643e3d1c2fd9fd6
-sha1 gdb-linaro-7.7.1-2014.06-1.tar.bz2 4829c2c81b5893ee870a37da560d6cf7cbecb57f
-sha256 gdb-linaro-7.7.1-2014.06-1.tar.bz2 9ec65e3e7ec9de03d9f2c7dba7cd4e0aa9b716f5f9f5a82901ed22f6d9eb8bf5
-sha512 gdb-linaro-7.7.1-2014.06-1.tar.bz2 1a0acb10673b27645eadf1f84d25c5044c0c4f0e4f1c3c138bfa51c927bd2409b791cb01f4aca24f68e0ed71575a1068938d144472172ab9d2f58f64c82ece51
diff --git a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
deleted file mode 100644
index a114052d..00000000
--- a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.8-2014.09/chksum b/packages/gdb-linaro/7.8-2014.09/chksum
deleted file mode 100644
index aa4d9bd3..00000000
--- a/packages/gdb-linaro/7.8-2014.09/chksum
+++ /dev/null
@@ -1,4 +0,0 @@
-md5 gdb-linaro-7.8-2014.09.tar.xz 954e47e397de0b635ecdb5bb5d0f145f
-sha1 gdb-linaro-7.8-2014.09.tar.xz dba876c1db7f71f4a78a96eeab66fcccf0ff178c
-sha256 gdb-linaro-7.8-2014.09.tar.xz fbbe96b8d0debf7c2d8c9a4a6c7ca0ba87d536e43289f81c4af56f95e5f7b5ea
-sha512 gdb-linaro-7.8-2014.09.tar.xz 6ef2a5729f17fc86c97be51519d9295b409f6b3f5137473ffa2ca22efa65b67209b953065fcb61d0dde0e44fd626fd10cea0e0a70413a3b1a17dc2ff3d93e219
diff --git a/packages/gdb-linaro/7.8-2014.09/version.desc b/packages/gdb-linaro/7.8-2014.09/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/gdb-linaro/7.8-2014.09/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/gdb-linaro/package.desc b/packages/gdb-linaro/package.desc
deleted file mode 100644
index ad4ffb5d..00000000
--- a/packages/gdb-linaro/package.desc
+++ /dev/null
@@ -1,7 +0,0 @@
-master='gdb'
-repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
-mirrors='$(CT_Mirrors Linaro gdb ${CT_GDB_LINARO_VERSION})'
-relevantpattern='*.*|.*-20[0-9][0-9] *.*|-20[0-9][0-9]'
-origin='Linaro'
-experimental='yes'
-archive_formats='.tar.xz'
diff --git a/packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch
similarity index 89%
rename from packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
rename to packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch
index 653f0e26..d6089224 100644
--- a/packages/gdb/7.10.1/0002-xtensa-make-sure-ar_base-is-initialized.patch
+++ b/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch
@@ -18,9 +18,9 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@
- 	tdep->num_regs = n;
-     }
+@@ -3129,6 +3129,9 @@
+   if (tdep->num_regs == 0)
+     tdep->num_regs = tdep->num_nopriv_regs;
  
 +  if (tdep->ar_base == -1)
 +    tdep->ar_base = tdep->a0_base;
diff --git a/packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch
similarity index 89%
rename from packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
rename to packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch
index f47b4942..5eec5d6b 100644
--- a/packages/gdb/7.10.1/0003-WIP-end-of-prologue-detection-hack.patch
+++ b/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch
@@ -15,7 +15,7 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 
 --- a/gdb/xtensa-tdep.c
 +++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@
+@@ -2377,7 +2377,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.  */
@@ -23,4 +23,4 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 +    body_pc = prologue_sal.end + 40;
  
    /* 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.  */
+      the current PC, make the best assumption for the end of the prologue.  */
diff --git a/packages/gdb/11.1/0002-allow-android.patch b/packages/gdb/11.1/0002-allow-android.patch
new file mode 100644
index 00000000..d6c58695
--- /dev/null
+++ b/packages/gdb/11.1/0002-allow-android.patch
@@ -0,0 +1,45 @@
+---
+ gdbserver/configure    |   11 -----------
+ gdbserver/configure.ac |   11 -----------
+ 2 files changed, 22 deletions(-)
+
+--- a/gdbserver/configure
++++ b/gdbserver/configure
+@@ -10028,17 +10028,6 @@
+ 
+ 
+ case "${target}" in
+-  *-android*)
+-    # Starting with NDK version 9, <elf.h> actually includes definitions
+-    # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes
+-    # <sys/exec_elf.h> which defines some of the ELF types incorrectly,
+-    # leading to conflicts with the defintions from <linux/elf.h>.
+-    # This makes it impossible for us to include both <elf.h> and
+-    # <linux/elf.h>, which means that, in practice, we do not have
+-    # access to Elf32_auxv_t and Elf64_auxv_t on this platform.
+-    # Therefore, do not try to auto-detect availability, as it would
+-    # get it wrong on this platform.
+-    ;;
+   *)
+     ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
+ 
+--- a/gdbserver/configure.ac
++++ b/gdbserver/configure.ac
+@@ -171,17 +171,6 @@
+ ])
+ 
+ case "${target}" in
+-  *-android*)
+-    # Starting with NDK version 9, <elf.h> actually includes definitions
+-    # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes
+-    # <sys/exec_elf.h> which defines some of the ELF types incorrectly,
+-    # leading to conflicts with the defintions from <linux/elf.h>.
+-    # This makes it impossible for us to include both <elf.h> and
+-    # <linux/elf.h>, which means that, in practice, we do not have
+-    # access to Elf32_auxv_t and Elf64_auxv_t on this platform.
+-    # Therefore, do not try to auto-detect availability, as it would
+-    # get it wrong on this platform.
+-    ;;
+   *)
+     AC_CHECK_TYPES([Elf32_auxv_t, Elf64_auxv_t], [], [],
+     #include <elf.h>
diff --git a/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch b/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch
new file mode 100644
index 00000000..7ccfa68b
--- /dev/null
+++ b/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch
@@ -0,0 +1,30 @@
+From 6f110500ed04148e3734f5b6a4fc573477c8398a Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Tue, 24 Aug 2021 12:29:18 -0700
+Subject: [PATCH] xtensa: Fix compilation of gdbserver
+
+Otherwise a lot of errors like the following happen:
+--------------------------->8---------------------------------
+Error:     .../gdb/xtensa-linux-nat.c:66:17: error: 'gdbarch_pc_regnum' was not declared in this scope
+Error:     .../gdb/xtensa-linux-nat.c:68:17: error: 'gdbarch_ps_regnum' was not declared in this scope
+Error:     .../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to 'gdbarch_tdep::gdbarch_tdep(gdbarch*&)'
+...
+--------------------------->8---------------------------------
+
+Initially caught by https://github.com/crosstool-ng/crosstool-ng/pull/1573/checks?check_run_id=3361561567
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+---
+ gdb/xtensa-linux-nat.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/gdb/xtensa-linux-nat.c
++++ b/gdb/xtensa-linux-nat.c
+@@ -34,6 +34,7 @@
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ 
++#include "gdbarch.h"
+ #include "gregset.h"
+ #include "xtensa-tdep.h"
+ 
diff --git a/packages/gdb/11.1/chksum b/packages/gdb/11.1/chksum
new file mode 100644
index 00000000..f81f46d8
--- /dev/null
+++ b/packages/gdb/11.1/chksum
@@ -0,0 +1,8 @@
+md5 gdb-11.1.tar.xz 257cb0f67927f79acf636d8c01e19990
+sha1 gdb-11.1.tar.xz 6cb3361c7f2b22d6d2c25ab4992264aa41bc2471
+sha256 gdb-11.1.tar.xz cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94
+sha512 gdb-11.1.tar.xz c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46
+md5 gdb-11.1.tar.gz eb6596d83bdccea06caa6d49d923e119
+sha1 gdb-11.1.tar.gz 71cf191c4409790f9f0b74e039145fbf61fd9916
+sha256 gdb-11.1.tar.gz cc2903474e965a43d09c3b263952d48ced39dd22ce2d01968f3aa181335fcb9c
+sha512 gdb-11.1.tar.gz 79420671b7f9ae70a474ff0122417edd8746b050b8079b667a799c72853a6fdfbf8f9bc820ebaae7776005eaf41eb6d2c7f17d88a286d8269f133c70d146aca7
diff --git a/packages/gdb/11.1/version.desc b/packages/gdb/11.1/version.desc
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch b/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
deleted file mode 100644
index b409c5be..00000000
--- a/packages/gdb/6.8a/0000-dwarf-stack-overflow.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/80_all_gdb-6.5-dwarf-stack-overflow.patch
--= BEGIN original header =-
-http://bugs.gentoo.org/144833
-
-for gdb/ChangeLog:
-2006-08-22  Will Drewry <wad@google.com>
-	    Tavis Ormandy <taviso@google.com>
-
-	* dwarf2read.c (decode_locdesc): Enforce location description stack
-	boundaries.
-	* dwarfread.c (locval): Likewise.
-
--= END original header =-
----
- 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.
- 
--   Note that stack[0] is unused except as a default error return.
--   Note that stack overflow is not yet handled.  */
-+   Note that stack[0] is unused except as a default error return. */
- 
- static CORE_ADDR
- decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
-@@ -9142,7 +9141,7 @@
- 
-   i = 0;
-   stacki = 0;
--  stack[stacki] = 0;
-+  stack[++stacki] = 0;
- 
-   while (i < size)
-     {
-@@ -9324,6 +9323,16 @@
- 		     dwarf_stack_op_name (op));
- 	  return (stack[stacki]);
- 	}
-+      /* Enforce maximum stack depth of size-1 to avoid ++stacki writing
-+         outside of the allocated space. Also enforce minimum > 0.
-+         -- wad@google.com 14 Aug 2006 */
-+      if (stacki >= sizeof (stack) / sizeof (*stack) - 1)
-+	internal_error (__FILE__, __LINE__,
-+	                _("location description stack too deep: %d"),
-+	                stacki);
-+      if (stacki <= 0)
-+	internal_error (__FILE__, __LINE__,
-+	                _("location description stack too shallow"));
-     }
-   return (stack[stacki]);
- }
diff --git a/packages/gdb/6.8a/0001-security-errata-20050610.patch b/packages/gdb/6.8a/0001-security-errata-20050610.patch
deleted file mode 100644
index eab3e091..00000000
--- a/packages/gdb/6.8a/0001-security-errata-20050610.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/35_all_gdb-6.3-security-errata-20050610.patch
--= BEGIN original header =-
-2005-06-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * gdb.base/gdbinit.exp: New testcase.
-        * gdb.base/gdbinit.sample: Sample .gdbinit for gdbinit.exp.
-
-2005-06-08  Daniel Jacobowitz  <dan@codesourcery.com>
-            Jeff Johnston  <jjohnstn@redhat.com>
-
-        * Makefile.in (cli-cmds.o): Update.
-        * configure.in: Add check for getuid.
-        * configure: Regenerated.
-        * config.in: Ditto.
-        * main.c (captured_main): Pass -1 to source_command when loading
-        gdbinit files.
-        * cli/cli-cmds.c: Include "gdb_stat.h" and <fcntl.h>.
-        (source_command): Update documentation.  Check permissions if
-        FROM_TTY is -1.
-
--= END original header =-
----
- 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) \
- 	$(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \
--	$(tui_h)
-+	$(tui_h) $(gdb_stat_h)
- 	$(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) \
---- a/gdb/cli/cli-cmds.c
-+++ b/gdb/cli/cli-cmds.c
-@@ -36,6 +36,7 @@
- #include "objfiles.h"
- #include "source.h"
- #include "disasm.h"
-+#include "gdb_stat.h"
- 
- #include "ui-out.h"
- 
-@@ -459,12 +460,31 @@
- 
-   if (fd == -1)
-     {
--      if (from_tty)
-+      if (from_tty > 0)
- 	perror_with_name (file);
-       else
- 	return;
-     }
- 
-+#ifdef HAVE_GETUID
-+  if (from_tty == -1)
-+    {
-+      struct stat statbuf;
-+      if (fstat (fd, &statbuf) < 0)
-+	{
-+	  perror_with_name (file);
-+	  close (fd);
-+	  return;
-+	}
-+      if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH))
-+	{
-+          warning (_("not using untrusted file \"%s\""), file);
-+	  close (fd);
-+	  return;
-+	}
-+    }
-+#endif
-+
-   stream = fdopen (fd, FOPEN_RT);
-   script_from_file (stream, file);
- 
---- a/gdb/main.c
-+++ b/gdb/main.c
-@@ -690,7 +690,7 @@
- 
-       if (!inhibit_gdbinit)
- 	{
--	  catch_command_errors (source_script, homeinit, 0, RETURN_MASK_ALL);
-+	  catch_command_errors (source_script, homeinit, -1, RETURN_MASK_ALL);
- 	}
- 
-       /* Do stats; no need to do them elsewhere since we'll only
-@@ -778,7 +778,7 @@
-       || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
-     if (!inhibit_gdbinit)
-       {
--	catch_command_errors (source_script, gdbinit, 0, RETURN_MASK_ALL);
-+	catch_command_errors (source_script, gdbinit, -1, RETURN_MASK_ALL);
-       }
- 
-   for (i = 0; i < ncmd; i++)
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gdbinit.exp
-@@ -0,0 +1,98 @@
-+#   Copyright 2005
-+#   Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-+
-+# Please email any bugs, comments, and/or additions to this file to:
-+# bug-gdb@prep.ai.mit.edu
-+
-+# This file was written by Jeff Johnston <jjohnstn@redhat.com>.
-+
-+if $tracelevel then {
-+    strace $tracelevel
-+}
-+
-+set prms_id 0
-+set bug_id 0
-+
-+# are we on a target board
-+if [is_remote target] {
-+    return
-+}
-+
-+
-+global verbose
-+global GDB
-+global GDBFLAGS
-+global gdb_prompt
-+global timeout
-+global gdb_spawn_id;
-+                                                                                
-+gdb_stop_suppressing_tests;
-+                                                                                
-+verbose "Spawning $GDB -nw"
-+                                                                                
-+if [info exists gdb_spawn_id] {
-+    return 0;
-+}
-+                                                                                
-+if ![is_remote host] {
-+   if { [which $GDB] == 0 } then {
-+        perror "$GDB does not exist."
-+        exit 1
-+    }
-+}
-+
-+set env(HOME) [pwd]
-+remote_exec build "rm .gdbinit"
-+remote_exec build "cp ${srcdir}/${subdir}/gdbinit.sample .gdbinit"
-+remote_exec build "chmod 646 .gdbinit"
-+
-+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $GDB failed."
-+    return 1;
-+}
-+gdb_expect 360 {
-+    -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
-+        pass "untrusted .gdbinit caught."
-+    }
-+    -re "$gdb_prompt $"     {
-+        fail "untrusted .gdbinit caught."
-+    }
-+    timeout {
-+        fail "(timeout) untrusted .gdbinit caught."
-+    }
-+}
-+
-+remote_exec build "chmod 644 .gdbinit"
-+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $GDB failed."
-+    return 1;
-+}
-+gdb_expect 360 {
-+    -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
-+        fail "trusted .gdbinit allowed."
-+    }
-+    -re "in gdbinit.*$gdb_prompt $"     {
-+        pass "trusted .gdbinit allowed."
-+    }
-+    timeout {
-+        fail "(timeout) trusted .gdbinit allowed."
-+    }
-+}
-+
-+remote_exec build "rm .gdbinit"
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/gdbinit.sample
-@@ -0,0 +1 @@
-+echo "\nin gdbinit"
diff --git a/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch b/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
deleted file mode 100644
index dcdcc1d4..00000000
--- a/packages/gdb/6.8a/0002-tdep-opcode-include-workaround.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/20_all_gdb-tdep-opcode-include-workaround.patch
--= BEGIN original header =-
-workaround build failure
-
-http://bugs.gentoo.org/216368
-
--= END original header =-
----
- 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"
- #include "gdb/sim-frv.h"
--#include "opcodes/frv-desc.h"	/* for the H_SPR_... enums */
-+#include "../opcodes/frv-desc.h"	/* for the H_SPR_... enums */
- #include "symtab.h"
- #include "elf-bfd.h"
- #include "elf/frv.h"
---- a/gdb/mep-tdep.c
-+++ b/gdb/mep-tdep.c
-@@ -53,8 +53,8 @@
- 
- /* Get the user's customized MeP coprocessor register names from
-    libopcodes.  */
--#include "opcodes/mep-desc.h"
--#include "opcodes/mep-opc.h"
-+#include "../opcodes/mep-desc.h"
-+#include "../opcodes/mep-opc.h"
- 
- 
- /* The gdbarch_tdep structure.  */
diff --git a/packages/gdb/6.8a/0003-reg-no-longer-active.patch b/packages/gdb/6.8a/0003-reg-no-longer-active.patch
deleted file mode 100644
index 9bb48e83..00000000
--- a/packages/gdb/6.8a/0003-reg-no-longer-active.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix bug reported by Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
-See: http://sourceware.org/ml/crossgcc/2009-05/msg00055.html
-     https://bugzilla.redhat.com/show_bug.cgi?id=436037
-
-Fix from: http://cvs.fedoraproject.org/viewvc/devel/gdb/gdb-6.8-bz436037-reg-no-longer-active.patch?revision=1.1
-
----
- 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;
- 
--	/* Figure out which frame this is in currently.  */
--	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
- 	value_reg = VALUE_REGNUM (toval);
- 
-+	/* Figure out which frame this is in currently.  */
-+	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
-+	/* "set $reg+=1" should work on programs with no debug info,
-+	   but frame_find_by_id returns NULL here (RH bug 436037).
-+	   Use current frame, it represents CPU state in this case.
-+	   If frame_find_by_id is changed to do it internally
-+	   (it is contemplated there), remove this.  */
-+	if (!frame)
-+	  frame = get_current_frame ();
-+	/* Probably never happens.  */
- 	if (!frame)
- 	  error (_("Value being assigned to is no longer active."));
- 	
diff --git a/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch b/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
deleted file mode 100644
index 4bba8274..00000000
--- a/packages/gdb/6.8a/0004-sim-ppc-have-config-h.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Fix for canadian cross build of sim/ppc
-
-Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
-
----
- 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
- CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- BISON = bison
-@@ -115,8 +115,8 @@
-   $(DEVZERO_CFLAGS)
- SIM_FPU_CFLAGS = @sim_fpu_cflags@
- 
--STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
--NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
-+STD_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
-+NOWARN_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
- BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
- 
- BUILD_LDFLAGS	=
---- a/sim/ppc/basics.h
-+++ b/sim/ppc/basics.h
-@@ -86,7 +86,9 @@
- 
- /* Basic configuration */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "inline.h"
- 
---- a/sim/ppc/debug.c
-+++ b/sim/ppc/debug.c
-@@ -22,7 +22,9 @@
- #ifndef _DEBUG_C_
- #define _DEBUG_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- #ifdef HAVE_STDLIB_H
---- a/sim/ppc/dgen.c
-+++ b/sim/ppc/dgen.c
-@@ -27,7 +27,9 @@
- #include <ctype.h>
- #include <stdarg.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
---- a/sim/ppc/filter.c
-+++ b/sim/ppc/filter.c
-@@ -21,7 +21,9 @@
- 
- #include <stdio.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef HAVE_STRING_H
- #include <string.h>
---- a/sim/ppc/filter_filename.c
-+++ b/sim/ppc/filter_filename.c
-@@ -18,7 +18,9 @@
-  
-     */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "filter_filename.h"
- 
---- a/sim/ppc/igen.c
-+++ b/sim/ppc/igen.c
-@@ -25,7 +25,9 @@
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include "filter.h"
- 
---- a/sim/ppc/inline.c
-+++ b/sim/ppc/inline.c
-@@ -22,7 +22,9 @@
- #ifndef _INLINE_C_
- #define _INLINE_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- 
- #include "inline.h"
---- a/sim/ppc/lf.c
-+++ b/sim/ppc/lf.c
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- 
---- a/sim/ppc/misc.c
-+++ b/sim/ppc/misc.c
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- 
- #ifdef HAVE_STDLIB_H
---- a/sim/ppc/misc.h
-+++ b/sim/ppc/misc.h
-@@ -21,7 +21,9 @@
- 
- /* Frustrating header junk */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include <stdio.h>
- #include <ctype.h>
---- a/sim/ppc/sim-endian.c
-+++ b/sim/ppc/sim-endian.c
-@@ -22,7 +22,9 @@
- #ifndef _SIM_ENDIAN_C_
- #define _SIM_ENDIAN_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- 
---- a/sim/ppc/table.c
-+++ b/sim/ppc/table.c
-@@ -25,7 +25,9 @@
- #include <fcntl.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
diff --git a/packages/gdb/6.8a/0005-handle-stpcpy-define.patch b/packages/gdb/6.8a/0005-handle-stpcpy-define.patch
deleted file mode 100644
index 11142e24..00000000
--- a/packages/gdb/6.8a/0005-handle-stpcpy-define.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- 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
- 
--#if !HAVE_DECL_STPCPY
-+#if !HAVE_DECL_STPCPY && !defined(stpcpy)
- extern char *stpcpy (char *__dest, const char *__src);
- #endif
- 
diff --git a/packages/gdb/6.8a/chksum b/packages/gdb/6.8a/chksum
deleted file mode 100644
index 86196555..00000000
--- a/packages/gdb/6.8a/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-6.8a.tar.bz2 da20d043e6729f74b909bd507bcae5c9
-sha1 gdb-6.8a.tar.bz2 00496289b7412e53c2c47ade8cf9348cdde0f7c8
-sha256 gdb-6.8a.tar.bz2 14cce3c259eb3563543a414fbf0f6b9dee4d7f2d1e89a2d8258b6918363ca522
-sha512 gdb-6.8a.tar.bz2 5114fe14ab25dc085590acff3a6feb75eb93347e501c634548308c4f51b31416ea23b8e612dfc54da466d3e7471e210d8f7a12ff6c050e9e89920884e5a64008
-md5 gdb-6.8a.tar.gz 6bccd284284261e46ad5acfb5cf3a499
-sha1 gdb-6.8a.tar.gz 309d5292e913e4fc7acf012d3ab720631043b567
-sha256 gdb-6.8a.tar.gz 921b3b3f28ed173b3469ab3b1436bbe8826c62da2cfa045f7853e50585d154f7
-sha512 gdb-6.8a.tar.gz 224f04bf6af7453a8957327951fe5473b6406e2e833fae60d041796ac6efd70b3e047aab75f36e220066e27367ad1e1c1d555d497ffefa15da1179bc83ec57e9
diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc
deleted file mode 100644
index f3953c8e..00000000
--- a/packages/gdb/6.8a/version.desc
+++ /dev/null
@@ -1,3 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
-archive_dirname='gdb-6.8'
diff --git a/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch b/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
deleted file mode 100644
index 2d068e7a..00000000
--- a/packages/gdb/7.0.1a/0000-sim-ppc-have-config-h.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Fix for canadian cross build of sim/ppc
-
-Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
-
----
- 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@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- BISON = bison
-@@ -116,8 +116,8 @@
-   $(DEVZERO_CFLAGS)
- SIM_FPU_CFLAGS = @sim_fpu_cflags@
- 
--STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
--NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
-+STD_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
-+NOWARN_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
- BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
- 
- BUILD_LDFLAGS	=
---- a/sim/ppc/basics.h
-+++ b/sim/ppc/basics.h
-@@ -86,7 +86,9 @@
- 
- /* Basic configuration */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "inline.h"
- 
---- a/sim/ppc/debug.c
-+++ b/sim/ppc/debug.c
-@@ -22,7 +22,9 @@
- #ifndef _DEBUG_C_
- #define _DEBUG_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- #ifdef HAVE_STDLIB_H
---- a/sim/ppc/dgen.c
-+++ b/sim/ppc/dgen.c
-@@ -27,7 +27,9 @@
- #include <ctype.h>
- #include <stdarg.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
---- a/sim/ppc/filter.c
-+++ b/sim/ppc/filter.c
-@@ -21,7 +21,9 @@
- 
- #include <stdio.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef HAVE_STRING_H
- #include <string.h>
---- a/sim/ppc/filter_filename.c
-+++ b/sim/ppc/filter_filename.c
-@@ -18,7 +18,9 @@
-  
-     */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "filter_filename.h"
- 
---- a/sim/ppc/igen.c
-+++ b/sim/ppc/igen.c
-@@ -25,7 +25,9 @@
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include "filter.h"
- 
---- a/sim/ppc/inline.c
-+++ b/sim/ppc/inline.c
-@@ -22,7 +22,9 @@
- #ifndef _INLINE_C_
- #define _INLINE_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- 
- #include "inline.h"
---- a/sim/ppc/lf.c
-+++ b/sim/ppc/lf.c
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- 
---- a/sim/ppc/misc.c
-+++ b/sim/ppc/misc.c
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- 
- #ifdef HAVE_STDLIB_H
---- a/sim/ppc/misc.h
-+++ b/sim/ppc/misc.h
-@@ -21,7 +21,9 @@
- 
- /* Frustrating header junk */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include <stdio.h>
- #include <ctype.h>
---- a/sim/ppc/sim-endian.c
-+++ b/sim/ppc/sim-endian.c
-@@ -22,7 +22,9 @@
- #ifndef _SIM_ENDIAN_C_
- #define _SIM_ENDIAN_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- 
---- a/sim/ppc/table.c
-+++ b/sim/ppc/table.c
-@@ -25,7 +25,9 @@
- #include <fcntl.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
diff --git a/packages/gdb/7.0.1a/chksum b/packages/gdb/7.0.1a/chksum
deleted file mode 100644
index b5294c2a..00000000
--- a/packages/gdb/7.0.1a/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.0.1a.tar.bz2 0dfce1de21f237433ec7972e2d2cd338
-sha1 gdb-7.0.1a.tar.bz2 3b2c0d50533bcf834c2da0a700dfc2f4852a07e4
-sha256 gdb-7.0.1a.tar.bz2 98fb6a414f1d158071541e000ae7c66bf1c39e7ee7e2c3aa0fb02bd362246a8d
-sha512 gdb-7.0.1a.tar.bz2 7282f39455180c04b636c1460e7ba316c5a9e0b5e39ce0fca44b5d8a8c7b4641ec01d04038b72e116afeb62749da370ae9cc46f77a26c91940ccfc0329182d35
-md5 gdb-7.0.1a.tar.gz e07c901e992b2a379dbaa56f7c9df59f
-sha1 gdb-7.0.1a.tar.gz 815f8336cb0ddaa7f9118ca64ec618f162f72f7b
-sha256 gdb-7.0.1a.tar.gz 0a8cf5b4fc1d6537a36cc189a0748a0cda09b13822e585a71183e02503e1c86e
-sha512 gdb-7.0.1a.tar.gz 1c2400358a3110b9d5266bfc8738f2350be0b677c490e4850af1a9454eaf5fd4f6313e638c9f0d32a0e4d11e8859d9609f06dfb90c22257f64bbf9303a348272
diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc
deleted file mode 100644
index f98f67c5..00000000
--- a/packages/gdb/7.0.1a/version.desc
+++ /dev/null
@@ -1,3 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
-archive_dirname='gdb-7.0.1'
diff --git a/packages/gdb/7.10.1/0000-musl_fix.patch b/packages/gdb/7.10.1/0000-musl_fix.patch
deleted file mode 100644
index 9f1b9309..00000000
--- a/packages/gdb/7.10.1/0000-musl_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
----
- 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 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
-+#include "stopcode.h"
- #include "defs.h"
- #include "inferior.h"
- #include "infrun.h"
-@@ -73,6 +74,10 @@
- #define SPUFS_MAGIC 0x23c9b64e
- #endif
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
---- /dev/null
-+++ b/gdb/stopcode.h
-@@ -0,0 +1,4 @@
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
diff --git a/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
deleted file mode 100644
index afa70835..00000000
--- a/packages/gdb/7.10.1/0001-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7f8c0d8984bf5754807d3bb543cbc3ffc634e9e4 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 30 May 2015 13:00:32 +0300
-Subject: [PATCH] xtensa: initialize call_abi in xtensa_tdep
-
-Use XSHAL_ABI value provided by xtensa-config.h to correctly initialize
-xtensa_tdep.call_abi
-This fixes calls to functions from GDB that otherwise fail with the
-following assertion in call0 configuration:
-
-  gdb/regcache.c:602: internal-error: regcache_raw_read: Assertion
-  `regnum >= 0 && regnum < regcache->descr->nr_raw_registers' failed.
-
-gdb/
-	* xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Initialize
-	call_abi using XSHAL_ABI macro.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/gdb/xtensa-tdep.h
-+++ b/gdb/xtensa-tdep.h
-@@ -246,7 +246,8 @@
- 	  .spill_location = -1,					\
- 	  .spill_size = (spillsz),				\
- 	  .unused = 0,						\
--	  .call_abi = 0,					\
-+	  .call_abi = (XSHAL_ABI == XTHAL_ABI_CALL0) ?		\
-+		CallAbiCall0Only : CallAbiDefault,		\
- 	  .debug_interrupt_level = XCHAL_DEBUGLEVEL,		\
- 	  .icache_line_bytes = XCHAL_ICACHE_LINESIZE,		\
- 	  .dcache_line_bytes = XCHAL_DCACHE_LINESIZE,		\
diff --git a/packages/gdb/7.10.1/chksum b/packages/gdb/7.10.1/chksum
deleted file mode 100644
index a6f0025f..00000000
--- a/packages/gdb/7.10.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.10.1.tar.xz 39e654460c9cdd80200a29ac020cfe11
-sha1 gdb-7.10.1.tar.xz 7d67703b31444ae41d8b8707455b97d3fac4ad65
-sha256 gdb-7.10.1.tar.xz 25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5
-sha512 gdb-7.10.1.tar.xz 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
-md5 gdb-7.10.1.tar.gz b93a2721393e5fa226375b42d567d90b
-sha1 gdb-7.10.1.tar.gz f5a47daa50df3b79a73c7c717363ee3a7e040e07
-sha256 gdb-7.10.1.tar.gz ff14f8050e6484508c73cbfa63731e57901478490ca1672dc0b5e2b03f6af622
-sha512 gdb-7.10.1.tar.gz d32faddaab92dd407718dc3ee304a8f6267354f2ccad753d71b6ed9dd51524e2329eba13711f7ae4b690d81bc1510544fabc39b30328463930bd10a60b0939a0
diff --git a/packages/gdb/7.10.1/version.desc b/packages/gdb/7.10.1/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/gdb/7.10.1/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/gdb/7.11.1/version.desc b/packages/gdb/7.11.1/version.desc
index e69de29b..fcfe3891 100644
--- a/packages/gdb/7.11.1/version.desc
+++ b/packages/gdb/7.11.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/gdb/7.12.1/version.desc b/packages/gdb/7.12.1/version.desc
index e69de29b..fcfe3891 100644
--- a/packages/gdb/7.12.1/version.desc
+++ b/packages/gdb/7.12.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/gdb/7.1a/chksum b/packages/gdb/7.1a/chksum
deleted file mode 100644
index ca095dee..00000000
--- a/packages/gdb/7.1a/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.1a.tar.bz2 05f4c7bb02c405e03f391f648c1854e3
-sha1 gdb-7.1a.tar.bz2 ba3980daf648d3ca0dfdee012efc5faad840ae86
-sha256 gdb-7.1a.tar.bz2 a4370398633135eefd71cf5788b760a6dee1d7a8a0a79856ac1f1d357ccb36c1
-sha512 gdb-7.1a.tar.bz2 ca06c4d0d18be1c01b07c7bf4494d6f1d6caf9b7b4e4ae97dc713748be4c041567a87d5f1823d402da698c6cfa1b3340618fb63a90b7750da7d6e477fa3f6a05
-md5 gdb-7.1a.tar.gz c9ecd54dbca560f7664f3003dfe0eca5
-sha1 gdb-7.1a.tar.gz a84a65311a6e6f7a088138d380dde1be7c59ea31
-sha256 gdb-7.1a.tar.gz 8615389a2a59e4c1b660eb4612c5f3150a32a63dd272b28de5cb47db978137cb
-sha512 gdb-7.1a.tar.gz 2a5107c6e971ade3bde2f1d5f37a23158d55744d842801a79f2d2988e2023fcf5e3924437a7cad0a578813ab4b4b5653402e81e371d44502cd2e4d62843bbecc
diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc
deleted file mode 100644
index 009fd5d9..00000000
--- a/packages/gdb/7.1a/version.desc
+++ /dev/null
@@ -1,3 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
-archive_dirname='gdb-7.1'
diff --git a/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch b/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
deleted file mode 100644
index 3cff5182..00000000
--- a/packages/gdb/7.2a/0000-sim-ppc-lz-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix for psim build failure due to -lz
-
-See http://sourceware.org/bugzilla/show_bug.cgi?id=12202
-
----
- 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.2a/chksum b/packages/gdb/7.2a/chksum
deleted file mode 100644
index 91e488ae..00000000
--- a/packages/gdb/7.2a/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.2a.tar.bz2 ae6c7c98de35dc14b6720c9c321e4d94
-sha1 gdb-7.2a.tar.bz2 14daf8ccf1307f148f80c8db17f8e43f545c2691
-sha256 gdb-7.2a.tar.bz2 3c24dde332e33bfe2d5980c726d76224ebf8304278112a07bf701f8d2145d9bc
-sha512 gdb-7.2a.tar.bz2 901f221b47f92b0a34c255072b278aba36374fcaf140128352d4db70955997a12e6b4abd34adc34d9cd4eef72a4a5d0c3df710a81c3d677ad7ac5190361a68ad
-md5 gdb-7.2a.tar.gz a9a8d0ea1ae57837fada5415bd0f92ff
-sha1 gdb-7.2a.tar.gz cab7ea0c4d9cebd2439b6c11ff27bbfb1d311013
-sha256 gdb-7.2a.tar.gz 9f51739cd45c158aa5df2e7abb703a304b5370e2e9e43c70f5cc0b1c4be5d0c2
-sha512 gdb-7.2a.tar.gz 6e523929663f04a025325aaf79a0670fbaa696176857fbbffa5d29ebc67269b497756ad513ed00f4d984d2aaeed80d44eab3fd1cee1682e5cbbe5f22b2433813
diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc
deleted file mode 100644
index 094d9372..00000000
--- a/packages/gdb/7.2a/version.desc
+++ /dev/null
@@ -1,3 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
-archive_dirname='gdb-7.2'
diff --git a/packages/gdb/7.3.1/chksum b/packages/gdb/7.3.1/chksum
deleted file mode 100644
index 92e3385e..00000000
--- a/packages/gdb/7.3.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.3.1.tar.bz2 b89a5fac359c618dda97b88645ceab47
-sha1 gdb-7.3.1.tar.bz2 e57f2c7f93536ef54fab728eb733bf2c36550718
-sha256 gdb-7.3.1.tar.bz2 6d7bff716fde98d03866a1b747c0929ee7dba49bca13e01d975e0b0fa9b33a28
-sha512 gdb-7.3.1.tar.bz2 69d7318a3f6bf3c95804e6526d886348333d85c4f63c19e7575052792851a296073e36e1b54c63151c2db8ca0bfead36693f4513f2fd9dec962870408e8e71d9
-md5 gdb-7.3.1.tar.gz c2795d636a9481d022608cab201be613
-sha1 gdb-7.3.1.tar.gz aa0ba83884b9cb72e27901f2ade4f27c7e55fbe9
-sha256 gdb-7.3.1.tar.gz d7d909b4b8ae0932ba6c1602f2f1f32bef60f0c71c72f1dd833ab6cb15e0d357
-sha512 gdb-7.3.1.tar.gz 1b470a41b90c393f2e03a8dfcadf6ff41b6523c33102b42bf6470aba7dfedd819edb4f7a63f208cb193d2fe420f71dbe7d0400d774f65e88aebbdcb0528c55d9
diff --git a/packages/gdb/7.3.1/version.desc b/packages/gdb/7.3.1/version.desc
deleted file mode 100644
index f26b5a26..00000000
--- a/packages/gdb/7.3.1/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch b/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
deleted file mode 100644
index a430d946..00000000
--- a/packages/gdb/7.4.1/0000-all_ptrace_setsiginfo.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-fix from upstream for building with newer kernel headers
-
-From a7f9ca9cb797d653dc7919538e1dfa0c26010331 Mon Sep 17 00:00:00 2001
-From: tschwinge <tschwinge>
-Date: Wed, 21 Mar 2012 13:43:50 +0000
-Subject: [PATCH] struct siginfo vs. siginfo_t
-
-gdb/
-	* amd64-linux-nat.c (amd64_linux_siginfo_fixup): Use siginfo_t instead
-	of struct siginfo.
-	* arm-linux-nat.c (arm_linux_stopped_data_address): Likewise.
-	* ia64-linux-nat.c (ia64_linux_stopped_data_address): Likewise.
-	* linux-nat.c (linux_nat_siginfo_fixup, siginfo_fixup)
-	(linux_xfer_siginfo, linux_nat_set_siginfo_fixup)
-	(linux_nat_get_siginfo): Likewise.
-	* linux-nat.h (struct lwp_info, linux_nat_set_siginfo_fixup)
-	(linux_nat_get_siginfo): Likewise.
-	* linux-tdep.c (linux_get_siginfo_type): Likewise.
-	* ppc-linux-nat.c (ppc_linux_stopped_data_address): Likewise.
-	* procfs.c (gdb_siginfo_t): Likewise.
-
-gdbserver/
-	* linux-arm-low.c (arm_stopped_by_watchpoint): Use siginfo_t instead of
-	struct siginfo.
-	* linux-low.c (siginfo_fixup, linux_xfer_siginfo): Likewise.
-	* linux-x86-low.c (x86_siginfo_fixup): Likewise.
-	* linux-low.h: Include <signal.h>.
-	(struct siginfo): Remove forward declaration.
-	(struct linux_target_ops) <siginfo_fixup>: Use siginfo_t instead of
-	struct siginfo.
----
- gdb/amd64-linux-nat.c         |    4 ++--
- gdb/arm-linux-nat.c           |    2 +-
- gdb/gdbserver/linux-arm-low.c |    2 +-
- gdb/gdbserver/linux-low.c     |   10 +++++-----
- gdb/gdbserver/linux-low.h     |    5 ++---
- gdb/gdbserver/linux-x86-low.c |    4 ++--
- gdb/ia64-linux-nat.c          |    2 +-
- gdb/linux-nat.c               |   16 ++++++++--------
- gdb/linux-nat.h               |    6 +++---
- gdb/ppc-linux-nat.c           |    2 +-
- gdb/procfs.c                  |    2 +-
- 11 files changed, 27 insertions(+), 28 deletions(-)
-
---- a/gdb/amd64-linux-nat.c
-+++ b/gdb/amd64-linux-nat.c
-@@ -671,13 +671,13 @@
-    INF.  */
- 
- static int
--amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction)
-+amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction)
- {
-   /* Is the inferior 32-bit?  If so, then do fixup the siginfo
-      object.  */
-   if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32)
-     {
--      gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t));
-+      gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
- 
-       if (direction == 0)
- 	compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
---- a/gdb/arm-linux-nat.c
-+++ b/gdb/arm-linux-nat.c
-@@ -1137,7 +1137,7 @@
- static int
- arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
- {
--  struct siginfo *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-+  siginfo_t *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-   int slot = siginfo_p->si_errno;
- 
-   /* This must be a hardware breakpoint.  */
---- a/gdb/gdbserver/linux-arm-low.c
-+++ b/gdb/gdbserver/linux-arm-low.c
-@@ -631,7 +631,7 @@
- arm_stopped_by_watchpoint (void)
- {
-   struct lwp_info *lwp = get_thread_lwp (current_inferior);
--  struct siginfo siginfo;
-+  siginfo_t siginfo;
- 
-   /* We must be able to set hardware watchpoints.  */
-   if (arm_linux_get_hw_watchpoint_count () == 0)
---- a/gdb/gdbserver/linux-low.c
-+++ b/gdb/gdbserver/linux-low.c
-@@ -4522,7 +4522,7 @@
-    layout of the inferiors' architecture.  */
- 
- static void
--siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
-+siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction)
- {
-   int done = 0;
- 
-@@ -4534,9 +4534,9 @@
-   if (!done)
-     {
-       if (direction == 1)
--	memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
-+	memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
-       else
--	memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
-+	memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
-     }
- }
- 
-@@ -4545,8 +4545,8 @@
- 		    unsigned const char *writebuf, CORE_ADDR offset, int len)
- {
-   int pid;
--  struct siginfo siginfo;
--  char inf_siginfo[sizeof (struct siginfo)];
-+  siginfo_t siginfo;
-+  char inf_siginfo[sizeof (siginfo_t)];
- 
-   if (current_inferior == NULL)
-     return -1;
---- a/gdb/gdbserver/linux-low.h
-+++ b/gdb/gdbserver/linux-low.h
-@@ -20,6 +20,7 @@
- #ifdef HAVE_THREAD_DB_H
- #include <thread_db.h>
- #endif
-+#include <signal.h>
- 
- #include "gdb_proc_service.h"
- 
-@@ -46,8 +47,6 @@
- extern struct regset_info target_regsets[];
- #endif
- 
--struct siginfo;
--
- struct process_info_private
- {
-   /* Arch-specific additions.  */
-@@ -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.  */
--  int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction);
-+  int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction);
- 
-   /* Hook to call when a new process is created or attached to.
-      If extra per-process architecture-specific data is needed,
---- a/gdb/gdbserver/linux-x86-low.c
-+++ b/gdb/gdbserver/linux-x86-low.c
-@@ -906,13 +906,13 @@
-    INF.  */
- 
- static int
--x86_siginfo_fixup (struct siginfo *native, void *inf, int direction)
-+x86_siginfo_fixup (siginfo_t *native, void *inf, int direction)
- {
- #ifdef __x86_64__
-   /* Is the inferior 32-bit?  If so, then fixup the siginfo object.  */
-   if (register_size (0) == 4)
-     {
--      if (sizeof (struct siginfo) != sizeof (compat_siginfo_t))
-+      if (sizeof (siginfo_t) != sizeof (compat_siginfo_t))
- 	fatal ("unexpected difference in siginfo");
- 
-       if (direction == 0)
---- a/gdb/ia64-linux-nat.c
-+++ b/gdb/ia64-linux-nat.c
-@@ -637,7 +637,7 @@
- ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
- {
-   CORE_ADDR psr;
--  struct siginfo *siginfo_p;
-+  siginfo_t *siginfo_p;
-   struct regcache *regcache = get_current_regcache ();
- 
-   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -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.  */
--static int (*linux_nat_siginfo_fixup) (struct siginfo *,
-+static int (*linux_nat_siginfo_fixup) (siginfo_t *,
- 				       gdb_byte *,
- 				       int);
- 
-@@ -4138,7 +4138,7 @@
-    layout of the inferiors' architecture.  */
- 
- static void
--siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
-+siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction)
- {
-   int done = 0;
- 
-@@ -4150,9 +4150,9 @@
-   if (!done)
-     {
-       if (direction == 1)
--	memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
-+	memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
-       else
--	memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
-+	memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
-     }
- }
- 
-@@ -4162,8 +4162,8 @@
- 		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
- {
-   int pid;
--  struct siginfo siginfo;
--  gdb_byte inf_siginfo[sizeof (struct siginfo)];
-+  siginfo_t siginfo;
-+  gdb_byte inf_siginfo[sizeof (siginfo_t)];
- 
-   gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
-   gdb_assert (readbuf || writebuf);
-@@ -5852,7 +5852,7 @@
-    inferior.  */
- void
- linux_nat_set_siginfo_fixup (struct target_ops *t,
--			     int (*siginfo_fixup) (struct siginfo *,
-+			     int (*siginfo_fixup) (siginfo_t *,
- 						   gdb_byte *,
- 						   int))
- {
-@@ -5861,7 +5861,7 @@
- }
- 
- /* Return the saved siginfo associated with PTID.  */
--struct siginfo *
-+siginfo_t *
- linux_nat_get_siginfo (ptid_t ptid)
- {
-   struct lwp_info *lp = find_lwp_pid (ptid);
---- a/gdb/linux-nat.h
-+++ b/gdb/linux-nat.h
-@@ -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.  */
--  struct siginfo siginfo;
-+  siginfo_t siginfo;
- 
-   /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
-      watchpoint trap.  */
-@@ -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 *,
--				  int (*) (struct siginfo *,
-+				  int (*) (siginfo_t *,
- 					   gdb_byte *,
- 					   int));
- 
-@@ -180,7 +180,7 @@
- void linux_nat_switch_fork (ptid_t new_ptid);
- 
- /* Return the saved siginfo associated with PTID.  */
--struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
-+siginfo_t *linux_nat_get_siginfo (ptid_t ptid);
- 
- /* Compute and return the processor core of a given thread.  */
- int linux_nat_core_of_thread_1 (ptid_t ptid);
---- a/gdb/ppc-linux-nat.c
-+++ b/gdb/ppc-linux-nat.c
-@@ -2213,7 +2213,7 @@
- static int
- ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
- {
--  struct siginfo *siginfo_p;
-+  siginfo_t *siginfo_p;
- 
-   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
- 
---- a/gdb/procfs.c
-+++ b/gdb/procfs.c
-@@ -262,7 +262,7 @@
- #ifdef HAVE_PR_SIGINFO64_T
- typedef pr_siginfo64_t gdb_siginfo_t;
- #else
--typedef struct siginfo gdb_siginfo_t;
-+typedef siginfo_t gdb_siginfo_t;
- #endif
- 
- /* On mips-irix, praddset and prdelset are defined in such a way that
diff --git a/packages/gdb/7.4.1/0001-all_readline-headers.patch b/packages/gdb/7.4.1/0001-all_readline-headers.patch
deleted file mode 100644
index 4aa05726..00000000
--- a/packages/gdb/7.4.1/0001-all_readline-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
----
- 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 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_WCHAR_H /* wcwidth() */
-+# define _GNU_SOURCE
-+# include <wchar.h>
-+#endif
-+
- #include <sys/types.h>
- #include <fcntl.h>
- #if defined (HAVE_SYS_FILE_H)
---- a/readline/display.c
-+++ b/readline/display.c
-@@ -25,6 +25,11 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_WCHAR_H /* wcwidth() */
-+# define _GNU_SOURCE
-+# include <wchar.h>
-+#endif
-+
- #include <sys/types.h>
- 
- #if defined (HAVE_UNISTD_H)
---- a/readline/mbutil.c
-+++ b/readline/mbutil.c
-@@ -25,6 +25,11 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_WCHAR_H /* wcwidth() */
-+# define _GNU_SOURCE
-+# include <wchar.h>
-+#endif
-+
- #include <sys/types.h>
- #include <fcntl.h>
- #include "posixjmp.h"
diff --git a/packages/gdb/7.4.1/chksum b/packages/gdb/7.4.1/chksum
deleted file mode 100644
index 14787fa5..00000000
--- a/packages/gdb/7.4.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.4.1.tar.bz2 8854d34691087ec127d934692639855f
-sha1 gdb-7.4.1.tar.bz2 1b0f8c3778d4b10c8d2be6922ac01a9900e8116c
-sha256 gdb-7.4.1.tar.bz2 a081343c017732ab4dd30a4730da83667aa01b0b37d1ad3700c3f05a5da0f9f6
-sha512 gdb-7.4.1.tar.bz2 86a2f19f161da558afdb5b6179ba11e9124651b5e10915dd3e703fc8e54cf68dba5ffa86f5c3c3c595bc8841728e220741c9fa20889f548725dbd034f3456114
-md5 gdb-7.4.1.tar.gz 5fb7fca9ef7a9e3cfee0e2f2c0e52051
-sha1 gdb-7.4.1.tar.gz 8aa908f01a6e572d356721297a741f622af6c407
-sha256 gdb-7.4.1.tar.gz f99d2be831ead324712ae4f11868e07e545272f10aac4186060f1386f2629b38
-sha512 gdb-7.4.1.tar.gz 3a7a836a66ca9471b6a8c0160c3c7135b2b8ce7d069cb88eb70fc2d2b3fbed4761d445987b1e8064141ea2a0c57e910dec698ae235000976fe47ab4cc3384d6b
diff --git a/packages/gdb/7.4.1/version.desc b/packages/gdb/7.4.1/version.desc
deleted file mode 100644
index f26b5a26..00000000
--- a/packages/gdb/7.4.1/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.5.1/chksum b/packages/gdb/7.5.1/chksum
deleted file mode 100644
index fed37802..00000000
--- a/packages/gdb/7.5.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.5.1.tar.bz2 3f48f468b24447cf24820054ff6e85b1
-sha1 gdb-7.5.1.tar.bz2 d04c832698ac470a88788e719d19ca7c1d4d803d
-sha256 gdb-7.5.1.tar.bz2 070b808d289fa8f0291738eeaccc0cd7700d476998781f572856155240d29d20
-sha512 gdb-7.5.1.tar.bz2 23b240f0ca9376dfc2fdeb79e725a3784841d1f787db9f7ca62a5e2f824ddd8b2d5fb3450e19dd8fee79589e3b0a5fe638eaa35966363c78c82711731c26dc47
-md5 gdb-7.5.1.tar.gz b1519bf899890d21d4774845a6e602fe
-sha1 gdb-7.5.1.tar.gz 55615cbcb4549c2fa75a0b30cc9e97ef16ebef14
-sha256 gdb-7.5.1.tar.gz f99f26e2c1127f12ba14ece0947a9a9948be45e96b69ef363131e469a698636e
-sha512 gdb-7.5.1.tar.gz ccbda9ce7661f506fe4dc09062d95d37ea6ba592007be04c701868bf6f25aa395c61f3e997a816e68a36dfc9bdce9b52426d6d4f30957866ceed86e772f45314
diff --git a/packages/gdb/7.5.1/version.desc b/packages/gdb/7.5.1/version.desc
deleted file mode 100644
index f26b5a26..00000000
--- a/packages/gdb/7.5.1/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.6.1/chksum b/packages/gdb/7.6.1/chksum
deleted file mode 100644
index 7521c304..00000000
--- a/packages/gdb/7.6.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.6.1.tar.bz2 fbc4dab4181e6e9937075b43a4ce2732
-sha1 gdb-7.6.1.tar.bz2 0e38633b3902070d9c6755e4c54602148a094361
-sha256 gdb-7.6.1.tar.bz2 e3dfa38a14a5457f9b8b26f7b5080ba5491bd10ae4d69bfe357cea87b7d162e4
-sha512 gdb-7.6.1.tar.bz2 ca42f003073d35cde42b43efe12f42888b39f2fc4b55f7df9faca2c8381a9329f19bf9366fff0af3ae59711aafaf9b4a33a15cb73a531c0c046b8ada98ed774b
-md5 gdb-7.6.1.tar.gz d42841167fd061d90fddf9a7212a1f9f
-sha1 gdb-7.6.1.tar.gz 13beaab7d28f8591777c9271f0c20a22c70d6252
-sha256 gdb-7.6.1.tar.gz 3ccf7f618536f89648ba89e322fc3c0946bc15c03ca09c32fd9e71bbca68104b
-sha512 gdb-7.6.1.tar.gz 3c27438ef627b76b8de9dc1135c0777db38f4aa0f952134c5e13aaf47f231899c3740ed9868506a5296d09a3cbd3173314cfd593fd30210e8654dbd8f8241302
diff --git a/packages/gdb/7.6.1/version.desc b/packages/gdb/7.6.1/version.desc
deleted file mode 100644
index f26b5a26..00000000
--- a/packages/gdb/7.6.1/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.7.1/chksum b/packages/gdb/7.7.1/chksum
deleted file mode 100644
index a3cfae67..00000000
--- a/packages/gdb/7.7.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.7.1.tar.bz2 77b20b515e7c25f032cb9732a66620fe
-sha1 gdb-7.7.1.tar.bz2 35228319f7c715074a80be42fff64c7645227a80
-sha256 gdb-7.7.1.tar.bz2 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5
-sha512 gdb-7.7.1.tar.bz2 887b9b726dae8f6e3e5e41574460a67e4f9002b0d47bc985dcf63bdf3518397a90b6a208cb5b19e5ed2341715ad75cfeed4df4fb423f39f74218e36bc87f1cab
-md5 gdb-7.7.1.tar.gz 45b07b53d81832d32ccd4829465d4886
-sha1 gdb-7.7.1.tar.gz bb49bdb5781ea62ccdc2ec6869872e1b43168572
-sha256 gdb-7.7.1.tar.gz eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff
-sha512 gdb-7.7.1.tar.gz 84576cb1faa96b9b62727e7a0afb4b04363cbdb46f512495afce0f74ef245f319daa4a7698d2b72fde2f4ccb114a741e1004012befea31daeaedfb3bb7e69764
diff --git a/packages/gdb/7.7.1/version.desc b/packages/gdb/7.7.1/version.desc
deleted file mode 100644
index f26b5a26..00000000
--- a/packages/gdb/7.7.1/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-obsolete='yes'
-archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.8.2/chksum b/packages/gdb/7.8.2/chksum
deleted file mode 100644
index d75e501b..00000000
--- a/packages/gdb/7.8.2/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.8.2.tar.xz a80cf252ed2e775d4e4533341bbf2459
-sha1 gdb-7.8.2.tar.xz 85a9cc2a4dfb748bc8eb74113af278524126a9bd
-sha256 gdb-7.8.2.tar.xz 605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485
-sha512 gdb-7.8.2.tar.xz face5bf1b4ce144fc8604fc84620beed956177a11fd632b4e41906fc7f632910b2b43a50e6cfdfd6cbd876ee527c813bddab8df29dc560a6c36694cdb8edc4e4
-md5 gdb-7.8.2.tar.gz 8b0ea8b3559d3d90b3ff4952f0aeafbc
-sha1 gdb-7.8.2.tar.gz 67cfbc6efcff674aaac3af83d281cf9df0839ff9
-sha256 gdb-7.8.2.tar.gz fd9a9784ca24528aac8a4e6b8d7ae7e8cf0784e128cd67a185c986deaf6b9929
-sha512 gdb-7.8.2.tar.gz e5ba927c57b387ec0ff517c2ac0511aad744ab801e04cb5a910ae48cebef3172530edd1096b8c7753f03665d33f2c4e89ea1f88f67475a341792e6b42bb18821
diff --git a/packages/gdb/7.8.2/version.desc b/packages/gdb/7.8.2/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/gdb/7.8.2/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/gdb/7.9.1/chksum b/packages/gdb/7.9.1/chksum
deleted file mode 100644
index 2d9a04f6..00000000
--- a/packages/gdb/7.9.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-md5 gdb-7.9.1.tar.xz 35374c77a70884eb430c97061053a36e
-sha1 gdb-7.9.1.tar.xz 04ba2906279b16b5f99c4f6b25942843a3717cdb
-sha256 gdb-7.9.1.tar.xz cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40
-sha512 gdb-7.9.1.tar.xz eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414
-md5 gdb-7.9.1.tar.gz f3b97de919a9dba84490b2e076ec4cb0
-sha1 gdb-7.9.1.tar.gz e1a0796729f3f5388a3ecbd66b6259b1c1f87fce
-sha256 gdb-7.9.1.tar.gz 4994ad986726ac4128a6f1bd8020cd672e9a92aa76b80736563ef992992764ef
-sha512 gdb-7.9.1.tar.gz 125152f1b8a9a94d96120d14df58c4d31c14495309433c1936ba92bcb88fffa74e87a810ff302a389d7033b373a43ed80a15c1cd1725f8359416ce7fec5b2cb8
diff --git a/packages/gdb/7.9.1/version.desc b/packages/gdb/7.9.1/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/gdb/7.9.1/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/gdb/8.0.1/version.desc b/packages/gdb/8.0.1/version.desc
index e69de29b..fcfe3891 100644
--- a/packages/gdb/8.0.1/version.desc
+++ b/packages/gdb/8.0.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/gdb/8.1.1/version.desc b/packages/gdb/8.1.1/version.desc
index e69de29b..fcfe3891 100644
--- a/packages/gdb/8.1.1/version.desc
+++ b/packages/gdb/8.1.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/gdb/8.2.1/version.desc b/packages/gdb/8.2.1/version.desc
index e69de29b..fcfe3891 100644
--- a/packages/gdb/8.2.1/version.desc
+++ b/packages/gdb/8.2.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
index 73e49025..7793f4aa 100644
--- a/packages/gdb/package.desc
+++ b/packages/gdb/package.desc
@@ -2,5 +2,5 @@ origin='GNU'
 repository='git git://sourceware.org/git/binutils-gdb.git'
 mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)'
 relevantpattern='*.*|[a-z.]'
-milestones='7.0 7.2 7.12 8.0 8.3 10.2'
+milestones='7.0 7.2 7.12 8.0 8.3 10.2 11.1'
 archive_formats='.tar.xz .tar.gz'
diff --git a/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch b/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch
new file mode 100644
index 00000000..446cd6ed
--- /dev/null
+++ b/packages/uClibc-ng/1.0.38/0000-include-sys-personality-h-resync-with-glibc.patch
@@ -0,0 +1,82 @@
+From 85ac4f04d94e98389a8315e720630d0f95bfdfd6 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Fri, 23 Apr 2021 22:55:17 +0200
+Subject: include/sys/personality.h: resync with glibc
+
+The trigger for this resync was ADDR_NO_RANDOMIZE, which was not
+defined in uClibc-ng, but is used for example by the uftrace project.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ include/sys/personality.h | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/include/sys/personality.h b/include/sys/personality.h
+index ee1de64..fd77bdb 100644
+--- a/include/sys/personality.h
++++ b/include/sys/personality.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2002 Free Software Foundation, Inc.
++/* Copyright (C) 2002-2021 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -13,9 +13,9 @@
+ 
+    You should have received a copy of the GNU Lesser General Public
+    License along with the GNU C Library; if not, see
+-   <http://www.gnu.org/licenses/>.  */
++   <https://www.gnu.org/licenses/>.  */
+ 
+-/* Taken verbatim from Linux 2.4 (include/linux/personality.h).  */
++/* Taken verbatim from Linux 2.6 (include/linux/personality.h).  */
+ 
+ #ifndef _SYS_PERSONALITY_H
+ #define _SYS_PERSONALITY_H 1
+@@ -26,11 +26,17 @@
+    These occupy the top three bytes.  */
+ enum
+   {
++    UNAME26 = 0x0020000,
++    ADDR_NO_RANDOMIZE = 0x0040000,
++    FDPIC_FUNCPTRS = 0x0080000,
+     MMAP_PAGE_ZERO = 0x0100000,
++    ADDR_COMPAT_LAYOUT = 0x0200000,
++    READ_IMPLIES_EXEC = 0x0400000,
+     ADDR_LIMIT_32BIT = 0x0800000,
+     SHORT_INODE = 0x1000000,
+     WHOLE_SECONDS = 0x2000000,
+     STICKY_TIMEOUTS = 0x4000000,
++    ADDR_LIMIT_3GB = 	0x8000000
+   };
+ 
+ /* Personality types.
+@@ -41,6 +47,7 @@ enum
+   {
+     PER_LINUX = 0x0000,
+     PER_LINUX_32BIT = 0x0000 | ADDR_LIMIT_32BIT,
++    PER_LINUX_FDPIC = 0x0000 | FDPIC_FUNCPTRS,
+     PER_SVR4 = 0x0001 | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
+     PER_SVR3 = 0x0002 | STICKY_TIMEOUTS | SHORT_INODE,
+     PER_SCOSVR3 = 0x0003 | STICKY_TIMEOUTS | WHOLE_SECONDS | SHORT_INODE,
+@@ -51,14 +58,15 @@ enum
+     PER_SUNOS = 0x0006 | STICKY_TIMEOUTS,
+     PER_XENIX = 0x0007 | STICKY_TIMEOUTS | SHORT_INODE,
+     PER_LINUX32 = 0x0008,
++    PER_LINUX32_3GB = 0x0008 | ADDR_LIMIT_3GB,
+     PER_IRIX32 = 0x0009 | STICKY_TIMEOUTS,	/* IRIX5 32-bit */
+     PER_IRIXN32 = 0x000a | STICKY_TIMEOUTS,	/* IRIX6 new 32-bit */
+     PER_IRIX64 = 0x000b | STICKY_TIMEOUTS,	/* IRIX6 64-bit */
+     PER_RISCOS = 0x000c,
+     PER_SOLARIS = 0x000d | STICKY_TIMEOUTS,
+     PER_UW7 = 0x000e | STICKY_TIMEOUTS | MMAP_PAGE_ZERO,
+-    PER_HPUX = 0x000f,
+-    PER_OSF4 = 0x0010,
++    PER_OSF4 = 0x000f,
++    PER_HPUX = 0x0010,
+     PER_MASK = 0x00ff,
+   };
+ 
+-- 
+cgit v0.11.2-3-g2eb4
+
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index eafe2dd7..36557870 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -9,7 +9,7 @@ do_gmp_for_host() { :; }
 do_gmp_for_target() { :; }
 
 # Overide functions depending on configuration
-if [ "${CT_GMP}" = "y" ]; then
+if [ "${CT_GMP_TARGET}" = "y" -o  "${CT_GMP}" = "y" ]; then
 
 # Download GMP
 do_gmp_get() {
@@ -61,12 +61,40 @@ do_gmp_for_host() {
     CT_EndStep
 }
 
+if [ "${CT_GMP_TARGET}" = "y" ]; then
+do_gmp_for_target() {
+    local -a gmp_opts
+
+    CT_DoStep INFO "Installing GMP for target"
+    CT_mkdir_pushd "${CT_BUILD_DIR}/build-gmp-target-${CT_HOST}"
+
+    gmp_opts+=( "host=${CT_TARGET}" )
+    case "${CT_TARGET}" in
+        *-*-mingw*)
+            prefix="/mingw"
+            ;;
+        *)
+            prefix="/usr"
+            ;;
+    esac
+    gmp_opts+=( "cflags=${CT_ALL_TARGET_CFLAGS}" )
+    gmp_opts+=( "prefix=${prefix}" )
+    gmp_opts+=( "destdir=${CT_SYSROOT_DIR}" )
+    gmp_opts+=( "shared=${CT_SHARED_LIBS}" )
+    do_gmp_backend "${gmp_opts[@]}"
+
+    CT_Popd
+    CT_EndStep
+}
+fi
+
 # Build GMP
 #     Parameter     : description               : type      : default
 #     host          : machine to run on         : tuple     : (none)
 #     prefix        : prefix to install into    : dir       : (none)
 #     cflags        : cflags to use             : string    : (empty)
 #     ldflags       : ldflags to use            : string    : (empty)
+#     destdir       : install destination       : dir       : (none)
 do_gmp_backend() {
     local host
     local prefix
@@ -127,7 +155,7 @@ do_gmp_backend() {
     fi
 
     CT_DoLog EXTRA "Installing GMP"
-    CT_DoExecLog ALL make install
+    CT_DoExecLog ALL make install DESTDIR="${destdir}"
 }
 
 fi # CT_GMP