mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-24 23:26:44 +00:00
03a09a1e1a
crossgcc is now using gcc 8.1.0 which will compile without issues if your host system has gcc 8.x This is required if we are to build on a new system (such as latest Fedora)
157 lines
5.4 KiB
Diff
157 lines
5.4 KiB
Diff
From 234eabaa8da28dfa750826c200c08959bb917b28 Mon Sep 17 00:00:00 2001
|
|
From: Martin Roth <gaumless@gmail.com>
|
|
Date: Sat, 21 Jul 2018 14:17:22 -0600
|
|
Subject: [PATCH 57/59] util/crosgcc/patches: update make-4.2.1 patches
|
|
|
|
- Add the Do-not-assume-glibc-glob-internals patch to fix segfaults.
|
|
- Update glob_interface_v2 patch to the patch directly from the
|
|
make git repository instead of translating it. This gives better
|
|
attributution to the original author.
|
|
|
|
Change-Id: Ibc936fc00925a4ca2170a6f5dca7c2b8d8d62f02
|
|
Signed-off-by: Martin Roth <gaumless@gmail.com>
|
|
Reviewed-on: https://review.coreboot.org/27591
|
|
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
|
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
|
|
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
|
|
---
|
|
...b-Do-not-assume-glibc-glob-internals.patch | 67 +++++++++++++++++++
|
|
...pport-GLIBC-glob-interface-version-2.patch | 28 ++++++++
|
|
.../make-4.2.1_gnu_glob_interface_v2.patch | 15 -----
|
|
3 files changed, 95 insertions(+), 15 deletions(-)
|
|
create mode 100644 util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch
|
|
create mode 100644 util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch
|
|
delete mode 100644 util/crossgcc/patches/make-4.2.1_gnu_glob_interface_v2.patch
|
|
|
|
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
|
|
new file mode 100644
|
|
index 0000000000..3d45025fe1
|
|
--- /dev/null
|
|
+++ b/util/crossgcc/patches/make-4.2.1_0053-glob-Do-not-assume-glibc-glob-internals.patch
|
|
@@ -0,0 +1,67 @@
|
|
+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
|
|
new file mode 100644
|
|
index 0000000000..53e61b8bf7
|
|
--- /dev/null
|
|
+++ b/util/crossgcc/patches/make-4.2.1_0068-configure.ac-Support-GLIBC-glob-interface-version-2.patch
|
|
@@ -0,0 +1,28 @@
|
|
+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_gnu_glob_interface_v2.patch b/util/crossgcc/patches/make-4.2.1_gnu_glob_interface_v2.patch
|
|
deleted file mode 100644
|
|
index 466d6fdd70..0000000000
|
|
--- a/util/crossgcc/patches/make-4.2.1_gnu_glob_interface_v2.patch
|
|
+++ /dev/null
|
|
@@ -1,15 +0,0 @@
|
|
-diff -Naur make-4.2.1/configure.ac make-4.2.1/configure.ac
|
|
---- make-4.2.1/configure.ac
|
|
-+++ make-4.2.1/configure.ac
|
|
-@@ -399,10 +399,9 @@
|
|
- #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.17.1
|
|
|