From 4c0d78bb64797bee5414bbc92b35dbbb3e57b34f Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 4 Feb 2022 11:35:52 -0800
Subject: gdb: use single-number versions/milestones for 9+

Starting with GDB9, the release number is only two numbers (with the
last being patchlevel). Therefore, keep two numbers for releases 8 and
below, but just a single number for 9 and up.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index b0b9d29..741eeae 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -26,7 +26,7 @@ config GDB_DEP_CXX11
 config GDB_DEP_NO_STD_FUTURE
     def_bool y
     depends on !GCC_9_or_later
-    select GDB_REQUIRE_older_than_10_2
+    select GDB_REQUIRE_older_than_10
 
 # Does GDB need ps_get_thread_area with const qualifier?
 config GDB_CONST_GET_THREAD_AREA
@@ -37,4 +37,4 @@ config GDB_CONST_GET_THREAD_AREA
 # tarball (instead of a subdirectory of gdb)
 config GDB_GDBSERVER_TOPLEVEL
     def_bool y
-    depends on GDB_10_2_or_later
+    depends on GDB_10_or_later
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index b4721c8..fc79084 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -10,7 +10,7 @@ config GDB_NATIVE
     select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later
     select EXPAT_TARGET
     select NCURSES_TARGET
-    select GMP_TARGET if GDB_11_1_or_later
+    select GMP_TARGET if GDB_11_or_later
     help
       Build and install a native gdb for the target, to run on the target.
 
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'
-- 
cgit v0.10.2-6-g49f6