From a15a7a5c13b1b51215dbe42fb5c8304fc2fee834 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sat, 1 Feb 2020 14:56:45 +0100 Subject: crossgcc: Upgrade binutils to version 2.35 Using "MAKEINFO = @MAKEINFO@", it fails to compile, so binutils-2.35_no-makeinfo.patch will change that to "MAKEINFO = true" Change-Id: I0ad01e5da34c96fee6a9b1a63897a9fb28471c75 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/38666 Reviewed-by: Christian Walter Tested-by: build bot (Jenkins) --- util/crossgcc/buildgcc | 2 +- .../crossgcc/patches/binutils-2.33.1_as-ipxe.patch | 36 ---- .../patches/binutils-2.33.1_mips-gold.patch | 11 - .../patches/binutils-2.33.1_no-bfd-doc.patch | 12 -- util/crossgcc/patches/binutils-2.35_as-ipxe.patch | 36 ++++ .../crossgcc/patches/binutils-2.35_mips-gold.patch | 11 + .../patches/binutils-2.35_no-bfd-doc.patch | 12 ++ .../patches/binutils-2.35_no-makeinfo.patch | 236 +++++++++++++++++++++ util/crossgcc/sum/binutils-2.33.1.tar.xz.cksum | 1 - util/crossgcc/sum/binutils-2.35.tar.xz.cksum | 1 + 10 files changed, 297 insertions(+), 61 deletions(-) delete mode 100644 util/crossgcc/patches/binutils-2.33.1_as-ipxe.patch delete mode 100644 util/crossgcc/patches/binutils-2.33.1_mips-gold.patch delete mode 100644 util/crossgcc/patches/binutils-2.33.1_no-bfd-doc.patch create mode 100644 util/crossgcc/patches/binutils-2.35_as-ipxe.patch create mode 100644 util/crossgcc/patches/binutils-2.35_mips-gold.patch create mode 100644 util/crossgcc/patches/binutils-2.35_no-bfd-doc.patch create mode 100644 util/crossgcc/patches/binutils-2.35_no-makeinfo.patch delete mode 100644 util/crossgcc/sum/binutils-2.33.1.tar.xz.cksum create mode 100644 util/crossgcc/sum/binutils-2.35.tar.xz.cksum (limited to 'util') diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 9eecb5120d..149beb4a69 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -38,7 +38,7 @@ MPFR_VERSION=4.1.0 MPC_VERSION=1.1.0 GCC_VERSION=8.3.0 GCC_AUTOCONF_VERSION=2.69 -BINUTILS_VERSION=2.33.1 +BINUTILS_VERSION=2.35 GDB_VERSION=9.2 IASL_VERSION=20200528 PYTHON_VERSION=3.8.1 diff --git a/util/crossgcc/patches/binutils-2.33.1_as-ipxe.patch b/util/crossgcc/patches/binutils-2.33.1_as-ipxe.patch deleted file mode 100644 index 4d2c00a17f..0000000000 --- a/util/crossgcc/patches/binutils-2.33.1_as-ipxe.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6984bd861cc595e56d26ea033851d9174e855129 Mon Sep 17 00:00:00 2001 -From: Himanshu Sahdev aka CunningLearner -Date: Mon, 26 Aug 2019 16:57:13 +0530 -Subject: [PATCH] as: facilitate tests based on /dev/null - -Signed-off-by: Himanshu Sahdev - ---- - gas/as.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -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) - { - 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. */ - parse_args (&argc, &argv); - -- if (argc > 1 && stat (out_file_name, &sob) == 0) -+ if (argc > 1 && stat (out_file_name, &sob) == 0 && strcmp(out_file_name,dev_null_file)!=0) - { - int i; - --- -2.17.1 - diff --git a/util/crossgcc/patches/binutils-2.33.1_mips-gold.patch b/util/crossgcc/patches/binutils-2.33.1_mips-gold.patch deleted file mode 100644 index 722367c3d6..0000000000 --- a/util/crossgcc/patches/binutils-2.33.1_mips-gold.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN binutils-2.32.orig/gold/configure.tgt binutils-2.32/gold/configure.tgt ---- binutils-2.32.orig/gold/configure.tgt -+++ binutils-2.32/gold/configure.tgt -@@ -157,6 +157,7 @@ - targ_obj=mips - targ_machine=EM_MIPS_RS3_LE - targ_size=32 -+ targ_extra_size=64 - targ_big_endian=false - targ_extra_big_endian=true - ;; diff --git a/util/crossgcc/patches/binutils-2.33.1_no-bfd-doc.patch b/util/crossgcc/patches/binutils-2.33.1_no-bfd-doc.patch deleted file mode 100644 index 7e4bb3f5fd..0000000000 --- a/util/crossgcc/patches/binutils-2.33.1_no-bfd-doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur binutils-2.32/bfd/Makefile.in binutils-2.32.patched/bfd/Makefile.in ---- binutils-2.32/bfd/Makefile.in -+++ binutils-2.32.patched/bfd/Makefile.in -@@ -459,7 +459,7 @@ - ACLOCAL_AMFLAGS = -I . -I .. -I ../config - INCDIR = $(srcdir)/../include - CSEARCH = -I. -I$(srcdir) -I$(INCDIR) --SUBDIRS = doc po -+SUBDIRS = po - bfddocdir = doc - libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ - @SHARED_LDFLAGS@ $(am__empty) diff --git a/util/crossgcc/patches/binutils-2.35_as-ipxe.patch b/util/crossgcc/patches/binutils-2.35_as-ipxe.patch new file mode 100644 index 0000000000..4d2c00a17f --- /dev/null +++ b/util/crossgcc/patches/binutils-2.35_as-ipxe.patch @@ -0,0 +1,36 @@ +From 6984bd861cc595e56d26ea033851d9174e855129 Mon Sep 17 00:00:00 2001 +From: Himanshu Sahdev aka CunningLearner +Date: Mon, 26 Aug 2019 16:57:13 +0530 +Subject: [PATCH] as: facilitate tests based on /dev/null + +Signed-off-by: Himanshu Sahdev + +--- + gas/as.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +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) + { + 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. */ + parse_args (&argc, &argv); + +- if (argc > 1 && stat (out_file_name, &sob) == 0) ++ if (argc > 1 && stat (out_file_name, &sob) == 0 && strcmp(out_file_name,dev_null_file)!=0) + { + int i; + +-- +2.17.1 + diff --git a/util/crossgcc/patches/binutils-2.35_mips-gold.patch b/util/crossgcc/patches/binutils-2.35_mips-gold.patch new file mode 100644 index 0000000000..722367c3d6 --- /dev/null +++ b/util/crossgcc/patches/binutils-2.35_mips-gold.patch @@ -0,0 +1,11 @@ +diff -urN binutils-2.32.orig/gold/configure.tgt binutils-2.32/gold/configure.tgt +--- binutils-2.32.orig/gold/configure.tgt ++++ binutils-2.32/gold/configure.tgt +@@ -157,6 +157,7 @@ + targ_obj=mips + targ_machine=EM_MIPS_RS3_LE + targ_size=32 ++ targ_extra_size=64 + targ_big_endian=false + targ_extra_big_endian=true + ;; diff --git a/util/crossgcc/patches/binutils-2.35_no-bfd-doc.patch b/util/crossgcc/patches/binutils-2.35_no-bfd-doc.patch new file mode 100644 index 0000000000..7e4bb3f5fd --- /dev/null +++ b/util/crossgcc/patches/binutils-2.35_no-bfd-doc.patch @@ -0,0 +1,12 @@ +diff -ur binutils-2.32/bfd/Makefile.in binutils-2.32.patched/bfd/Makefile.in +--- binutils-2.32/bfd/Makefile.in ++++ binutils-2.32.patched/bfd/Makefile.in +@@ -459,7 +459,7 @@ + ACLOCAL_AMFLAGS = -I . -I .. -I ../config + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +-SUBDIRS = doc po ++SUBDIRS = po + bfddocdir = doc + libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) diff --git a/util/crossgcc/patches/binutils-2.35_no-makeinfo.patch b/util/crossgcc/patches/binutils-2.35_no-makeinfo.patch new file mode 100644 index 0000000000..4834016c3b --- /dev/null +++ b/util/crossgcc/patches/binutils-2.35_no-makeinfo.patch @@ -0,0 +1,236 @@ +It fails to compile when using "MAKEINFO = @MAKEINFO@": +binutils-gdb/missing: 81: makeinfo: not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +make[4]: *** [Makefile:507: as.info] Error 127 + +Current patch will change that to "MAKEINFO = true" + +diff --git binutils-2.34/Makefile.in binutils-2.34/Makefile.in +index af38671cbe..978d445825 100644 +--- binutils-2.34/Makefile.in ++++ binutils-2.34/Makefile.in +@@ -370,7 +370,7 @@ YACC = @YACC@ + FLEX = @FLEX@ + LEX = @LEX@ + M4 = @M4@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + EXPECT = @EXPECT@ + RUNTEST = @RUNTEST@ + +diff --git binutils-2.34/Makefile.tpl binutils-2.34/Makefile.tpl +index 5b118a8ba4..2b41fa28ce 100644 +--- binutils-2.34/Makefile.tpl ++++ binutils-2.34/Makefile.tpl +@@ -373,7 +373,7 @@ YACC = @YACC@ + FLEX = @FLEX@ + LEX = @LEX@ + M4 = @M4@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + EXPECT = @EXPECT@ + RUNTEST = @RUNTEST@ + +diff --git binutils-2.34/bfd/Makefile.in binutils-2.34/bfd/Makefile.in +index 7d3b9c1c5a..c062314063 100644 +--- binutils-2.34/bfd/Makefile.in ++++ binutils-2.34/bfd/Makefile.in +@@ -342,7 +342,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/bfd/Makefile.in.orig binutils-2.34/bfd/Makefile.in.orig +index 78555ccbbc..861fc3570d 100644 +--- binutils-2.34/bfd/Makefile.in.orig ++++ binutils-2.34/bfd/Makefile.in.orig +@@ -342,7 +342,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/bfd/doc/Makefile.in binutils-2.34/bfd/doc/Makefile.in +index 2c1ddd45b8..b3972192e7 100644 +--- binutils-2.34/bfd/doc/Makefile.in ++++ binutils-2.34/bfd/doc/Makefile.in +@@ -284,7 +284,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/binutils/Makefile.in binutils-2.34/binutils/Makefile.in +index 39f08563f9..91d2287c75 100644 +--- binutils-2.34/binutils/Makefile.in ++++ binutils-2.34/binutils/Makefile.in +@@ -463,7 +463,7 @@ LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/binutils/doc/Makefile.in binutils-2.34/binutils/doc/Makefile.in +index b0e7b7b6c8..dbb21dd47a 100644 +--- binutils-2.34/binutils/doc/Makefile.in ++++ binutils-2.34/binutils/doc/Makefile.in +@@ -298,7 +298,7 @@ LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/gas/Makefile.in binutils-2.34/gas/Makefile.in +index 85c7b04daa..882db6dd81 100644 +--- binutils-2.34/gas/Makefile.in ++++ binutils-2.34/gas/Makefile.in +@@ -318,7 +318,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/gas/doc/Makefile.in binutils-2.34/gas/doc/Makefile.in +index f2336ec8c9..d4c36366a1 100644 +--- binutils-2.34/gas/doc/Makefile.in ++++ binutils-2.34/gas/doc/Makefile.in +@@ -280,7 +280,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/gold/Makefile.in binutils-2.34/gold/Makefile.in +index f2906ede8b..ac4fad5d55 100644 +--- binutils-2.34/gold/Makefile.in ++++ binutils-2.34/gold/Makefile.in +@@ -558,7 +558,7 @@ LIBS = @LIBS@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +diff --git binutils-2.34/gold/testsuite/Makefile.in binutils-2.34/gold/testsuite/Makefile.in +index 9f29dc638c..6907fe1f9a 100644 +--- binutils-2.34/gold/testsuite/Makefile.in ++++ binutils-2.34/gold/testsuite/Makefile.in +@@ -2625,7 +2625,7 @@ LIBS = @LIBS@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MERGE_CONSTANTS_FLAG = @MERGE_CONSTANTS_FLAG@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +diff --git binutils-2.34/gprof/Makefile.in binutils-2.34/gprof/Makefile.in +index efc2b80eb8..012f186281 100644 +--- binutils-2.34/gprof/Makefile.in ++++ binutils-2.34/gprof/Makefile.in +@@ -349,7 +349,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/ld/Makefile.in binutils-2.34/ld/Makefile.in +index 46d9b14077..2f2b0ae3ce 100644 +--- binutils-2.34/ld/Makefile.in ++++ binutils-2.34/ld/Makefile.in +@@ -429,7 +429,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/libctf/Makefile.in binutils-2.34/libctf/Makefile.in +index 3e8a0172f7..32dc1f08f7 100644 +--- binutils-2.34/libctf/Makefile.in ++++ binutils-2.34/libctf/Makefile.in +@@ -328,7 +328,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ +diff --git binutils-2.34/libiberty/Makefile.in binutils-2.34/libiberty/Makefile.in +index fe738d0db4..6d902c5b7b 100644 +--- binutils-2.34/libiberty/Makefile.in ++++ binutils-2.34/libiberty/Makefile.in +@@ -56,7 +56,7 @@ CC = @CC@ + CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ + RANLIB = @RANLIB@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + PERL = @PERL@ + + PICFLAG = @PICFLAG@ +diff --git binutils-2.34/opcodes/Makefile.in binutils-2.34/opcodes/Makefile.in +index 8564803fc7..fa790026ac 100644 +--- binutils-2.34/opcodes/Makefile.in ++++ binutils-2.34/opcodes/Makefile.in +@@ -322,7 +322,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +diff --git binutils-2.34/zlib/Makefile.in binutils-2.34/zlib/Makefile.in +index 062dc04e80..4abb5ceeaa 100644 +--- binutils-2.34/zlib/Makefile.in ++++ binutils-2.34/zlib/Makefile.in +@@ -304,7 +304,7 @@ LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = true + MKDIR_P = @MKDIR_P@ + NM = @NM@ + NMEDIT = @NMEDIT@ diff --git a/util/crossgcc/sum/binutils-2.33.1.tar.xz.cksum b/util/crossgcc/sum/binutils-2.33.1.tar.xz.cksum deleted file mode 100644 index 3a2f076400..0000000000 --- a/util/crossgcc/sum/binutils-2.33.1.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -06598868f5fa8efc98427dcb790d42c664f1a1a4 tarballs/binutils-2.33.1.tar.xz diff --git a/util/crossgcc/sum/binutils-2.35.tar.xz.cksum b/util/crossgcc/sum/binutils-2.35.tar.xz.cksum new file mode 100644 index 0000000000..06c29b0b3e --- /dev/null +++ b/util/crossgcc/sum/binutils-2.35.tar.xz.cksum @@ -0,0 +1 @@ +6bdd090ce268b6d6c3442516021c4e4b5019e303 tarballs/binutils-2.35.tar.xz -- cgit v1.2.3