From 6c4495b080026e0649048ed4dfe83a0f3a15457a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Sun, 12 Jun 2016 00:53:18 +0200
Subject: gdb: update to 7.11.1

---
 package/gdbserver/patches/7.11.1/nommu.patch | 13 +++++++++++++
 package/gdbserver/patches/7.11/nommu.patch   | 13 -------------
 target/config/Config.in.gdb                  |  6 +++---
 toolchain/gdb/Makefile.inc                   |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 package/gdbserver/patches/7.11.1/nommu.patch
 delete mode 100644 package/gdbserver/patches/7.11/nommu.patch

diff --git a/package/gdbserver/patches/7.11.1/nommu.patch b/package/gdbserver/patches/7.11.1/nommu.patch
new file mode 100644
index 000000000..9db54501f
--- /dev/null
+++ b/package/gdbserver/patches/7.11.1/nommu.patch
@@ -0,0 +1,13 @@
+diff -Nur gdb-7.11.orig/gdb/nat/linux-ptrace.h gdb-7.11/gdb/nat/linux-ptrace.h
+--- gdb-7.11.orig/gdb/nat/linux-ptrace.h	2016-02-10 04:19:39.000000000 +0100
++++ gdb-7.11/gdb/nat/linux-ptrace.h	2016-05-06 20:50:21.991346793 +0200
+@@ -23,7 +23,8 @@
+ #include "nat/gdb_ptrace.h"
+ 
+ #ifdef __UCLIBC__
+-#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
++#include <sched.h>
++#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
+ /* PTRACE_TEXT_ADDR and friends.  */
+ #include <asm/ptrace.h>
+ #define HAS_NOMMU
diff --git a/package/gdbserver/patches/7.11/nommu.patch b/package/gdbserver/patches/7.11/nommu.patch
deleted file mode 100644
index 9db54501f..000000000
--- a/package/gdbserver/patches/7.11/nommu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur gdb-7.11.orig/gdb/nat/linux-ptrace.h gdb-7.11/gdb/nat/linux-ptrace.h
---- gdb-7.11.orig/gdb/nat/linux-ptrace.h	2016-02-10 04:19:39.000000000 +0100
-+++ gdb-7.11/gdb/nat/linux-ptrace.h	2016-05-06 20:50:21.991346793 +0200
-@@ -23,7 +23,8 @@
- #include "nat/gdb_ptrace.h"
- 
- #ifdef __UCLIBC__
--#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
-+#include <sched.h>
-+#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
- /* PTRACE_TEXT_ADDR and friends.  */
- #include <asm/ptrace.h>
- #define HAS_NOMMU
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index 3c962d671..a9d279044 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -4,7 +4,7 @@
 choice
 prompt "GNU debugger version"
 default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300
-default ADK_TOOLCHAIN_GDB_7_11
+default ADK_TOOLCHAIN_GDB_7_11_1
 
 config ADK_TOOLCHAIN_GDB_GIT
 	bool "git"
@@ -15,8 +15,8 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT
 	bool "h8300-git"
 	depends on ADK_TARGET_ARCH_H8300
 
-config ADK_TOOLCHAIN_GDB_7_11
-	bool "7.11"
+config ADK_TOOLCHAIN_GDB_7_11_1
+	bool "7.11.1"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 
diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc
index f576fdd29..56083767c 100644
--- a/toolchain/gdb/Makefile.inc
+++ b/toolchain/gdb/Makefile.inc
@@ -2,10 +2,10 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gdb
-ifeq ($(ADK_TOOLCHAIN_GDB_7_11),y)
-PKG_VERSION:=		7.11
+ifeq ($(ADK_TOOLCHAIN_GDB_7_11_1),y)
+PKG_VERSION:=		7.11.1
 PKG_RELEASE:=		1
-PKG_HASH:=		7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1
+PKG_HASH:=		e9216da4e3755e9f414c1aa0026b626251dfc57ffe572a266e98da4f6988fc70
 PKG_SITES:=		${MASTER_SITE_GNU:=gdb/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
-- 
cgit v1.2.3