From 8602837fd4d695942a0bc6a5cebc3dcf7e0d56b6 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 3 Apr 2023 14:21:01 +0200 Subject: [PATCH] binutils: update to version 2.40 Issue #4827 --- repos/ports/ports/binutils.hash | 2 +- repos/ports/ports/binutils.port | 4 ++-- repos/ports/src/noux-pkg/binutils/patches/arm.patch | 2 +- repos/ports/src/noux-pkg/binutils/patches/bfd.patch | 10 +++++----- .../src/noux-pkg/binutils/patches/merge_sections.patch | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/repos/ports/ports/binutils.hash b/repos/ports/ports/binutils.hash index 54307fa8f8..75c4123199 100644 --- a/repos/ports/ports/binutils.hash +++ b/repos/ports/ports/binutils.hash @@ -1 +1 @@ -0f8a39117a2b19a5706726ab31e5b3e9b5bd9c8c +72d94ea55bccc7631054aea3008472a290ecb255 diff --git a/repos/ports/ports/binutils.port b/repos/ports/ports/binutils.port index 88d26b177f..b99709d0df 100644 --- a/repos/ports/ports/binutils.port +++ b/repos/ports/ports/binutils.port @@ -1,9 +1,9 @@ LICENSE := GPLv2 -VERSION := 2.36.1 +VERSION := 2.40 DOWNLOADS := binutils.archive URL(binutils) := ftp://ftp.fu-berlin.de/gnu/binutils/binutils-$(VERSION).tar.xz -SHA(binutils) := e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0 +SHA(binutils) := 0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1 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 aa9e6c8a11..cd52b9b687 100644 --- a/repos/ports/src/noux-pkg/binutils/patches/arm.patch +++ b/repos/ports/src/noux-pkg/binutils/patches/arm.patch @@ -13,7 +13,7 @@ From: Christian Prochaska 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em -index 0c031080..62886e45 100644 +index a9ac12d6..15ce661c 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -22,7 +22,7 @@ diff --git a/repos/ports/src/noux-pkg/binutils/patches/bfd.patch b/repos/ports/src/noux-pkg/binutils/patches/bfd.patch index 52dc5cbcf3..aff07d6f8e 100644 --- a/repos/ports/src/noux-pkg/binutils/patches/bfd.patch +++ b/repos/ports/src/noux-pkg/binutils/patches/bfd.patch @@ -8,18 +8,18 @@ From: Christian Prochaska 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 7eff85b7..4d24be86 100644 +index eddfb31b..b3fc8a94 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h -@@ -44,6 +44,7 @@ extern "C" { - #include "bfd_stdint.h" +@@ -45,6 +45,7 @@ extern "C" { + #include #include "diagnostics.h" #include +#include + #include #include - #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) -@@ -6513,7 +6514,7 @@ struct bfd +@@ -6512,7 +6513,7 @@ struct bfd /* The IOSTREAM, and corresponding IO vector that provide access to the file backing the BFD. */ diff --git a/repos/ports/src/noux-pkg/binutils/patches/merge_sections.patch b/repos/ports/src/noux-pkg/binutils/patches/merge_sections.patch index b345704de0..d7bfc106a4 100644 --- a/repos/ports/src/noux-pkg/binutils/patches/merge_sections.patch +++ b/repos/ports/src/noux-pkg/binutils/patches/merge_sections.patch @@ -3,10 +3,10 @@ Revert to old behavior where sections with the same name are augmented Sebastian Sumpf diff --git a/ld/ldlang.c b/ld/ldlang.c -index 8cbeda6..10ccc98 100644 +index b66d8c6b..6802d4af 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c -@@ -7414,7 +7414,7 @@ lang_enter_output_section_statement (const char *output_section_statement_name, +@@ -7370,7 +7370,7 @@ lang_enter_output_section_statement (const char *output_section_statement_name, lang_output_section_statement_type *os; os = lang_output_section_statement_lookup (output_section_statement_name,