HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38483 )
Change subject: crossgcc: Upgrade make to version 4.3 ......................................................................
crossgcc: Upgrade make to version 4.3
_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch and _0053-glob-Do-not-assume-glibc-glob-internals.patch are integrated in upstream, so we don't need it anymore
Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M util/crossgcc/buildgcc D util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch D util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch R util/crossgcc/patches/make-4.3_alloca.patch D util/crossgcc/sum/make-4.2.1.tar.bz2.cksum A util/crossgcc/sum/make-4.3.tar.gz.cksum 6 files changed, 5 insertions(+), 100 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/38483/1
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index ab2ea89..863afa5 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -63,7 +63,7 @@ EXPAT_VERSION=2.2.9 # CLANG version number CLANG_VERSION=9.0.0 -MAKE_VERSION=4.2.1 +MAKE_VERSION=4.3 CMAKE_VERSION=3.16.2 NASM_VERSION=2.14.02
@@ -85,7 +85,7 @@ CFE_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/cfe-$%7BCLANG_VERSION%7D.src...." CRT_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/compiler-rt-$%7BCLANG_VERSION..." CTE_ARCHIVE="https://releases.llvm.org/$%7BCLANG_VERSION%7D/clang-tools-extra-$%7BCLANG_V..." -MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-$%7BMAKE_VERSION%7D.tar.bz2" +MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-$%7BMAKE_VERSION%7D.tar.gz" CMAKE_ARCHIVE="https://cmake.org/files/v3.16/cmake-$%7BCMAKE_VERSION%7D.tar.gz" NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/$%7BNASM_VERSION%7D/nasm-$%7BNASM..."
diff --git a/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch b/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch deleted file mode 100644 index 3d45025..0000000 --- a/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert eggert@cs.ucla.edu -Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: [PATCH 53/78] glob: Do not assume glibc glob internals. - -It has been proposed that glibc glob start using gl_lstat, -which the API allows it to do. GNU 'make' should not get in -the way of this. See: -https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html - -* dir.c (local_lstat): New function, like local_stat. -(dir_setup_glob): Use it to initialize gl_lstat too, as the API -requires. ---- - dir.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/dir.c b/dir.c -index adbb8a9..c343e4c 100644 ---- a/dir.c -+++ b/dir.c -@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) - } - #endif - -+/* Similarly for lstat. */ -+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) -+# ifndef VMS -+# ifndef HAVE_SYS_STAT_H -+int lstat (const char *path, struct stat *sbuf); -+# endif -+# else -+ /* We are done with the fake lstat. Go back to the real lstat */ -+# ifdef lstat -+# undef lstat -+# endif -+# endif -+# define local_lstat lstat -+#elif defined(WINDOWS32) -+/* Windows doesn't support lstat(). */ -+# define local_lstat local_stat -+#else -+static int -+local_lstat (const char *path, struct stat *buf) -+{ -+ int e; -+ EINTRLOOP (e, lstat (path, buf)); -+ return e; -+} -+#endif -+ - void - dir_setup_glob (glob_t *gl) - { - gl->gl_opendir = open_dirstream; - gl->gl_readdir = read_dirstream; - gl->gl_closedir = free; -+ gl->gl_lstat = local_lstat; - gl->gl_stat = local_stat; -- /* We don't bother setting gl_lstat, since glob never calls it. -- The slot is only there for compatibility with 4.4 BSD. */ - } - - void --- -2.18.0 - diff --git a/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch b/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch deleted file mode 100644 index 53e61b8..0000000 --- a/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith psmith@gnu.org -Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: [PATCH 68/78] * configure.ac: Support GLIBC glob interface version 2 - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c72568..4710832 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], - #include <glob.h> - #include <fnmatch.h> - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include <gnu-versions.h> --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif], --- -2.18.0 - diff --git a/util/crossgcc/patches/make-4.2.1_alloca.patch b/util/crossgcc/patches/make-4.3_alloca.patch similarity index 61% rename from util/crossgcc/patches/make-4.2.1_alloca.patch rename to util/crossgcc/patches/make-4.3_alloca.patch index 61a3581..6dd1fd1 100644 --- a/util/crossgcc/patches/make-4.2.1_alloca.patch +++ b/util/crossgcc/patches/make-4.3_alloca.patch @@ -1,5 +1,5 @@ ---- clean/make-4.2/glob/glob.c 2013-10-20 17:14:38.000000000 +0000 -+++ make-4.2/glob/glob.c 2018-09-18 10:16:03.860886356 +0000 +--- clean/make-4.3/lib/glob.c ++++ make-4.3/lib/glob.c @@ -208,7 +208,7 @@ #endif /* __GNU_LIBRARY__ || __DJGPP__ */
diff --git a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum b/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum deleted file mode 100644 index 34af72c..0000000 --- a/util/crossgcc/sum/make-4.2.1.tar.bz2.cksum +++ /dev/null @@ -1 +0,0 @@ -7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2 diff --git a/util/crossgcc/sum/make-4.3.tar.gz.cksum b/util/crossgcc/sum/make-4.3.tar.gz.cksum new file mode 100644 index 0000000..c68844a --- /dev/null +++ b/util/crossgcc/sum/make-4.3.tar.gz.cksum @@ -0,0 +1 @@ +3c40e5b49b893dbb14f1e2e1f8fe89b7298cc51d tarballs/make-4.3.tar.gz