11 files changed, 16 insertions, 154 deletions
diff --git a/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch b/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch
deleted file mode 100644
index d608922..0000000
--- a/packages/gdb/11.1/0000-xtensa-make-sure-ar_base-is-initialized.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 208ea73d38c9c16cf983b6419f58050dbadcb6a9 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 22:43:49 +0300
-Subject: [PATCH 2/2] xtensa: make sure ar_base is initialized
-
-ar_base is uninitialized for cores w/o windowed registers as their
-regmap doesn't have register 0x0100.
-Check that ar_base is initialized and if not initialize it with a0_base.
-
-gdb/
-	* xtensa-tdep.c (xtensa_derive_tdep): Make sure ar_base is
-	initialized.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -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;
-+
-   /* Number of pseudo registers.  */
-   tdep->num_pseudo_regs = n - tdep->num_regs;
- 
diff --git a/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch b/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch
deleted file mode 100644
index 5eec5d6..0000000
--- a/packages/gdb/11.1/0001-WIP-end-of-prologue-detection-hack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7f8eacbb468575fb67db7fd1155a3aedaa91911b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 23:15:39 +0300
-Subject: [PATCH] WIP: *end of prologue* detection hack
-
-see
-  http://www.esp8266.com/viewtopic.php?p=18461#p18461
-  http://www.esp8266.com/viewtopic.php?p=19026#p19026
-  http://www.esp8266.com/viewtopic.php?p=19683#p19683
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -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.  */
--    body_pc = prologue_sal.end;
-+    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 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
deleted file mode 100644
index d6c5869..0000000
--- a/packages/gdb/11.1/0002-allow-android.patch
+++ /dev/null
@@ -1,45 +0,0 @@
----
- 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
deleted file mode 100644
index 7ccfa68..0000000
--- a/packages/gdb/11.1/0003-xtensa-Fix-compilation-of-gdbserver.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index f81f46d..0000000
--- a/packages/gdb/11.1/chksum
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index e69de29..0000000
--- a/packages/gdb/11.1/version.desc
+++ /dev/null
diff --git a/packages/gdb/11.2/0002-allow-android.patch b/packages/gdb/11.2/0002-allow-android.patch
index d6c5869..3365d87 100644
--- a/packages/gdb/11.2/0002-allow-android.patch
+++ b/packages/gdb/11.2/0002-allow-android.patch
@@ -5,7 +5,7 @@
 
 --- a/gdbserver/configure
 +++ b/gdbserver/configure
-@@ -10028,17 +10028,6 @@
+@@ -10052,17 +10052,6 @@
  
  
  case "${target}" in
diff --git a/packages/gdb/11.2/chksum b/packages/gdb/11.2/chksum
index ec620f8..8dda654 100644
--- a/packages/gdb/11.2/chksum
+++ b/packages/gdb/11.2/chksum
@@ -1,8 +1,8 @@
-md5 gdb-11.2.tar.gz b5674bef1fbd6beead889f80afa6f269
-sha1 gdb-11.2.tar.gz 4b80f1006730e45930956aca7e85c41c8ad09922
-sha256 gdb-11.2.tar.gz b558b66084835e43b6361f60d60d314c487447419cdf53adf83a87020c367290
-sha512 gdb-11.2.tar.gz e1fdcc8207fb479ff761bfb75fbb380757495e8e74b51b593acf425ffad80ee205692775111bdc9ba8f50a38e53deb156bb0d377078607c3d15afa46e8c30913
 md5 gdb-11.2.tar.xz 433bd0904caa31c247b1b1867f2f911d
 sha1 gdb-11.2.tar.xz 7c72b1d4a38bb6e155aaad29f4c1abf818b4595d
 sha256 gdb-11.2.tar.xz 1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32
 sha512 gdb-11.2.tar.xz 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127
+md5 gdb-11.2.tar.gz b5674bef1fbd6beead889f80afa6f269
+sha1 gdb-11.2.tar.gz 4b80f1006730e45930956aca7e85c41c8ad09922
+sha256 gdb-11.2.tar.gz b558b66084835e43b6361f60d60d314c487447419cdf53adf83a87020c367290
+sha512 gdb-11.2.tar.gz e1fdcc8207fb479ff761bfb75fbb380757495e8e74b51b593acf425ffad80ee205692775111bdc9ba8f50a38e53deb156bb0d377078607c3d15afa46e8c30913
diff --git a/packages/gdb/7.12.1/0006-duplicate-typedef.patch b/packages/gdb/7.12.1/0006-duplicate-typedef.patch
index cbbc3e2..4d51a48 100644
--- a/packages/gdb/7.12.1/0006-duplicate-typedef.patch
+++ b/packages/gdb/7.12.1/0006-duplicate-typedef.patch
@@ -1,6 +1,9 @@
-diff -urpN gdb-7.12.1.orig/gdb/event-loop.h gdb-7.12.1/gdb/event-loop.h
---- gdb-7.12.1.orig/gdb/event-loop.h	2017-01-21 05:46:46.000000000 -0800
-+++ gdb-7.12.1/gdb/event-loop.h	2019-03-14 11:55:56.280325742 -0700
+---
+ gdb/event-loop.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/gdb/event-loop.h
++++ b/gdb/event-loop.h
 @@ -66,6 +66,8 @@
     infinite loop.
  
@@ -10,7 +13,7 @@ diff -urpN gdb-7.12.1.orig/gdb/event-loop.h gdb-7.12.1/gdb/event-loop.h
  
  typedef void *gdb_client_data;
  struct async_signal_handler;
-@@ -127,3 +129,5 @@ extern void mark_async_event_handler (st
+@@ -127,3 +129,5 @@
  extern void clear_async_event_handler (struct async_event_handler *handler);
  
  extern void initialize_async_signal_handlers (void);
diff --git a/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch b/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch
index 9456dbb..a45a8c1 100644
--- a/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch
+++ b/packages/gdb/8.2.1/0005-musl-aarch64-sigcontext.patch
@@ -1,15 +1,13 @@
 ---
- gdb/nat/aarch64-sve-linux-ptrace.h | 2 +-
+ gdb/nat/aarch64-sve-linux-ptrace.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h
-index 029e753ffe..172ae39432 100644
 --- a/gdb/nat/aarch64-sve-linux-ptrace.h
 +++ b/gdb/nat/aarch64-sve-linux-ptrace.h
 @@ -20,7 +20,7 @@
  #ifndef AARCH64_SVE_LINUX_PTRACE_H
  #define AARCH64_SVE_LINUX_PTRACE_H
-
+ 
 -#include <asm/sigcontext.h>
 +#include <signal.h>
  #include <sys/utsname.h>
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
index 06efd37..bdd806a 100644
--- a/packages/gdb/package.desc
+++ b/packages/gdb/package.desc
@@ -1,6 +1,6 @@
 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.11 7.12 8.0 8.3 10.2 11.1'
+relevantpattern='[78].*|. *|.'
+milestones='7.11 7.12 8.0 8.3 10 11'
 archive_formats='.tar.xz .tar.gz'