From 08026cad603b65c271f5f15a2db98e2506b185ea Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 26 Nov 2018 13:47:11 -0800 Subject: [PATCH] gdb: Update to mainline GDB The mainline master GDB is very good now and even includes support for debugging RISC-V Linux applications. Use the master branch until the next GDB release is cut with all of this new support. Signed-off-by: Alistair Francis --- ...e-Fix-RISC-V-cross-compilation-error.patch | 34 ------------------- recipes-devtools/gdb/gdb-riscv.inc | 4 +-- recipes-devtools/gdb/gdb_riscv.bb | 2 -- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 recipes-devtools/gdb/files/0001-linux-ptrace-Fix-RISC-V-cross-compilation-error.patch diff --git a/recipes-devtools/gdb/files/0001-linux-ptrace-Fix-RISC-V-cross-compilation-error.patch b/recipes-devtools/gdb/files/0001-linux-ptrace-Fix-RISC-V-cross-compilation-error.patch deleted file mode 100644 index a177831..0000000 --- a/recipes-devtools/gdb/files/0001-linux-ptrace-Fix-RISC-V-cross-compilation-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 19422cdac7618e63e665329542e074c6f27e7ba4 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Fri, 13 Jul 2018 15:14:58 -0700 -Subject: [PATCH] linux-ptrace: Fix RISC-V cross compilation error - -To avoid this error: -./gdb/nat/linux-ptrace.h:175:21: error: expected identifier before '(' token - #define TRAP_HWBKPT (4) -when cross compiling remove the #define. - -Signed-eff-by: Alistair Francis -Upstream-status: Pending ---- - gdb/nat/linux-ptrace.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h -index 59549452c0..7f102a31ec 100644 ---- a/gdb/nat/linux-ptrace.h -+++ b/gdb/nat/linux-ptrace.h -@@ -171,10 +171,6 @@ struct buffer; - # define GDB_ARCH_IS_TRAP_HWBKPT(X) ((X) == TRAP_HWBKPT) - #endif - --#ifndef TRAP_HWBKPT --# define TRAP_HWBKPT 4 --#endif -- - extern void linux_ptrace_attach_fail_reason (pid_t pid, struct buffer *buffer); - - /* Find all possible reasons we could have failed to attach to PTID --- -2.17.1 - diff --git a/recipes-devtools/gdb/gdb-riscv.inc b/recipes-devtools/gdb/gdb-riscv.inc index 64b63f5..3c377bc 100644 --- a/recipes-devtools/gdb/gdb-riscv.inc +++ b/recipes-devtools/gdb/gdb-riscv.inc @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" -SRCREV = "695c6a152ee1deadf180c7d5a7e579bf50589b7a" -SRC_URI = "git://github.com/riscv/riscv-binutils-gdb.git;branch=riscv-gdb-8.1.1" +SRCREV = "ed2df75c51551cf9b44f7d94179849565ab5bdda" +SRC_URI = "git://sourceware.org/git/binutils-gdb.git" S = "${WORKDIR}/git" diff --git a/recipes-devtools/gdb/gdb_riscv.bb b/recipes-devtools/gdb/gdb_riscv.bb index 4ea0c1e..fcbbbe8 100644 --- a/recipes-devtools/gdb/gdb_riscv.bb +++ b/recipes-devtools/gdb/gdb_riscv.bb @@ -3,8 +3,6 @@ require gdb-${PV}.inc DEPENDS += "bison-native" -SRC_URI += "file://0001-linux-ptrace-Fix-RISC-V-cross-compilation-error.patch" - inherit python3-dir EXTRA_OEMAKE_append_libc-musl = "\