crossgcc: Remove "Make"
In its current state, it draws more dependencies in than it solves which makes it useless. Change-Id: I08f592731c3da2ac19e1f93682256f559a067fc4 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38483 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Elyes HAOUAS
Nico Huber
parent
c66c15334a
commit
91fb139956
2
Makefile
2
Makefile
|
|
@ -103,7 +103,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),)
|
|||
NOCOMPILE:=1
|
||||
endif
|
||||
ifneq ($(MAKECMDGOALS),)
|
||||
ifneq ($(filter %config %clean cross% clang iasl gnumake lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
|
||||
ifneq ($(filter %config %clean cross% clang iasl lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
|
||||
NOCOMPILE:=1
|
||||
endif
|
||||
ifneq ($(filter %clean lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ DEST ?= $(CURDIR)/xgcc
|
|||
all all_with_gdb:
|
||||
$(MAKE) build-i386 build-x64 build-arm \
|
||||
build-riscv build-aarch64 build-ppc64 build-nds32le \
|
||||
build_clang build_iasl build_make build_nasm
|
||||
build_clang build_iasl build_nasm
|
||||
|
||||
all_without_gdb:
|
||||
$(MAKE) SKIP_GDB=1 build-i386 build-x64 build-arm \
|
||||
build-riscv build-aarch64 build-ppc64 build-nds32le \
|
||||
build_clang build_iasl build_make build_nasm
|
||||
build_clang build_iasl build_nasm
|
||||
|
||||
build_tools: build_gcc build_gdb
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ help_toolchain help::
|
|||
@echo ' crossgcc-clean - Remove all built coreboot cross-compilers'
|
||||
@echo ' iasl - Build coreboot IASL compiler (built by all cross targets)'
|
||||
@echo ' clang - Build coreboot clang compiler'
|
||||
@echo ' gnumake - Build coreboot make'
|
||||
@echo ' nasm - Build coreboot nasm'
|
||||
@echo ' test-toolchain - Reports if toolchain components are out of date'
|
||||
@echo ' crossgcc-ARCH - Build cross-compiler for specific architecture'
|
||||
|
|
@ -29,7 +28,7 @@ crossgcc: clean-for-update
|
|||
crossgcc-riscv crossgcc-power8 crossgcc-clean iasl \
|
||||
clang crosstools-i386 crosstools-x64 crosstools-arm \
|
||||
crosstools-aarch64 crosstools-riscv crosstools-power8 \
|
||||
jenkins-build-toolchain gnumake nasm
|
||||
jenkins-build-toolchain nasm
|
||||
|
||||
$(foreach arch,$(TOOLCHAIN_ARCHES),crossgcc-$(arch)): clean-for-update
|
||||
$(MAKE) -C util/crossgcc $(patsubst crossgcc-%,build-%,$@) build_iasl SKIP_GDB=1
|
||||
|
|
@ -43,9 +42,6 @@ iasl: clean-for-update
|
|||
clang: clean-for-update
|
||||
$(MAKE) -C util/crossgcc build_clang
|
||||
|
||||
gnumake: clean-for-update
|
||||
$(MAKE) -C util/crossgcc build_make
|
||||
|
||||
nasm: clean-for-update
|
||||
$(MAKE) -C util/crossgcc build_nasm
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ PYTHON_VERSION=3.8.1
|
|||
EXPAT_VERSION=2.2.9
|
||||
# CLANG version number
|
||||
CLANG_VERSION=9.0.0
|
||||
MAKE_VERSION=4.2.1
|
||||
CMAKE_VERSION=3.16.2
|
||||
NASM_VERSION=2.14.02
|
||||
|
||||
|
|
@ -67,15 +66,13 @@ LLVM_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/llvm-${CLANG_VERSION}.s
|
|||
CFE_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/cfe-${CLANG_VERSION}.src.tar.xz"
|
||||
CRT_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz"
|
||||
CTE_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz"
|
||||
MAKE_ARCHIVE="https://ftpmirror.gnu.org/make/make-${MAKE_VERSION}.tar.bz2"
|
||||
CMAKE_ARCHIVE="https://cmake.org/files/v3.16/cmake-${CMAKE_VERSION}.tar.gz"
|
||||
NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2"
|
||||
|
||||
ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \
|
||||
$GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $IASL_ARCHIVE \
|
||||
$PYTHON_ARCHIVE $EXPAT_ARCHIVE $LLVM_ARCHIVE $CFE_ARCHIVE \
|
||||
$CRT_ARCHIVE $CTE_ARCHIVE $MAKE_ARCHIVE $CMAKE_ARCHIVE \
|
||||
$NASM_ARCHIVE"
|
||||
$CRT_ARCHIVE $CTE_ARCHIVE $CMAKE_ARCHIVE $NASM_ARCHIVE"
|
||||
|
||||
# GCC toolchain directories
|
||||
GMP_DIR="gmp-${GMP_VERSION}"
|
||||
|
|
@ -94,7 +91,6 @@ LLVM_DIR="llvm-${CLANG_VERSION}.src"
|
|||
CFE_DIR="cfe-${CLANG_VERSION}.src"
|
||||
CRT_DIR="compiler-rt-${CLANG_VERSION}.src"
|
||||
CTE_DIR="clang-tools-extra-${CLANG_VERSION}.src"
|
||||
MAKE_DIR="make-${MAKE_VERSION}"
|
||||
CMAKE_DIR="cmake-${CMAKE_VERSION}"
|
||||
NASM_DIR="nasm-${NASM_VERSION}"
|
||||
|
||||
|
|
@ -878,19 +874,6 @@ build_LLVM() {
|
|||
done
|
||||
}
|
||||
|
||||
build_MAKE() {
|
||||
( cd ../${MAKE_DIR}/ && aclocal && autoconf )
|
||||
CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" \
|
||||
../${MAKE_DIR}/configure --prefix="$TARGETDIR" --disable-nls \
|
||||
|| touch .failed
|
||||
$MAKE -k clean
|
||||
# shellcheck disable=SC2086
|
||||
$MAKE $JOBS || touch .failed
|
||||
$MAKE install DESTDIR=$DESTDIR || touch .failed
|
||||
|
||||
normalize_dirs
|
||||
}
|
||||
|
||||
build_CMAKE() {
|
||||
CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" \
|
||||
../${CMAKE_DIR}/configure --prefix="$TARGETDIR" \
|
||||
|
|
@ -926,7 +909,6 @@ print_supported() {
|
|||
MPC|mpc) printf "%s\n" "$MPC_VERSION";;
|
||||
MPFR|mpfr) printf "%s\n" "$MPFR_VERSION";;
|
||||
PYTHON|python) printf "%s\n" "$PYTHON_VERSION";;
|
||||
MAKE|make) printf "%s\n" "$MAKE_VERSION";;
|
||||
NASM|nasm) printf "%s\n" "${NASM_VERSION}";;
|
||||
*) printf "Unknown tool %s\n" "$PRINTSUPPORTED";;
|
||||
esac
|
||||
|
|
@ -1039,10 +1021,6 @@ case "$PACKAGE" in
|
|||
NAME="IASL ACPI compiler"
|
||||
PACKAGES=IASL
|
||||
;;
|
||||
MAKE|make)
|
||||
NAME="GNU Make"
|
||||
PACKAGES=MAKE
|
||||
;;
|
||||
CMAKE|cmake)
|
||||
NAME="CMake"
|
||||
PACKAGES=CMAKE
|
||||
|
|
@ -1052,7 +1030,7 @@ case "$PACKAGE" in
|
|||
PACKAGES=NASM
|
||||
;;
|
||||
*)
|
||||
printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE, and NASM)${NC}\n\n";
|
||||
printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, and NASM)${NC}\n\n";
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- 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
|
||||
@@ -208,7 +208,7 @@
|
||||
#endif /* __GNU_LIBRARY__ || __DJGPP__ */
|
||||
|
||||
|
||||
-#if !defined __alloca && !defined __GNU_LIBRARY__
|
||||
+#if !defined __alloca && defined __GNU_LIBRARY__
|
||||
|
||||
# ifdef __GNUC__
|
||||
# undef alloca
|
||||
|
|
@ -1 +0,0 @@
|
|||
7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830 tarballs/make-4.2.1.tar.bz2
|
||||
Loading…
Reference in New Issue