gdb: Update from 7.9.1 to 7.10

This commit is contained in:
Fredrik Fornwall 2015-08-29 09:41:55 -04:00
parent 19c5064ef9
commit c355e2f29e
3 changed files with 23 additions and 52 deletions

View File

@ -1,50 +0,0 @@
diff -u -r ../gdb-7.7/gdb/arm-linux-nat.c ./gdb/arm-linux-nat.c
--- ../gdb-7.7/gdb/arm-linux-nat.c 2014-01-08 10:23:36.000000000 +0100
+++ ./gdb/arm-linux-nat.c 2014-02-12 01:16:47.000000000 +0100
@@ -32,10 +32,8 @@
#include "arm-linux-tdep.h"
#include <elf/common.h>
-#include <sys/user.h>
#include <sys/ptrace.h>
#include <sys/utsname.h>
-#include <sys/procfs.h>
/* Prototypes for supply_gregset etc. */
#include "gregset.h"
@@ -101,7 +99,7 @@
tid = GET_THREAD_ID (inferior_ptid);
/* Read the floating point state. */
- ret = ptrace (PT_GETFPREGS, tid, 0, fp);
+ ret = ptrace (PTRACE_GETFPREGS, tid, 0, fp);
if (ret < 0)
{
warning (_("Unable to fetch floating point register."));
@@ -131,7 +129,7 @@
tid = GET_THREAD_ID (inferior_ptid);
/* Read the floating point state. */
- ret = ptrace (PT_GETFPREGS, tid, 0, fp);
+ ret = ptrace (PTRACE_GETFPREGS, tid, 0, fp);
if (ret < 0)
{
warning (_("Unable to fetch the floating point registers."));
@@ -160,7 +158,7 @@
tid = GET_THREAD_ID (inferior_ptid);
/* Read the floating point state. */
- ret = ptrace (PT_GETFPREGS, tid, 0, fp);
+ ret = ptrace (PTRACE_GETFPREGS, tid, 0, fp);
if (ret < 0)
{
warning (_("Unable to fetch the floating point registers."));
@@ -197,7 +195,7 @@
tid = GET_THREAD_ID (inferior_ptid);
/* Read the floating point state. */
- ret = ptrace (PT_GETFPREGS, tid, 0, fp);
+ ret = ptrace (PTRACE_GETFPREGS, tid, 0, fp);
if (ret < 0)
{
warning (_("Unable to fetch the floating point registers."));

View File

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
TERMUX_PKG_DEPENDS="liblzma, libexpat, readline"
TERMUX_PKG_VERSION=7.9.1
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_VERSION=7.10
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
# gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-readline --with-curses --enable-static ac_cv_func_getpwent=no ac_cv_func_getpwnam=no"

View File

@ -0,0 +1,22 @@
diff -u -r ../gdb-7.10/gdb/arm-linux-nat.c ./gdb/arm-linux-nat.c
--- ../gdb-7.10/gdb/arm-linux-nat.c 2015-08-28 17:22:07.000000000 -0400
+++ ./gdb/arm-linux-nat.c 2015-08-29 08:06:52.000680658 -0400
@@ -34,7 +34,6 @@
#include <sys/user.h>
#include <sys/ptrace.h>
#include <sys/utsname.h>
-#include <sys/procfs.h>
#include "nat/linux-ptrace.h"
@@ -63,6 +62,10 @@
#define PTRACE_SETHBPREGS 30
#endif
+#ifdef __ANDROID__
+#define PT_GETFPREGS PTRACE_GETFPREGS
+#endif
+
extern int arm_apcs_32;
/* On GNU/Linux, threads are implemented as pseudo-processes, in which