From bf80fd6d0cab4d9f4babb99f92eee47b19dcbd42 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 5 Sep 2014 07:44:59 +0200 Subject: separate gdb/gdbserver package builds try to get coldfire gdbserver to compile, but still not working. An older version works, seems that newer versions are not tested for uClinux case. --- package/gdbserver/Makefile | 7 +++---- .../patches/patch-gdb_common_linux-ptrace_c | 10 ++++++++++ .../patches/patch-gdb_gdbserver_linux-low_c | 22 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 package/gdbserver/patches/patch-gdb_common_linux-ptrace_c create mode 100644 package/gdbserver/patches/patch-gdb_gdbserver_linux-low_c (limited to 'package/gdbserver') diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 353148913..096092ab9 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -4,14 +4,13 @@ include ${ADK_TOPDIR}/rules.mk include ${ADK_TOPDIR}/toolchain/gdb/Makefile.inc -PKG_NAME:= gdb +PKG_NAME:= gdbserver PKG_DESCR:= remote programm debugger utility PKG_SECTION:= app/debug -PKG_DEPENDS:= libthread-db - PKG_LIBC_DEPENDS:= !musl -PKG_SUBPKGS:= GDBSERVER +DISTFILES:= gdb-${PKG_VERSION}.tar.xz +WRKDIST= ${WRKDIR}/gdb-${PKG_VERSION} WRKSRC= ${WRKDIST}/gdb/gdbserver include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/gdbserver/patches/patch-gdb_common_linux-ptrace_c b/package/gdbserver/patches/patch-gdb_common_linux-ptrace_c new file mode 100644 index 000000000..aec39df40 --- /dev/null +++ b/package/gdbserver/patches/patch-gdb_common_linux-ptrace_c @@ -0,0 +1,10 @@ +--- gdb-7.8.orig/gdb/common/linux-ptrace.c 2014-07-29 14:37:42.000000000 +0200 ++++ gdb-7.8/gdb/common/linux-ptrace.c 2014-09-05 00:52:41.353409084 +0200 +@@ -23,6 +23,7 @@ + #include + #endif + ++#include + #include "linux-ptrace.h" + #include "linux-procfs.h" + #include "nat/linux-waitpid.h" diff --git a/package/gdbserver/patches/patch-gdb_gdbserver_linux-low_c b/package/gdbserver/patches/patch-gdb_gdbserver_linux-low_c new file mode 100644 index 000000000..ccb61c3a0 --- /dev/null +++ b/package/gdbserver/patches/patch-gdb_gdbserver_linux-low_c @@ -0,0 +1,22 @@ +--- gdb-7.8.orig/gdb/gdbserver/linux-low.c 2014-07-29 14:37:42.000000000 +0200 ++++ gdb-7.8/gdb/gdbserver/linux-low.c 2014-09-05 00:47:25.427321525 +0200 +@@ -4933,15 +4933,15 @@ static int + linux_read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) + { + unsigned long text, text_end, data; +- int pid = lwpid_of (get_thread_lwp (current_inferior)); ++ int pid = lwpid_of (current_inferior); + + errno = 0; + +- text = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) PT_TEXT_ADDR, ++ text = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) (PT_TEXT_ADDR), + (PTRACE_TYPE_ARG4) 0); +- text_end = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) PT_TEXT_END_ADDR, ++ text_end = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) (PT_TEXT_END_ADDR), + (PTRACE_TYPE_ARG4) 0); +- data = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) PT_DATA_ADDR, ++ data = ptrace (PTRACE_PEEKUSER, pid, (PTRACE_TYPE_ARG3) (PT_DATA_ADDR), + (PTRACE_TYPE_ARG4) 0); + + if (errno == 0) -- cgit v1.2.3