From fc902d9e660aad3a2aadf256b1fa25ad898acb49 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Fri, 26 Mar 2021 11:54:08 +0100
Subject: [PATCH] tool_chain: update binutils to version 2.36.1

Issue #4094
---
 repos/ports/ports/binutils.hash               |  2 +-
 repos/ports/ports/binutils.port               |  4 +--
 .../src/noux-pkg/binutils/patches/arm.patch   |  4 +--
 .../src/noux-pkg/binutils/patches/bfd.patch   | 30 +++++++++++++++++++
 .../src/noux-pkg/binutils/patches/riscv.patch | 18 ++++++-----
 .../src/noux-pkg/binutils/patches/series      |  1 +
 6 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 repos/ports/src/noux-pkg/binutils/patches/bfd.patch

diff --git a/repos/ports/ports/binutils.hash b/repos/ports/ports/binutils.hash
index 89ce5dbd44..b9f661f04c 100644
--- a/repos/ports/ports/binutils.hash
+++ b/repos/ports/ports/binutils.hash
@@ -1 +1 @@
-62d3090d2ac134787457839ec55cf45512817fe2
+41f7e5a393d8f8b8c7471efc366e74695a8d7694
diff --git a/repos/ports/ports/binutils.port b/repos/ports/ports/binutils.port
index df4f868c65..30c1105a8f 100644
--- a/repos/ports/ports/binutils.port
+++ b/repos/ports/ports/binutils.port
@@ -1,9 +1,9 @@
 LICENSE   := GPLv2
-VERSION   := 2.32
+VERSION   := 2.36.1
 DOWNLOADS := binutils.archive
 
 URL(binutils) := ftp://ftp.fu-berlin.de/gnu/binutils/binutils-$(VERSION).tar.xz
-SHA(binutils) := 0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+SHA(binutils) := e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0
 SIG(binutils) := ${URL(binutils)}.sig
 KEY(binutils) := GNU
 DIR(binutils) := src/noux-pkg/binutils
diff --git a/repos/ports/src/noux-pkg/binutils/patches/arm.patch b/repos/ports/src/noux-pkg/binutils/patches/arm.patch
index 9e0b0eb96e..aa9e6c8a11 100644
--- a/repos/ports/src/noux-pkg/binutils/patches/arm.patch
+++ b/repos/ports/src/noux-pkg/binutils/patches/arm.patch
@@ -13,11 +13,11 @@ From: Christian Prochaska <christian.prochaska@genode-labs.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
-index 80effa4..82e2e2d 100644
+index 0c031080..62886e45 100644
 --- a/ld/emultempl/armelf.em
 +++ b/ld/emultempl/armelf.em
 @@ -22,7 +22,7 @@
- # This file is sourced from elf32.em, and defines extra arm-elf
+ # This file is sourced from elf.em, and defines extra arm-elf
  # specific routines.
  #
 -test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel"
diff --git a/repos/ports/src/noux-pkg/binutils/patches/bfd.patch b/repos/ports/src/noux-pkg/binutils/patches/bfd.patch
new file mode 100644
index 0000000000..52dc5cbcf3
--- /dev/null
+++ b/repos/ports/src/noux-pkg/binutils/patches/bfd.patch
@@ -0,0 +1,30 @@
+bfd.patch
+
+From: Christian Prochaska <christian.prochaska@genode-labs.com>
+
+
+---
+ bfd/bfd-in2.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
+index 7eff85b7..4d24be86 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -44,6 +44,7 @@ extern "C" {
+ #include "bfd_stdint.h"
+ #include "diagnostics.h"
+ #include <stdarg.h>
++#include <stdio.h>
+ #include <sys/stat.h>
+ 
+ #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
+@@ -6513,7 +6514,7 @@ struct bfd
+ 
+   /* The IOSTREAM, and corresponding IO vector that provide access
+      to the file backing the BFD.  */
+-  void *iostream;
++  FILE *iostream;
+   const struct bfd_iovec *iovec;
+ 
+   /* The caching routines use these to maintain a
diff --git a/repos/ports/src/noux-pkg/binutils/patches/riscv.patch b/repos/ports/src/noux-pkg/binutils/patches/riscv.patch
index f25edfefdb..c7cc0f1f87 100644
--- a/repos/ports/src/noux-pkg/binutils/patches/riscv.patch
+++ b/repos/ports/src/noux-pkg/binutils/patches/riscv.patch
@@ -1,17 +1,21 @@
-commit 55b4054cf95835fef2896e884cfc0069a0a14401
-Author: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
-Date:   Thu Apr 25 11:02:51 2019 +0200
+riscv: always enable shared library support
 
-    riscv: always enable shared library support
+From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
+
+
+---
+ ld/emulparams/elf32lriscv-defs.sh |    5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/ld/emulparams/elf32lriscv-defs.sh b/ld/emulparams/elf32lriscv-defs.sh
-index 5ac3b602..32b50682 100644
+index b823ceda..59aab2de 100644
 --- a/ld/emulparams/elf32lriscv-defs.sh
 +++ b/ld/emulparams/elf32lriscv-defs.sh
-@@ -26,6 +26,10 @@ case "$target" in
-     ;;
+@@ -27,6 +27,11 @@ case "$target" in
  esac
  
+ IREL_IN_PLT=
++
 +# always enable shared library support
 +GENERATE_SHLIB_SCRIPT=yes
 +GENERATE_PIE_SCRIPT=yes
diff --git a/repos/ports/src/noux-pkg/binutils/patches/series b/repos/ports/src/noux-pkg/binutils/patches/series
index 81e7941e70..80ed00421b 100644
--- a/repos/ports/src/noux-pkg/binutils/patches/series
+++ b/repos/ports/src/noux-pkg/binutils/patches/series
@@ -1,2 +1,3 @@
+bfd.patch
 arm.patch
 riscv.patch