From e54c13e13cb1636f697187a844af9350974330a3 Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Sun, 30 Jul 2023 18:18:41 +0200 Subject: [PATCH] util/crossgcc: Update binutils from 2.40 to 2.41 Change-Id: I6c985974e2eeea1329b2dbb232711c72b0bd99bc Signed-off-by: Elyes Haouas Reviewed-on: https://review.coreboot.org/c/coreboot/+/76852 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth --- .../releases/coreboot-4.22-relnotes.md | 1 + util/crossgcc/buildgcc | 2 +- ..._losing_entry_point_when_LTO_enabled.patch | 42 ---------- ...ipxe.patch => binutils-2.41_as-ipxe.patch} | 14 ++-- ....patch => binutils-2.41_no-makeinfo.patch} | 76 +++++++++---------- util/crossgcc/sum/binutils-2.40.tar.xz.cksum | 1 - util/crossgcc/sum/binutils-2.41.tar.xz.cksum | 1 + 7 files changed, 47 insertions(+), 90 deletions(-) delete mode 100644 util/crossgcc/patches/binutils-2.40_stop_losing_entry_point_when_LTO_enabled.patch rename util/crossgcc/patches/{binutils-2.40_as-ipxe.patch => binutils-2.41_as-ipxe.patch} (77%) rename util/crossgcc/patches/{binutils-2.40_no-makeinfo.patch => binutils-2.41_no-makeinfo.patch} (71%) delete mode 100644 util/crossgcc/sum/binutils-2.40.tar.xz.cksum create mode 100644 util/crossgcc/sum/binutils-2.41.tar.xz.cksum diff --git a/Documentation/releases/coreboot-4.22-relnotes.md b/Documentation/releases/coreboot-4.22-relnotes.md index d7013b267d..d4da9bfaa1 100644 --- a/Documentation/releases/coreboot-4.22-relnotes.md +++ b/Documentation/releases/coreboot-4.22-relnotes.md @@ -22,6 +22,7 @@ Update this document with changes that should be in the release notes. ### Toolchain updates * Upgrade GMP from 6.2.1 to 6.3.0 +* Upgrade binutils from 2.40 to 2.41 ### Additional coreboot changes diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 033aac0c7b..56c839fda9 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -39,7 +39,7 @@ GMP_VERSION=6.3.0 MPFR_VERSION=4.2.0 MPC_VERSION=1.3.1 GCC_VERSION=11.4.0 -BINUTILS_VERSION=2.40 +BINUTILS_VERSION=2.41 IASL_VERSION="R06_28_23" # CLANG version number CLANG_VERSION=16.0.6 diff --git a/util/crossgcc/patches/binutils-2.40_stop_losing_entry_point_when_LTO_enabled.patch b/util/crossgcc/patches/binutils-2.40_stop_losing_entry_point_when_LTO_enabled.patch deleted file mode 100644 index 548540c8c4..0000000000 --- a/util/crossgcc/patches/binutils-2.40_stop_losing_entry_point_when_LTO_enabled.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3539414584be0094b0a4fe56dfd64ea79d802edc Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Thu, 4 May 2023 14:24:16 +0100 -Subject: [PATCH] Stop the linker from loosing the entry point for COFF/PE code - when compiling with LTO enabled. - - PR 30300 - * emultempl/pep.em (set_entry_point): Add an undefined reference to the entry point if it has been constructed heuristically. - * emultempl/pe.em (set_entry_point): Likewise. ---- - -diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 55412d6ef9e..1f2a5f310be 100644 ---- a/ld/emultempl/pe.em -+++ b/ld/emultempl/pe.em -@@ -659,6 +659,9 @@ set_entry_point (void) - } - - lang_default_entry (entry); -+ -+ if (bfd_link_executable (&link_info) && ! entry_from_cmdline) -+ ldlang_add_undef (entry, false); - } - - static void -diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index 2a3fd0e6ea8..ca4acaea148 100644 ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -631,6 +631,9 @@ set_entry_point (void) - } - - lang_default_entry (entry); -+ -+ if (bfd_link_executable (&link_info) && ! entry_from_cmdline) -+ ldlang_add_undef (entry, false); - } - - static void --- -2.31.1 - diff --git a/util/crossgcc/patches/binutils-2.40_as-ipxe.patch b/util/crossgcc/patches/binutils-2.41_as-ipxe.patch similarity index 77% rename from util/crossgcc/patches/binutils-2.40_as-ipxe.patch rename to util/crossgcc/patches/binutils-2.41_as-ipxe.patch index 4d2c00a17f..fb15cce5ec 100644 --- a/util/crossgcc/patches/binutils-2.40_as-ipxe.patch +++ b/util/crossgcc/patches/binutils-2.41_as-ipxe.patch @@ -13,17 +13,15 @@ diff --git a/gas/as.c b/gas/as.c index 728811bc..78b4802c 100644 --- a/gas/as.c +++ b/gas/as.c -@@ -1203,7 +1203,7 @@ main (int argc, char ** argv) - { +@@ -1364,13 +1364,14 @@ main (int argc, char ** argv) char ** argv_orig = argv; struct stat sob; -- -+ const char *dev_null_file="/dev/null"; - int macro_strip_at; - start_time = get_run_time (); -@@ -1252,7 +1252,7 @@ main (int argc, char ** argv) - so that switches like --hash-size can be honored. */ ++ const char *dev_null_file="/dev/null"; + gas_early_init (&argc, &argv); + + /* Call parse_args before gas_init so that switches like + --hash-size can be honored. */ parse_args (&argc, &argv); - if (argc > 1 && stat (out_file_name, &sob) == 0) diff --git a/util/crossgcc/patches/binutils-2.40_no-makeinfo.patch b/util/crossgcc/patches/binutils-2.41_no-makeinfo.patch similarity index 71% rename from util/crossgcc/patches/binutils-2.40_no-makeinfo.patch rename to util/crossgcc/patches/binutils-2.41_no-makeinfo.patch index e37073fdd4..c43ab0e700 100644 --- a/util/crossgcc/patches/binutils-2.40_no-makeinfo.patch +++ b/util/crossgcc/patches/binutils-2.41_no-makeinfo.patch @@ -11,8 +11,8 @@ WARNING: 'makeinfo' is missing on your system. make[4]: *** [Makefile:507: as.info] Error 127 Current patch will change that to "MAKEINFO = true" -diff -ur binutils-2.40.orig/bfd/Makefile.in binutils-2.40/bfd/Makefile.in ---- binutils-2.40.orig/bfd/Makefile.in 2022-08-05 11:53:59.000000000 +0200 +diff -ur binutils-2.41.orig/bfd/Makefile.in binutils-2.40/bfd/Makefile.in +--- binutils-2.41.orig/bfd/Makefile.in 2022-08-05 11:53:59.000000000 +0200 +++ binutils-2.40/bfd/Makefile.in 2022-08-20 05:46:39.960039957 +0200 @@ -379,7 +379,7 @@ LN_S = @LN_S@ @@ -23,8 +23,8 @@ diff -ur binutils-2.40.orig/bfd/Makefile.in binutils-2.40/bfd/Makefile.in MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -diff -ur binutils-2.40.orig/binutils/Makefile.in binutils-2.40/binutils/Makefile.in ---- binutils-2.40.orig/binutils/Makefile.in 2022-08-05 11:56:21.000000000 +0200 +diff -ur binutils-2.41.orig/binutils/Makefile.in binutils-2.40/binutils/Makefile.in +--- binutils-2.41.orig/binutils/Makefile.in 2022-08-05 11:56:21.000000000 +0200 +++ binutils-2.40/binutils/Makefile.in 2022-08-20 05:46:38.563035937 +0200 @@ -532,7 +532,7 @@ LTLIBICONV = @LTLIBICONV@ @@ -35,8 +35,8 @@ diff -ur binutils-2.40.orig/binutils/Makefile.in binutils-2.40/binutils/Makefile MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -diff -ur binutils-2.40.orig/etc/Makefile.in binutils-2.40/etc/Makefile.in ---- binutils-2.40.orig/etc/Makefile.in 2022-07-08 11:46:47.000000000 +0200 +diff -ur binutils-2.41.orig/etc/Makefile.in binutils-2.40/etc/Makefile.in +--- binutils-2.41.orig/etc/Makefile.in 2022-07-08 11:46:47.000000000 +0200 +++ binutils-2.40/etc/Makefile.in 2022-08-20 05:46:38.525035827 +0200 @@ -154,7 +154,7 @@ LIBS = @LIBS@ @@ -47,8 +47,8 @@ diff -ur binutils-2.40.orig/etc/Makefile.in binutils-2.40/etc/Makefile.in MKDIR_P = @MKDIR_P@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -diff -ur binutils-2.40.orig/gas/Makefile.in binutils-2.40/gas/Makefile.in ---- binutils-2.40.orig/gas/Makefile.in 2022-08-05 11:55:17.000000000 +0200 +diff -ur binutils-2.41.orig/gas/Makefile.in binutils-2.40/gas/Makefile.in +--- binutils-2.41.orig/gas/Makefile.in 2022-08-05 11:55:17.000000000 +0200 +++ binutils-2.40/gas/Makefile.in 2022-08-20 05:46:38.535035856 +0200 @@ -408,7 +408,7 @@ LN_S = @LN_S@ @@ -59,8 +59,8 @@ diff -ur binutils-2.40.orig/gas/Makefile.in binutils-2.40/gas/Makefile.in MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -diff -ur binutils-2.40.orig/gold/Makefile.in binutils-2.40/gold/Makefile.in ---- binutils-2.40.orig/gold/Makefile.in 2022-07-08 11:58:08.000000000 +0200 +diff -ur binutils-2.41.orig/gold/Makefile.in binutils-2.40/gold/Makefile.in +--- binutils-2.41.orig/gold/Makefile.in 2022-07-08 11:58:08.000000000 +0200 +++ binutils-2.40/gold/Makefile.in 2022-08-20 05:46:38.522035819 +0200 @@ -558,7 +558,7 @@ LN_S = @LN_S@ @@ -71,8 +71,8 @@ diff -ur binutils-2.40.orig/gold/Makefile.in binutils-2.40/gold/Makefile.in MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ -diff -ur binutils-2.40.orig/gold/testsuite/Makefile.in binutils-2.40/gold/testsuite/Makefile.in ---- binutils-2.40.orig/gold/testsuite/Makefile.in 2022-07-08 11:58:08.000000000 +0200 +diff -ur binutils-2.41.orig/gold/testsuite/Makefile.in binutils-2.40/gold/testsuite/Makefile.in +--- binutils-2.41.orig/gold/testsuite/Makefile.in 2022-07-08 11:58:08.000000000 +0200 +++ binutils-2.40/gold/testsuite/Makefile.in 2022-08-20 05:46:38.524035824 +0200 @@ -2644,7 +2644,7 @@ LN_S = @LN_S@ @@ -83,8 +83,8 @@ diff -ur binutils-2.40.orig/gold/testsuite/Makefile.in binutils-2.40/gold/testsu MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ -diff -ur binutils-2.40.orig/gprof/Makefile.in binutils-2.40/gprof/Makefile.in ---- binutils-2.40.orig/gprof/Makefile.in 2022-08-05 11:59:11.000000000 +0200 +diff -ur binutils-2.41.orig/gprof/Makefile.in binutils-2.40/gprof/Makefile.in +--- binutils-2.41.orig/gprof/Makefile.in 2022-08-05 11:59:11.000000000 +0200 +++ binutils-2.40/gprof/Makefile.in 2022-08-20 05:46:39.964039969 +0200 @@ -351,7 +351,7 @@ LN_S = @LN_S@ @@ -95,8 +95,8 @@ diff -ur binutils-2.40.orig/gprof/Makefile.in binutils-2.40/gprof/Makefile.in MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -diff -ur binutils-2.40.orig/gprofng/doc/Makefile.in binutils-2.40/gprofng/doc/Makefile.in ---- binutils-2.40.orig/gprofng/doc/Makefile.in 2022-08-05 11:59:31.000000000 +0200 +diff -ur binutils-2.41.orig/gprofng/doc/Makefile.in binutils-2.40/gprofng/doc/Makefile.in +--- binutils-2.41.orig/gprofng/doc/Makefile.in 2022-08-05 11:59:31.000000000 +0200 +++ binutils-2.40/gprofng/doc/Makefile.in 2022-08-20 05:46:39.252037920 +0200 @@ -271,7 +271,7 @@ LN_S = @LN_S@ @@ -107,8 +107,8 @@ diff -ur binutils-2.40.orig/gprofng/doc/Makefile.in binutils-2.40/gprofng/doc/Ma MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -diff -ur binutils-2.40.orig/gprofng/gp-display-html/Makefile.in binutils-2.40/gprofng/gp-display-html/Makefile.in ---- binutils-2.40.orig/gprofng/gp-display-html/Makefile.in 2022-08-05 11:59:33.000000000 +0200 +diff -ur binutils-2.41.orig/gprofng/gp-display-html/Makefile.in binutils-2.40/gprofng/gp-display-html/Makefile.in +--- binutils-2.41.orig/gprofng/gp-display-html/Makefile.in 2022-08-05 11:59:33.000000000 +0200 +++ binutils-2.40/gprofng/gp-display-html/Makefile.in 2022-08-20 05:46:39.479038573 +0200 @@ -234,7 +234,7 @@ LN_S = @LN_S@ @@ -119,8 +119,8 @@ diff -ur binutils-2.40.orig/gprofng/gp-display-html/Makefile.in binutils-2.40/gp MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -diff -ur binutils-2.40.orig/gprofng/libcollector/Makefile.in binutils-2.40/gprofng/libcollector/Makefile.in ---- binutils-2.40.orig/gprofng/libcollector/Makefile.in 2022-08-05 11:59:38.000000000 +0200 +diff -ur binutils-2.41.orig/gprofng/libcollector/Makefile.in binutils-2.40/gprofng/libcollector/Makefile.in +--- binutils-2.41.orig/gprofng/libcollector/Makefile.in 2022-08-05 11:59:38.000000000 +0200 +++ binutils-2.40/gprofng/libcollector/Makefile.in 2022-08-20 05:46:38.965037094 +0200 @@ -341,7 +341,7 @@ LN_S = @LN_S@ @@ -131,8 +131,8 @@ diff -ur binutils-2.40.orig/gprofng/libcollector/Makefile.in binutils-2.40/gprof MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -diff -ur binutils-2.40.orig/gprofng/Makefile.in binutils-2.40/gprofng/Makefile.in ---- binutils-2.40.orig/gprofng/Makefile.in 2022-08-05 11:59:30.000000000 +0200 +diff -ur binutils-2.41.orig/gprofng/Makefile.in binutils-2.40/gprofng/Makefile.in +--- binutils-2.41.orig/gprofng/Makefile.in 2022-08-05 11:59:30.000000000 +0200 +++ binutils-2.40/gprofng/Makefile.in 2022-08-20 05:46:38.574035968 +0200 @@ -289,7 +289,7 @@ LN_S = @LN_S@ @@ -143,8 +143,8 @@ diff -ur binutils-2.40.orig/gprofng/Makefile.in binutils-2.40/gprofng/Makefile.i MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -diff -ur binutils-2.40.orig/gprofng/src/Makefile.in binutils-2.40/gprofng/src/Makefile.in ---- binutils-2.40.orig/gprofng/src/Makefile.in 2022-08-05 11:59:34.000000000 +0200 +diff -ur binutils-2.41.orig/gprofng/src/Makefile.in binutils-2.40/gprofng/src/Makefile.in +--- binutils-2.41.orig/gprofng/src/Makefile.in 2022-08-05 11:59:34.000000000 +0200 +++ binutils-2.40/gprofng/src/Makefile.in 2022-08-20 05:46:38.573035965 +0200 @@ -358,7 +358,7 @@ LN_S = @LN_S@ @@ -155,8 +155,8 @@ diff -ur binutils-2.40.orig/gprofng/src/Makefile.in binutils-2.40/gprofng/src/Ma MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -diff -ur binutils-2.40.orig/ld/Makefile.in binutils-2.40/ld/Makefile.in ---- binutils-2.40.orig/ld/Makefile.in 2022-08-05 11:56:53.000000000 +0200 +diff -ur binutils-2.41.orig/ld/Makefile.in binutils-2.40/ld/Makefile.in +--- binutils-2.41.orig/ld/Makefile.in 2022-08-05 11:56:53.000000000 +0200 +++ binutils-2.40/ld/Makefile.in 2022-08-20 05:46:38.536035859 +0200 @@ -432,7 +432,7 @@ LN_S = @LN_S@ @@ -167,8 +167,8 @@ diff -ur binutils-2.40.orig/ld/Makefile.in binutils-2.40/ld/Makefile.in MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -diff -ur binutils-2.40.orig/libctf/Makefile.in binutils-2.40/libctf/Makefile.in ---- binutils-2.40.orig/libctf/Makefile.in 2022-07-08 12:02:15.000000000 +0200 +diff -ur binutils-2.41.orig/libctf/Makefile.in binutils-2.40/libctf/Makefile.in +--- binutils-2.41.orig/libctf/Makefile.in 2022-07-08 12:02:15.000000000 +0200 +++ binutils-2.40/libctf/Makefile.in 2022-08-20 05:46:39.771039414 +0200 @@ -425,7 +425,7 @@ LN_S = @LN_S@ @@ -179,8 +179,8 @@ diff -ur binutils-2.40.orig/libctf/Makefile.in binutils-2.40/libctf/Makefile.in MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ -diff -ur binutils-2.40.orig/libiberty/Makefile.in binutils-2.40/libiberty/Makefile.in ---- binutils-2.40.orig/libiberty/Makefile.in 2022-07-08 11:46:48.000000000 +0200 +diff -ur binutils-2.41.orig/libiberty/Makefile.in binutils-2.40/libiberty/Makefile.in +--- binutils-2.41.orig/libiberty/Makefile.in 2022-07-08 11:46:48.000000000 +0200 +++ binutils-2.40/libiberty/Makefile.in 2022-08-20 05:46:39.961039960 +0200 @@ -57,7 +57,7 @@ CFLAGS = @CFLAGS@ @@ -191,8 +191,8 @@ diff -ur binutils-2.40.orig/libiberty/Makefile.in binutils-2.40/libiberty/Makefi PERL = @PERL@ PICFLAG = @PICFLAG@ -diff -ur binutils-2.40.orig/Makefile.in binutils-2.40/Makefile.in ---- binutils-2.40.orig/Makefile.in 2022-08-05 13:00:56.000000000 +0200 +diff -ur binutils-2.41.orig/Makefile.in binutils-2.40/Makefile.in +--- binutils-2.41.orig/Makefile.in 2022-08-05 13:00:56.000000000 +0200 +++ binutils-2.40/Makefile.in 2022-08-20 05:46:38.549035896 +0200 @@ -399,7 +399,7 @@ FLEX = @FLEX@ @@ -203,8 +203,8 @@ diff -ur binutils-2.40.orig/Makefile.in binutils-2.40/Makefile.in EXPECT = @EXPECT@ RUNTEST = @RUNTEST@ -diff -ur binutils-2.40.orig/Makefile.tpl binutils-2.40/Makefile.tpl ---- binutils-2.40.orig/Makefile.tpl 2022-07-08 11:46:47.000000000 +0200 +diff -ur binutils-2.41.orig/Makefile.tpl binutils-2.40/Makefile.tpl +--- binutils-2.41.orig/Makefile.tpl 2022-07-08 11:46:47.000000000 +0200 +++ binutils-2.40/Makefile.tpl 2022-08-20 05:46:38.535035856 +0200 @@ -402,7 +402,7 @@ FLEX = @FLEX@ @@ -215,8 +215,8 @@ diff -ur binutils-2.40.orig/Makefile.tpl binutils-2.40/Makefile.tpl EXPECT = @EXPECT@ RUNTEST = @RUNTEST@ -diff -ur binutils-2.40.orig/opcodes/Makefile.in binutils-2.40/opcodes/Makefile.in ---- binutils-2.40.orig/opcodes/Makefile.in 2022-08-05 11:54:59.000000000 +0200 +diff -ur binutils-2.41.orig/opcodes/Makefile.in binutils-2.40/opcodes/Makefile.in +--- binutils-2.41.orig/opcodes/Makefile.in 2022-08-05 11:54:59.000000000 +0200 +++ binutils-2.40/opcodes/Makefile.in 2022-08-20 05:46:38.522035819 +0200 @@ -324,7 +324,7 @@ LN_S = @LN_S@ @@ -227,8 +227,8 @@ diff -ur binutils-2.40.orig/opcodes/Makefile.in binutils-2.40/opcodes/Makefile.i MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -diff -ur binutils-2.40.orig/zlib/Makefile.in binutils-2.40/zlib/Makefile.in ---- binutils-2.40.orig/zlib/Makefile.in 2022-07-08 11:56:28.000000000 +0200 +diff -ur binutils-2.41.orig/zlib/Makefile.in binutils-2.40/zlib/Makefile.in +--- binutils-2.41.orig/zlib/Makefile.in 2022-07-08 11:56:28.000000000 +0200 +++ binutils-2.40/zlib/Makefile.in 2022-08-20 05:46:38.571035960 +0200 @@ -321,7 +321,7 @@ LN_S = @LN_S@ diff --git a/util/crossgcc/sum/binutils-2.40.tar.xz.cksum b/util/crossgcc/sum/binutils-2.40.tar.xz.cksum deleted file mode 100644 index 4597a7209d..0000000000 --- a/util/crossgcc/sum/binutils-2.40.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -fee4fbef9d632afc1988dd631d7f75d4394b7f8d tarballs/binutils-2.40.tar.xz diff --git a/util/crossgcc/sum/binutils-2.41.tar.xz.cksum b/util/crossgcc/sum/binutils-2.41.tar.xz.cksum new file mode 100644 index 0000000000..84bb8faeb0 --- /dev/null +++ b/util/crossgcc/sum/binutils-2.41.tar.xz.cksum @@ -0,0 +1 @@ +0e008260a958bbd10182ee3384672ae0a310eece tarballs/binutils-2.41.tar.xz