9 files changed, 5 insertions, 54 deletions

diff --git a/meta/recipes-devtools/gdb/gdb-7.9.inc b/meta/recipes-devtools/gdb/gdb-7.9.1.inc
index 6d5eecb775..1ca95afdcc 100644
--- a/meta/recipes-devtools/gdb/gdb-7.9.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.9.1.inc
@@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
                     file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
 
-SRC_URI[md5sum] = "8f8ced422fe462a00e0135a643544f17"
-SRC_URI[sha256sum] = "d282508cb7df0cb8b2cf659032ce1bede7b5725796e3ac90f3cd9d65844a65f2"
+SRC_URI[md5sum] = "f3b97de919a9dba84490b2e076ec4cb0"
+SRC_URI[sha256sum] = "4994ad986726ac4128a6f1bd8020cd672e9a92aa76b80736563ef992992764ef"
 
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb
index 301035940c..301035940c 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.9.bb b/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb
index 3a95cfb035..3a95cfb035 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.9.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index e65af4bf8b..5466a7dff8 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -4,7 +4,6 @@ inherit gettext
 
 SRC_URI += "file://0002-Change-order-of-CFLAGS.patch \
             file://0003-Add-support-for-Renesas-SH-sh4-architecture.patch \
-            file://0004-Change-comment-in-gdb-compile.patch \
            "
 #LDFLAGS_append = " -s"
 #export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
index e0221afca1..6996c183bb 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
+++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch
@@ -1,4 +1,4 @@
-From d3ec939b82be23e7c9534cdc7502645f6c5856d1 Mon Sep 17 00:00:00 2001
+From 12b0506951460c3cc37d775478d024db3f95e9d8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 2 Mar 2015 02:27:55 +0000
 Subject: [PATCH 1/3] make man install relative to DESTDIR
diff --git a/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
index 26a34d3444..bccb45fda1 100644
--- a/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
+++ b/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
@@ -1,4 +1,4 @@
-From 0dcb0a8b139b44ae84e8fd8ff8130cbbb52e444d Mon Sep 17 00:00:00 2001
+From 262ccc4fdb2a3df0f16c61a807046964ae7729c9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 2 Mar 2015 02:29:23 +0000
 Subject: [PATCH 2/3] Change order of CFLAGS
diff --git a/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
index d82d269208..4a3e22c445 100644
--- a/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
+++ b/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
@@ -1,4 +1,4 @@
-From 4e5507488068b3ea2ebf9c84c6c192c7bfd3be82 Mon Sep 17 00:00:00 2001
+From 407cb13cfb70697f45dfb761304e005e1ecbd0e9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 2 Mar 2015 02:31:12 +0000
 Subject: [PATCH 3/3] Add support for Renesas SH (sh4) architecture.
diff --git a/meta/recipes-devtools/gdb/gdb/0004-Change-comment-in-gdb-compile.patch b/meta/recipes-devtools/gdb/gdb/0004-Change-comment-in-gdb-compile.patch
deleted file mode 100644
index 4df552c019..0000000000
--- a/meta/recipes-devtools/gdb/gdb/0004-Change-comment-in-gdb-compile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Backport
-
-From 09de64b93c2402e068daf0bce1c4a1dda833b646 Mon Sep 17 00:00:00 2001
-From: Jan Kratochvil <jan.kratochvil@redhat.com>
-Date: Thu, 26 Feb 2015 11:52:28 +0100
-Subject: [PATCH] Change // comment in gdb/compile/
-
-gdb/ChangeLog
-2015-02-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-        PR build/18033
-        * compile/compile-c-support.c (c_compute_program): Change // comment.
-        * compile/compile-object-load.c (setup_sections): Change // comment.
----
- gdb/ChangeLog                     | 6 ++++++
- gdb/compile/compile-c-support.c   | 2 +-
- gdb/compile/compile-object-load.c | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c
-index 8f1f45d..1711cda 100644
---- a/gdb/compile/compile-c-support.c
-+++ b/gdb/compile/compile-c-support.c
-@@ -351,7 +351,7 @@ c_compute_program (struct compile_instance *inst,
-                        " __gdb_intptr;\n",
-                        buf);
- 
--      // Iterate all log2 sizes in bytes supported by c_get_mode_for_size.
-+      /* Iterate all log2 sizes in bytes supported by c_get_mode_for_size.  */
-       for (i = 0; i < 4; ++i)
-        {
-          const char *mode = c_get_mode_for_size (1 << i);
-diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
-index 5903f18..e187970 100644
---- a/gdb/compile/compile-object-load.c
-+++ b/gdb/compile/compile-object-load.c
-@@ -67,7 +67,7 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp)
-       if ((bfd_get_section_flags (abfd, sect) & SEC_ALLOC) == 0)
-        return;
- 
--      // Make the memory always readable.
-+      /* Make the memory always readable.  */
-       prot = GDB_MMAP_PROT_READ;
-       if ((bfd_get_section_flags (abfd, sect) & SEC_READONLY) == 0)
-        prot |= GDB_MMAP_PROT_WRITE;
--- 
-2.1.4
-
diff --git a/meta/recipes-devtools/gdb/gdb_7.9.bb b/meta/recipes-devtools/gdb/gdb_7.9.1.bb
index 1abc9d8e76..1abc9d8e76 100644
--- a/meta/recipes-devtools/gdb/gdb_7.9.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.9.1.bb