From b2f50de3b766c34ac166688e2586f9a2e974dbce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20M=C3=BCllner?= Date: Thu, 29 Sep 2022 08:23:41 +0200 Subject: [PATCH] gdb: Bump GDB version to 12.1 (#1132) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GDB still defaults to 10.1 from the (already archived) riscv-binutils-gdb repo. Let's bump the version to 12.1 and use the upstream git repo instead. Signed-off-by: Christoph Müllner Signed-off-by: Christoph Müllner --- .gitmodules | 8 ++++---- configure | 2 +- configure.ac | 2 +- gdb | 1 + riscv-gdb | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 gdb delete mode 160000 riscv-gdb diff --git a/.gitmodules b/.gitmodules index 6594e486..75ebce25 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,10 +17,10 @@ path = newlib url = https://sourceware.org/git/newlib-cygwin.git branch = master -[submodule "riscv-gdb"] - path = riscv-gdb - url = https://github.com/riscv-collab/riscv-binutils-gdb.git - branch = fsf-gdb-10.1-with-sim +[submodule "gdb"] + path = gdb + url = https://sourceware.org/git/binutils-gdb.git + branch = gdb-12-branch [submodule "qemu"] path = qemu url = https://gitlab.com/qemu-project/qemu.git diff --git a/configure b/configure index e148a8fd..6b73555c 100755 --- a/configure +++ b/configure @@ -3667,7 +3667,7 @@ fi with_gdb_src=$with_gdb_src else - with_gdb_src="\$(srcdir)/riscv-gdb" + with_gdb_src="\$(srcdir)/gdb" fi diff --git a/configure.ac b/configure.ac index f2464d1b..16178c72 100644 --- a/configure.ac +++ b/configure.ac @@ -240,7 +240,7 @@ AX_ARG_WITH_SRC(binutils, binutils) AX_ARG_WITH_SRC(newlib, newlib) AX_ARG_WITH_SRC(glibc, glibc) AX_ARG_WITH_SRC(musl, musl) -AX_ARG_WITH_SRC(gdb, riscv-gdb) +AX_ARG_WITH_SRC(gdb, gdb) AX_ARG_WITH_SRC(qemu, qemu) AX_ARG_WITH_SRC(spike, spike) AX_ARG_WITH_SRC(pk, pk) diff --git a/gdb b/gdb new file mode 160000 index 00000000..e53a8e86 --- /dev/null +++ b/gdb @@ -0,0 +1 @@ +Subproject commit e53a8e8685685c97588f8319d993ea6cd5635e47 diff --git a/riscv-gdb b/riscv-gdb deleted file mode 160000 index 5da071ef..00000000 --- a/riscv-gdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5da071ef0965b8054310d8dde9975037b0467311