From cf447af6ea33f009bdd1b74725f2faed6257d3dc Mon Sep 17 00:00:00 2001
From: Chris Johns <chris@contemporary.net.au>
Date: Tue, 4 Apr 2023 15:17:14 +1000
Subject: [PATCH] rtems/mipsstx39: Update to GDB 13.1 and stage build GMP

- Use a build set file to stage GMP as recent GDB
  versions require GMP.

Update #4892
---
 rtems/config/6/rtems-mips.bset                    |  2 +-
 rtems/config/tools/rtems-mipstx39-gdb-11.2.cfg    |  3 ---
 rtems/config/tools/rtems-mipstx39-gdb-7.5.1-1.cfg | 11 -----------
 rtems/config/tools/rtems-mipstx39-gdb-7.6-1.cfg   | 11 -----------
 rtems/config/tools/rtems-mipstx39-gdb-7.7-1.cfg   | 11 -----------
 rtems/config/tools/rtems-mipstx39-gdb-7.9-1.cfg   | 11 -----------
 rtems/config/tools/rtems-mipstx39-gdb-8.0.1-1.cfg |  3 ---
 rtems/config/tools/rtems-mipstx39-gdb-head.cfg    |  3 ---
 rtems/config/tools/rtems-mipstx39-gdb.bset        |  7 +++++++
 9 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-11.2.cfg
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-7.5.1-1.cfg
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-7.6-1.cfg
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-7.7-1.cfg
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-7.9-1.cfg
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-8.0.1-1.cfg
 delete mode 100644 rtems/config/tools/rtems-mipstx39-gdb-head.cfg
 create mode 100644 rtems/config/tools/rtems-mipstx39-gdb.bset

diff --git a/rtems/config/6/rtems-mips.bset b/rtems/config/6/rtems-mips.bset
index 370e5ea..6289172 100644
--- a/rtems/config/6/rtems-mips.bset
+++ b/rtems/config/6/rtems-mips.bset
@@ -3,4 +3,4 @@
 %define gdb-sim-options --enable-sim-hardware
 %define win32-gdb-disable-sim
 %include 6/rtems-default.bset
-tools/rtems-mipstx39-gdb-head
+tools/rtems-mipstx39-gdb
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-11.2.cfg b/rtems/config/tools/rtems-mipstx39-gdb-11.2.cfg
deleted file mode 100644
index 7707519..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-11.2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-%include tools/rtems-gdb-11.2.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-7.5.1-1.cfg b/rtems/config/tools/rtems-mipstx39-gdb-7.5.1-1.cfg
deleted file mode 100644
index 3c0bed5..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-7.5.1-1.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# MIPS STX39 GDB 7.5.1.
-#
-
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-
-#
-# The gdb build instructions for RTEMS 7.5.1.
-#
-%include tools/rtems-gdb-7.5.1-1.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-7.6-1.cfg b/rtems/config/tools/rtems-mipstx39-gdb-7.6-1.cfg
deleted file mode 100644
index 836c0bb..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-7.6-1.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# MIPS STX39 GDB 7.6.
-#
-
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-
-#
-# The gdb build instructions for RTEMS 7.6.
-#
-%include tools/rtems-gdb-7.6-1.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-7.7-1.cfg b/rtems/config/tools/rtems-mipstx39-gdb-7.7-1.cfg
deleted file mode 100644
index 0e65b5e..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-7.7-1.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# MIPS STX39 GDB 7.7.
-#
-
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-
-#
-# The gdb build instructions for RTEMS 7.7.
-#
-%include tools/rtems-gdb-7.7-1.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-7.9-1.cfg b/rtems/config/tools/rtems-mipstx39-gdb-7.9-1.cfg
deleted file mode 100644
index 5777b5f..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-7.9-1.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# MIPS TX39 GDB 7.9.
-#
-
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-
-#
-# The gdb 7.9 build instructions for RTEMS.
-#
-%include tools/rtems-gdb-7.9-1.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-8.0.1-1.cfg b/rtems/config/tools/rtems-mipstx39-gdb-8.0.1-1.cfg
deleted file mode 100644
index 05b270b..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-8.0.1-1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-%include tools/rtems-gdb-8.0.1-1.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb-head.cfg b/rtems/config/tools/rtems-mipstx39-gdb-head.cfg
deleted file mode 100644
index d90ea33..0000000
--- a/rtems/config/tools/rtems-mipstx39-gdb-head.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-%undefine _target
-%define _target mipstx39-rtems%{rtems_version}
-%include tools/rtems-gdb-head.cfg
diff --git a/rtems/config/tools/rtems-mipstx39-gdb.bset b/rtems/config/tools/rtems-mipstx39-gdb.bset
new file mode 100644
index 0000000..392e24d
--- /dev/null
+++ b/rtems/config/tools/rtems-mipstx39-gdb.bset
@@ -0,0 +1,7 @@
+%define release 1
+%define rtems_arch mips
+%define gdb-sim-options --enable-sim-hardware
+%define win32-gdb-disable-sim
+%define _target mipstx39-rtems%{rtems_version}
+devel/gmp-6.2.1
+tools/rtems-gdb-13.1