From c355e2f29e25b266e6ea471d6b0fb45468065b24 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 29 Aug 2015 09:41:55 -0400
Subject: [PATCH] gdb: Update from 7.9.1 to 7.10

---
 packages/gdb/arm_linux_nat.patch       | 50 --------------------------
 packages/gdb/build.sh                  |  3 +-
 packages/gdb/gdb-arm-linux-nac.c.patch | 22 ++++++++++++
 3 files changed, 23 insertions(+), 52 deletions(-)
 delete mode 100644 packages/gdb/arm_linux_nat.patch
 create mode 100644 packages/gdb/gdb-arm-linux-nac.c.patch

diff --git a/packages/gdb/arm_linux_nat.patch b/packages/gdb/arm_linux_nat.patch
deleted file mode 100644
index 58029e04b..000000000
--- a/packages/gdb/arm_linux_nat.patch
+++ /dev/null
@@ -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."));
diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 915fdb915..8c02062f1 100755
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -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"
diff --git a/packages/gdb/gdb-arm-linux-nac.c.patch b/packages/gdb/gdb-arm-linux-nac.c.patch
new file mode 100644
index 000000000..9fd6c5c4a
--- /dev/null
+++ b/packages/gdb/gdb-arm-linux-nac.c.patch
@@ -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