From 9dea96a7e89d17cdf0d010feca2018ee2df9373d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 15 Jul 2017 00:03:23 +0200
Subject: [PATCH] gdb: Update from 7.12.1 to 8.0

---
 packages/gdb/build.sh                       | 25 +++++++++------------
 packages/gdb/gdb-arm-linux-nac.c.patch      | 14 ------------
 packages/gdb/gdb_proc_service_lpwid_t.patch | 12 ----------
 packages/gdb/linux_nat.patch                | 14 ------------
 4 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 packages/gdb/gdb-arm-linux-nac.c.patch
 delete mode 100644 packages/gdb/gdb_proc_service_lpwid_t.patch
 delete mode 100644 packages/gdb/linux_nat.patch

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index d6ceb362b..12155c894 100755
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -1,20 +1,22 @@
 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.12.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=8.0
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186
+TERMUX_PKG_SHA256=f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee
 # 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"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--with-system-readline
+--with-curses
+--enable-static
+ac_cv_func_getpwent=no
+ac_cv_func_getpwnam=no
+"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gdb/python share/gdb/syscalls share/gdb/system-gdbinit"
 TERMUX_PKG_MAKE_INSTALL_TARGET="-C gdb install"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
 termux_step_pre_configure() {
-	# For frexp(3) usage:
-	LDFLAGS+=" -lm"
-
 	# Fix "undefined reference to 'rpl_gettimeofday'" when building:
 	export gl_cv_func_gettimeofday_clobber=no
 	export gl_cv_func_gettimeofday_posix_signature=yes
@@ -22,12 +24,5 @@ termux_step_pre_configure() {
 	export gl_cv_func_lstat_dereferences_slashed_symlink=yes
 	export gl_cv_func_memchr_works=yes
 	export gl_cv_func_stat_file_slash=yes
-}
-
-termux_step_post_extract_package () {
-	if [ $TERMUX_ARCH = aarch64 ]; then
-		# Fix problem with <stdlib.h> including <memory.h>:
-		mv sim/aarch64/{memory.h,memory_sim.h}
-		perl -p -i -e 's/memory.h/memory_sim.h/' $TERMUX_PKG_SRCDIR/sim/aarch64/*c
-	fi
+	export gl_cv_func_frexp_no_libm=no
 }
diff --git a/packages/gdb/gdb-arm-linux-nac.c.patch b/packages/gdb/gdb-arm-linux-nac.c.patch
deleted file mode 100644
index 4f5838da2..000000000
--- a/packages/gdb/gdb-arm-linux-nac.c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-@@ -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
diff --git a/packages/gdb/gdb_proc_service_lpwid_t.patch b/packages/gdb/gdb_proc_service_lpwid_t.patch
deleted file mode 100644
index bec9ee096..000000000
--- a/packages/gdb/gdb_proc_service_lpwid_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../gdb-7.6.2/gdb/gdb_proc_service.h ./gdb/gdb_proc_service.h
---- ../gdb-7.6.2/gdb/gdb_proc_service.h	2013-12-08 05:11:51.000000000 +0100
-+++ ./gdb/gdb_proc_service.h	2014-01-07 16:43:01.862311352 +0100
-@@ -68,7 +68,7 @@
- } ps_err_e;
- 
- #ifndef HAVE_LWPID_T
--typedef unsigned int lwpid_t;
-+#include <thread_db.h>
- #endif
- 
- #ifndef HAVE_PSADDR_T
diff --git a/packages/gdb/linux_nat.patch b/packages/gdb/linux_nat.patch
deleted file mode 100644
index 276eef9be..000000000
--- a/packages/gdb/linux_nat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r ../gdb-7.7/gdb/linux-nat.c ./gdb/linux-nat.c
---- ../gdb-7.7/gdb/linux-nat.c	2014-02-06 03:21:29.000000000 +0100
-+++ ./gdb/linux-nat.c	2014-02-12 01:55:15.000000000 +0100
-@@ -68,6 +67,10 @@
- #include "target-descriptions.h"
- #include "filestuff.h"
- 
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
- #ifndef SPUFS_MAGIC
- #define SPUFS_MAGIC 0x23c9b64e
- #endif