From d0a53781b97599c0fadd106472a83ba88bc2e1b8 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Fri, 10 Mar 2017 12:24:35 +0100
Subject: [PATCH] gdb: fix compile error with GCC 6

Fixes #2387
---
 repos/ports/ports/gdb.hash                    |  2 +-
 .../ports/src/noux-pkg/gdb/patches/gcc6.patch | 29 +++++++++++++++++++
 repos/ports/src/noux-pkg/gdb/patches/series   |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 repos/ports/src/noux-pkg/gdb/patches/gcc6.patch

diff --git a/repos/ports/ports/gdb.hash b/repos/ports/ports/gdb.hash
index 92353bb984..7a6941c042 100644
--- a/repos/ports/ports/gdb.hash
+++ b/repos/ports/ports/gdb.hash
@@ -1 +1 @@
-b3ce3adb094fd871ca90e7d6b51912bd8140d8d0
+79ebd0bd926cc0da0dee5cc0e9485a723d793e9d
diff --git a/repos/ports/src/noux-pkg/gdb/patches/gcc6.patch b/repos/ports/src/noux-pkg/gdb/patches/gcc6.patch
new file mode 100644
index 0000000000..191b0c3a8f
--- /dev/null
+++ b/repos/ports/src/noux-pkg/gdb/patches/gcc6.patch
@@ -0,0 +1,29 @@
+gcc6.patch
+
+ChangeLog part removed to make the patch apply on Genode.
+
+From 24b4cf66a626566e7903813a2e0156778f4903f9 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <szabolcs.nagy@arm.com>
+Date: Tue, 16 Jun 2015 13:35:33 +0100
+Subject: [PATCH] Fixes a compile time warnng about left shifting a negative
+ value.
+
+	* arm-dis.c (print_insn_coprocessor): Avoid negative shift.
+---
+ opcodes/ChangeLog | 4 ++++
+ opcodes/arm-dis.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
+index e9f4425..818847d 100644
+--- a/opcodes/arm-dis.c
++++ b/opcodes/arm-dis.c
+@@ -3352,7 +3352,7 @@ print_insn_coprocessor (bfd_vma pc,
+ 
+ 		    /* Is ``imm'' a negative number?  */
+ 		    if (imm & 0x40)
+-		      imm |= (-1 << 7);
++		      imm -= 0x80;
+ 
+ 		    func (stream, "%d", imm);
+ 		  }
diff --git a/repos/ports/src/noux-pkg/gdb/patches/series b/repos/ports/src/noux-pkg/gdb/patches/series
index 4c6bbe3a9b..62bdb462e0 100644
--- a/repos/ports/src/noux-pkg/gdb/patches/series
+++ b/repos/ports/src/noux-pkg/gdb/patches/series
@@ -5,3 +5,4 @@ x86_64.patch
 noux_build.patch
 gdbserver_genode.patch
 gdbserver_x86_64.patch
+gcc6.patch